Skip to content

Commit 92ed0bd

Browse files
committed
Postgresql upstream do not build postmaster binary any more since
postgresql 16. So This commit should replace postmaster binary by postgres binary. Related: https://bugzilla.redhat.com/show_bug.cgi?id=2219370 More info: https://postgrespro.com/blog/pgsql/5969981#commit_81266442
1 parent 5c36733 commit 92ed0bd

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

README.rpm-dist.template

+14-14
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ m4_divert[]m4_dnl
7474

7575
PGSETUP_ROOT_COMMAND([PGSETUP_SERVICE_START(@NAME_SERVICE@)])
7676

77-
This command will start a postmaster that will listen on localhost and Unix
77+
This command will start a postgres that will listen on localhost and Unix
7878
socket 5432 only. Edit @PGDATADIR@/postgresql.conf and pg_hba.conf if you
7979
want to allow remote access -- see the section on Grand Unified
8080
Configuration.
@@ -83,7 +83,7 @@ m4_divert[]m4_dnl
8383

8484
PGSETUP_ROOT_COMMAND([PGSETUP_SERVICE_ENABLE(@NAME_SERVICE@)])
8585

86-
so that the postmaster is automatically started during future reboots.
86+
so that the postgres is automatically started during future reboots.
8787

8888
</para>
8989

