From 81e523c0957a9bee557bf2cca25607989209ac2c Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 17 Mar 2015 11:34:21 +0100
Subject: sysvinit: transform for SCL & RHEL6 usage

This is mostly about simplification of intiscript and postgresql-setup
script reuse.  Still WIP, however (some options are not applicable for
sysvinit system).

* share/postgresql-setup/library.sh.in (parse_upgrade_setup): Parse new
variable "pghost_override".
(run_cmd_as_dbadmin): New wrapper function to run something under
"postgres" user.  Cut from postgresql-setup.
* postgresql-setup.in: Optionally source software collections.  Call new
check_daemon_reload instead of in-place checking.
(upgrade): Use new library function run_cmd_as_dbadmin.  Add new hack
for $PGHOST overriding via $pghost_override.  Add more verbose output to
make clear what tool failed.
(check_daemon_reload): New function to make the systemd daemon reload
conditionally on one dedicated place.
(handle_envfile): New function to abstract environment file parsing,
works both for systemd & sysvinit env-files.
(handle_service_envfiles): Use handle_envfile instead of in-place
parsing.
(service_configuration): For sysvinit supported configuration, we
support only one env file per service - take this into account and don't
try to detect many from systemctl output.
* postgresql.init.in: Switch to bash script. Parametrize metadata by
configure results.  Source software collections when needed.  Source
project library. Don't set PGDATA if admin uses non-default service
naem.  Do not define PGPORT as PGPORT should be defined in
postgresql.conf.  Allow passing parameters into initdb/upgrade targets.
($PREVMAJORVERSION, $PREVPGENGINE): Remove unused variables.
($PGENGINE): This is @bindir@ equivalent.
($PGLOG): Spell it so it will not clash with system default PostgreSQL
installation.
($pidfile): Use $NAME instead of $PID to distinguish multiple postmaster
scenarios (mainly because we do not know the PGPORT yet).
(start): Drop the checking logic and use postgresql-check-db-dir
instead.  Reuse run_cmd_as_dbadmin instead of $SU_POSTGRES.
(stop): Use run_cmd_as_dbadmin instead of $SU_POSTGRES.
(reload): Just coding style fix.
(perform_initdb): Drop unused function, done in postgresql-setup.
(__single_comand): Mostly postgresql-setup wrapper with success/failure
sugar around the call itself.
(initdb): Substitute the function body with postgresql-setup call.
(upgrade): Likewise.
* postgresql-check-db-dir.in: Fix the hint for admin about where the
service should be initialized.  Do not warn about systemd-only
unsupported configuration.  Add @bindir@ into "you need --initdb" hint.
Re-style the warning a bit.
* etc/postgresql-setup/upgrade/postgresql.conf: Mention new
configuration option pghost_override.
* configure.ac (initscriptsconfdir): New configuration directory.
(PGMAJORVERSION): Use sed and regexp for MAJOR version mining.  It
failed for micro versions of length >= 2.
(SCL_SOURCE): Define to be empty by default.
* README: Document what's needed to bootstrap from git source.  WIP.
* Makefile.am (initscripts_DATA): Use noinst_DATA.  Firstly, having
initscripts_DATA installs only non-executable files.  So we needed
something with _SCRIPTS primary.  But initscripts_SCRIPTS would face the
automake's limitation that it must be "static" list of files.  So make
the installation of initscript (of dynamically generated name) via
automake's install/uninstall.
($(initscript)): Use $(INSTANTIATE_SCRIPT) instead of $(INSTANTIATE).
(install-data-hook): Call 'systemctl daemon-reload' only for
non-sysvinit systems.
* .gitignore: Ignore 'initscript' filename.
---
 share/postgresql-setup/library.sh.in | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'share/postgresql-setup')

diff --git a/share/postgresql-setup/library.sh.in b/share/postgresql-setup/library.sh.in
index fe38f6c..cfbf213 100644
--- a/share/postgresql-setup/library.sh.in
+++ b/share/postgresql-setup/library.sh.in
@@ -71,7 +71,7 @@ parse_upgrade_setup()
     test -d "$upgrade_confdir" || die "can't read confdir $upgrade_confdir"
 
     local my_vars="id comment data_default engine description major scls \
-        redhat_sockets_hack"
+        redhat_sockets_hack pghost_override"
     while read conffile
     do
         read_config_file "$conffile" "$my_vars"
@@ -119,3 +119,21 @@ parse_upgrade_setup()
 }
 
 
+# run_cmd_as_dbadmin COMMAND STDOUT STDERR
+run_cmd_as_dbadmin()
+{
+    # Convenient tool-aliases
+    local SU_POSTGRES="@SU_POSTGRES@"
+
+    local cmd="@SCL_SOURCE@$1"
+    local stdout="$2" stderr="$3"
+
+    # don't print additional spaces
+    set -- $cmd
+    debug "running command under postgres user: $@"
+    (
+        test -n "$stdout" && exec >>"$stdout"
+        test -n "$stderr" && exec 2>>"$stderr"
+        $SU_POSTGRES -c "$cmd" < /dev/null
+    )
+}
-- 
cgit