Commit8126644

committed

Remove gratuitous references to postmaster program

"postgres" has long been officially preferred over "postmaster" as thename of the program to invoke to run the server. Some example scriptsand code comments still used the latter. Change those.Discussion:https://www.postgresql.org/message-id/flat/ece84b69-8f94-8b88-925f-64207cb3a2f0@enterprisedb.com

1 parent6c6b497 commit8126644Copy full SHA for 8126644

File tree

+11

-11

lines changed

+11

-11

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ prefix=/usr/local/pgsql`
`16`	`16`	`# Data directory`
`17`	`17`	`PGDATA="/usr/local/pgsql/data"`
`18`	`18`
`19`		`-# Who to runthe postmaster as, usually "postgres". (NOT "root")`
	`19`	`+# Who to runpostgres as, usually "postgres". (NOT "root")`
`20`	`20`	`PGUSER=postgres`
`21`	`21`
`22`	`22`	`# Where to keep a log file`
`@@ -27,14 +27,14 @@ PGLOG="$PGDATA/serverlog"`
`27`	`27`	`# The path that is to be used for the script`
`28`	`28`	`PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin`
`29`	`29`
`30`		`-# What to use to start upthe postmaster. (If you want the script to wait`
	`30`	`+# What to use to start uppostgres. (If you want the script to wait`
`31`	`31`	`# until the server has started, you could use "pg_ctl start" here.)`
`32`		`-DAEMON="$prefix/bin/postmaster"`
	`32`	`+DAEMON="$prefix/bin/postgres"`
`33`	`33`
`34`		`-# What to use to shut downthe postmaster`
	`34`	`+# What to use to shut downpostgres`
`35`	`35`	`PGCTL="$prefix/bin/pg_ctl"`
`36`	`36`
`37`		`-# Only start if we can findthe postmaster.`
	`37`	`+# Only start if we can findpostgres.`
`38`	`38`	`test -x$DAEMON\|\|`
`39`	`39`	`{`
`40`	`40`	`echo"$DAEMON not found"`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ prefix=/usr/local/pgsql`
`34`	`34`	`# Data directory`
`35`	`35`	`PGDATA="/usr/local/pgsql/data"`
`36`	`36`
`37`		`-# Who to runthe postmaster as, usually "postgres". (NOT "root")`
	`37`	`+# Who to runpostgres as, usually "postgres". (NOT "root")`
`38`	`38`	`PGUSER=postgres`
`39`	`39`
`40`	`40`	`# Where to keep a log file`
`@@ -59,16 +59,16 @@ PGLOG="$PGDATA/serverlog"`
`59`	`59`	`# The path that is to be used for the script`
`60`	`60`	`PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin`
`61`	`61`
`62`		`-# What to use to start upthe postmaster. (If you want the script to wait`
	`62`	`+# What to use to start uppostgres. (If you want the script to wait`
`63`	`63`	`# until the server has started, you could use "pg_ctl start" here.)`
`64`		`-DAEMON="$prefix/bin/postmaster"`
	`64`	`+DAEMON="$prefix/bin/postgres"`
`65`	`65`
`66`		`-# What to use to shut downthe postmaster`
	`66`	`+# What to use to shut downpostgres`
`67`	`67`	`PGCTL="$prefix/bin/pg_ctl"`
`68`	`68`
`69`	`69`	`set -e`
`70`	`70`
`71`		`-# Only start if we can findthe postmaster.`
	`71`	`+# Only start if we can findpostgres.`
`72`	`72`	`test -x$DAEMON\|\|`
`73`	`73`	`{`
`74`	`74`	`echo"$DAEMON not found"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,7 @@ dir_strcmp(const char s1, const char s2)`
`651`	`651`	`* For example:`
`652`	`652`	`*target_path = '/usr/local/share/postgresql'`
`653`	`653`	`*bin_path = '/usr/local/bin'`
`654`		`- *my_exec_path = '/opt/pgsql/bin/postmaster'`
	`654`	`+ *my_exec_path = '/opt/pgsql/bin/postgres'`
`655`	`655`	`* Given these inputs, the common prefix is '/usr/local/', the tail of`
`656`	`656`	`* bin_path is 'bin' which does match the last directory component of`
`657`	`657`	`* my_exec_path, so we would return '/opt/pgsql/share/postgresql'`

Comments

(0)