@@ -122,7 +122,7 @@ m4_divert[]m4_dnl
122122
(for example, from 8.3.x to 9.0.x), you will need to follow the
123123
"traditional" dump and reload process to bring your data into the new
124124
version. That is: *before* upgrading, run pg_dumpall to extract all your
125-
data into a SQL file. Shut down the old postmaster, upgrade to the new
125+
data into a SQL file. Shut down the old postgres, upgrade to the new
126126
version RPMs, perform initdb, and run the dump file through psql to restore
127127
your data.
128128
</para>
@@ -138,7 +138,7 @@ m4_divert[]m4_dnl
138138
<orderedlist>
139139
<listitem>
140140
<para>
141-
shut down the old postmaster running against old data
141+
shut down the old postgres running against old data
142142
</para>
143143
</listitem>
144144
<listitem>
@@ -332,13 +332,13 @@ m4_ifelse([@WANT_SYSVINIT@], [1], m4_dnl
332332
[
333333
<para>
334334
The @NAME_PACKAGE@-server RPM contains an "initscript" that is used to start
335-
the postmaster. The current version of this script has logic to be able to
336-
start multiple postmasters, with different data areas, listening on
335+
the postgres. The current version of this script has logic to be able to
336+
start multiple postgress, with different data areas, listening on
337337
different ports, etc. To use this functionality requires root access.
338338
</para>
339339

340340
<para>
341-
As an example, let us create a secondary postmaster called, creatively
341+
As an example, let us create a secondary postgres called, creatively
342342
enough, 'secondary'. Here are the steps:
343343
</para>
344344

@@ -378,7 +378,7 @@ m4_ifelse([@WANT_SYSVINIT@], [1], m4_dnl
378378
</listitem>
379379
<listitem>
380380
<para>
381-
Start the postmaster with 'service secondary start'.
381+
Start the postgres with 'service secondary start'.
382382
</para>
383383
</listitem>
384384
</orderedlist>
@@ -501,13 +501,13 @@ m4_ifelse([@WANT_SYSVINIT@], [1], m4_dnl
501501
<para>
502502
Fedora / Red Hat / CentOS use the systemd package to manage server startup.
503503
A systemd unit file for PostgreSQL is provided in the server package, as
504-
@systemdunitsdir@/@[email protected]. To start the postmaster manually,
504+
@systemdunitsdir@/@[email protected]. To start the postgres manually,
505505
as root run
506506
PGSETUP_ROOT_COMMAND(PGSETUP_SERVICE_START(@NAME_SERVICE@))
507-
To shut the postmaster down,
507+
To shut the postgres down,
508508
PGSETUP_ROOT_COMMAND(PGSETUP_SERVICE_STOP(@NAME_SERVICE@))
509-
These two commands only change the postmaster's current status. If you want
510-
the postmaster to be started automatically during future system startups,
509+
These two commands only change the postgres's current status. If you want
510+
the postgres to be started automatically during future system startups,
511511
run
512512
PGSETUP_ROOT_COMMAND(PGSETUP_SERVICE_ENABLE(@NAME_SERVICE@))
513513
To undo that again,
@@ -531,15 +531,15 @@ m4_ifelse([@WANT_SYSVINIT@], [1], m4_dnl
531531
nonlocal TCP/IP socket connections -- in order to allow these, you will need
532532
to edit the postgresql.conf file. The line in question contains the string
533533
'listen_addresses' -- you need to both uncomment the line and set the value
534-
to '*' to get the postmaster to accept nonlocal connections. You'll also
534+
to '*' to get the postgres to accept nonlocal connections. You'll also
535535
need to adjust pg_hba.conf appropriately.
536536
</para>
537537
</sect1>
538538

539539
<sect1>
540540
<title>LOGGING SET UP</title>
541541
<para>
542-
By default, the postmaster's stderr log is directed into files placed in a
542+
By default, the postgres's stderr log is directed into files placed in a
543543
pg_log subdirectory of the data directory (ie, @PGDATADIR@/pg_log).
544544
The out-of-the-box configuration rotates among seven files, one for each
545545
day of the week. You can adjust this by changing postgresql.conf settings.

bin/postgresql-setup.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test x"$PGSETUP_DEBUG" != x && set -x && PS4='${LINENO}: '
3030
# The current user name.
3131
USER=$(id -u -n)
3232

33-
# Directory containing the postmaster executable
33+
# Directory containing the postgres executable
3434
PGENGINE=@bindir@
3535

3636
# Distribution README file
@@ -171,7 +171,7 @@ perform_initdb()
171171
eval "initdbcmd+=( $PGSETUP_INITDB_OPTIONS )"
172172
"${initdbcmd[@]}" >> "$initdb_log" 2>&1 < /dev/null
173173

174-
# Create directory for postmaster log files
174+
# Create directory for postgres log files
175175
mkdir "$pgdata/@PGLOGDIR_BASENAME@"
176176
$RESTORECON "$pgdata/@PGLOGDIR_BASENAME@"
177177

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ AC_ARG_WITH([scl],
161161
[Build against Software Collections RPM])],
162162
[scl_enabled_build=:])
163163

164-
SYSTEMD_EXECSTART='${bindir}/postmaster -D $${PGDATA}'
164+
SYSTEMD_EXECSTART='${bindir}/postgres -D $${PGDATA}'
165165

166166
if $scl_enabled_build; then
167167
AC_MSG_CHECKING([which SCL to build against])

postgresql.service.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Group=postgres
2020
# This is normally controlled by the global default set by systemd
2121
# StandardOutput=syslog
2222

23-
# Disable OOM kill on the postmaster
23+
# Disable OOM kill on the postgres
2424
OOMScoreAdjust=-1000
2525
# ... but allow it still to be effective for child processes
2626
# (note that these settings are ignored by Postgres releases before 9.5)
@@ -30,7 +30,7 @@ Environment=PG_OOM_ADJUST_VALUE=0
3030
@PGDATA_ENVIRONMENT@
3131

3232
ExecStartPre=@libexecdir@/postgresql-check-db-dir %N
33-
# Even though the $PGDATA variable is exported (postmaster would accept that)
33+
# Even though the $PGDATA variable is exported (postgres would accept that)
3434
# use the -D option here so PGDATA content is printed by /bin/ps and by
3535
# 'systemctl status'.
3636
ExecStart=@SYSTEMD_EXECSTART@

0 commit comments

Comments
 (0)