diff options
Diffstat (limited to 'contrib/start-scripts')
| -rw-r--r-- | contrib/start-scripts/freebsd | 7 | ||||
| -rw-r--r-- | contrib/start-scripts/linux | 15 | ||||
| -rwxr-xr-x | contrib/start-scripts/osx/PostgreSQL | 13 |
3 files changed, 16 insertions, 19 deletions
diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd index 758574b427..c6ac8cd47a 100644 --- a/contrib/start-scripts/freebsd +++ b/contrib/start-scripts/freebsd @@ -28,8 +28,7 @@ PGLOG="$PGDATA/serverlog" PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # What to use to start up the postmaster. (If you want the script to wait -# until the server has started, you could use "pg_ctl start -w" here. -# But without -w, pg_ctl adds no value.) +# until the server has started, you could use "pg_ctl start" here.) DAEMON="$prefix/bin/postmaster" # What to use to shut down the postmaster @@ -48,10 +47,10 @@ case $1 in echo -n ' postgresql' ;; stop) - su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast" + su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s" ;; restart) - su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast -w" + su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s" su -l $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1 ;; status) diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux index 763a8064ab..44a775b030 100644 --- a/contrib/start-scripts/linux +++ b/contrib/start-scripts/linux @@ -60,8 +60,7 @@ PGLOG="$PGDATA/serverlog" PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # What to use to start up the postmaster. (If you want the script to wait -# until the server has started, you could use "pg_ctl start -w" here. -# But without -w, pg_ctl adds no value.) +# until the server has started, you could use "pg_ctl start" here.) DAEMON="$prefix/bin/postmaster" # What to use to shut down the postmaster @@ -97,21 +96,21 @@ case $1 in ;; stop) echo -n "Stopping PostgreSQL: " - su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast" + su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s" echo "ok" ;; restart) echo -n "Restarting PostgreSQL: " - su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast -w" + su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s" test -e "$PG_OOM_ADJUST_FILE" && echo "$PG_MASTER_OOM_SCORE_ADJ" > "$PG_OOM_ADJUST_FILE" su - $PGUSER -c "$DAEMON_ENV $DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1 echo "ok" ;; reload) - echo -n "Reload PostgreSQL: " - su - $PGUSER -c "$PGCTL reload -D '$PGDATA' -s" - echo "ok" - ;; + echo -n "Reload PostgreSQL: " + su - $PGUSER -c "$PGCTL reload -D '$PGDATA' -s" + echo "ok" + ;; status) su - $PGUSER -c "$PGCTL status -D '$PGDATA'" ;; diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL index 24872b0944..7ff1d0e377 100755 --- a/contrib/start-scripts/osx/PostgreSQL +++ b/contrib/start-scripts/osx/PostgreSQL @@ -29,7 +29,7 @@ # modified by Ray Aspeitia 12-03-2003 : # added log rotation script to db startup # modified StartupParameters.plist "Provides" parameter to make it easier to -# start and stop with the SystemStarter utitlity +# start and stop with the SystemStarter utility # use the below command in order to correctly start/stop/restart PG with log rotation script: # SystemStarter [start|stop|restart] PostgreSQL @@ -65,8 +65,7 @@ ROTATESEC="604800" PATH="$prefix/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" # What to use to start up the postmaster. (If you want the script to wait -# until the server has started, you could use "pg_ctl start -w" here. -# But without -w, pg_ctl adds no value.) +# until the server has started, you could use "pg_ctl start" here.) DAEMON="$prefix/bin/postmaster" # What to use to shut down the postmaster @@ -90,15 +89,15 @@ StartService () { StopService () { ConsoleMessage "Stopping PostgreSQL database server" - sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s -m fast" + sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s" } RestartService () { if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then ConsoleMessage "Restarting PostgreSQL database server" - # should match StopService: - sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s -m fast" - # should match StartService: + # should match StopService: + sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s" + # should match StartService: if [ "${ROTATELOGS}" = "1" ]; then sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} "${PGLOG}" ${ROTATESEC} & else |