From 527878635030489e464d965b3b64f6caf178f641 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 17 Nov 2017 12:53:20 -0500 Subject: [PATCH] Remove contrib/start-scripts/osx/. Since those scripts haven't worked at all in macOS releases of 2014 and later, and aren't the recommended way to do it on any release since 2005, there seems little point carrying them into the future. It's very unlikely that anyone would be installing PG >= 11 on a macOS release where they couldn't use contrib/start-scripts/macos/. Discussion: https://postgr.es/m/31338.1510763554@sss.pgh.pa.us --- contrib/start-scripts/osx/PostgreSQL | 111 ------------------ contrib/start-scripts/osx/README | 8 -- .../start-scripts/osx/StartupParameters.plist | 33 ------ contrib/start-scripts/osx/install.sh | 10 -- 4 files changed, 162 deletions(-) delete mode 100755 contrib/start-scripts/osx/PostgreSQL delete mode 100644 contrib/start-scripts/osx/README delete mode 100644 contrib/start-scripts/osx/StartupParameters.plist delete mode 100755 contrib/start-scripts/osx/install.sh diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL deleted file mode 100755 index 7ac12bb9e3..0000000000 --- a/contrib/start-scripts/osx/PostgreSQL +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -## -# PostgreSQL RDBMS Server -## - -# PostgreSQL boot time startup script for OS X. To install, change -# the "prefix", "PGDATA", "PGUSER", and "PGLOG" variables below as -# necessary. Next, create a new directory, "/Library/StartupItems/PostgreSQL". -# Then copy this script and the accompanying "StartupParameters.plist" file -# into that directory. The name of this script file *must* be the same as the -# directory it is in. So you'll end up with these two files: -# -# /Library/StartupItems/PostgreSQL/PostgreSQL -# /Library/StartupItems/PostgreSQL/StartupParameters.plist -# -# Next, add this line to the /etc/hostconfig file: -# -# POSTGRESQL=-YES- -# -# The startup bundle will now be ready to go. To prevent this script from -# starting PostgreSQL at system startup, simply change that line in -# /etc/hostconfig back to: -# -# POSTGRESQL=-NO- -# -# Created by David Wheeler, 2002 - -# 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 utility - -# use the below command in order to correctly start/stop/restart PG with log rotation script: -# SystemStarter [start|stop|restart] PostgreSQL - -################################################################################ -## EDIT FROM HERE -################################################################################ - -# Installation prefix -prefix="/usr/local/pgsql" - -# Data directory -PGDATA="/usr/local/pgsql/data" - -# Who to run the postmaster as, usually "postgres". (NOT "root") -PGUSER="postgres" - -# the logfile path and name (NEEDS to be writeable by PGUSER) -PGLOG="${PGDATA}/logs/logfile" - -# do you want to rotate the log files, 1=true 0=false -ROTATELOGS=1 - -# logfile rotate in seconds -ROTATESEC="604800" - - -################################################################################ -## STOP EDITING HERE -################################################################################ - -# The path that is to be used for the script -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" here.) -DAEMON="$prefix/bin/postmaster" - -# What to use to shut down the postmaster -PGCTL="$prefix/bin/pg_ctl" - -# The apache log rotation utility -LOGUTIL="/usr/sbin/rotatelogs" - -. /etc/rc.common - -StartService () { - if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then - ConsoleMessage "Starting PostgreSQL database server" - if [ "${ROTATELOGS}" = "1" ]; then - sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' 2>&1 | ${LOGUTIL} \"${PGLOG}\" ${ROTATESEC} &" - else - sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' >>\"$PGLOG\" 2>&1 &" - fi - fi -} - -StopService () { - ConsoleMessage "Stopping PostgreSQL database server" - 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" - # should match StartService: - if [ "${ROTATELOGS}" = "1" ]; then - sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' 2>&1 | ${LOGUTIL} \"${PGLOG}\" ${ROTATESEC} &" - else - sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' >>\"$PGLOG\" 2>&1 &" - fi - else - StopService - fi -} - -RunService "$1" diff --git a/contrib/start-scripts/osx/README b/contrib/start-scripts/osx/README deleted file mode 100644 index 9faf5a4a1c..0000000000 --- a/contrib/start-scripts/osx/README +++ /dev/null @@ -1,8 +0,0 @@ -The scripts in this directory are for use with Apple's SystemStarter -infrastructure, which is deprecated since macOS 10.4 and is gone entirely -as of 10.10. You should use the scripts in ../macos instead, unless -you are using a macOS release too old to have launchd. - -To install execute the following: - -sudo /bin/sh ./install.sh diff --git a/contrib/start-scripts/osx/StartupParameters.plist b/contrib/start-scripts/osx/StartupParameters.plist deleted file mode 100644 index 6c788d0dda..0000000000 --- a/contrib/start-scripts/osx/StartupParameters.plist +++ /dev/null @@ -1,33 +0,0 @@ - - - - - Description - PostgreSQL Database Server - Messages - - start - Starting PostgreSQL database server - stop - Stopping PostgreSQL database server - restart - Restarting PostgreSQL database server - - OrderPreference - Late - Provides - - PostgreSQL - - Requires - - Disks - Resolver - - Uses - - NFS - NetworkTime - - - diff --git a/contrib/start-scripts/osx/install.sh b/contrib/start-scripts/osx/install.sh deleted file mode 100755 index bbc5ee3926..0000000000 --- a/contrib/start-scripts/osx/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -sudo sh -c 'echo "POSTGRESQL=-YES-" >> /etc/hostconfig' -sudo mkdir /Library/StartupItems/PostgreSQL -sudo cp PostgreSQL /Library/StartupItems/PostgreSQL -sudo cp StartupParameters.plist /Library/StartupItems/PostgreSQL -if [ -e /Library/StartupItems/PostgreSQL/PostgreSQL ] -then - echo "Startup Item Installed Successfully . . . " - echo "Starting PostgreSQL Server . . . " - SystemStarter restart PostgreSQL -fi