From: Marcin Krol Date: Fri, 24 Aug 2018 10:51:04 +0000 (+0000) Subject: - moved data clusters to /var/lib/postgresql, misc fixes X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=c24b0fafa211c786f72aafdc4ad48c7ab9c60dfb;p=packages%2Fpostgresql.git - moved data clusters to /var/lib/postgresql, misc fixes --- diff --git a/postgresql.init b/postgresql.init index 8f30817..394692c 100644 --- a/postgresql.init +++ b/postgresql.init @@ -123,7 +123,7 @@ start() { if [ "$PG_STATUS" = "running" ]; then # pg_ctl status can misinform us about postgresql status # so let's check if postmaster is really alive - if ps -p "$PG_PID" >/dev/null; then + if ps -p "$PG_PID" 1>/dev/null 2>&1; then msg_already_running "PostgreSQL $pgdir" else # pg_ctl has misinformed us about postgresql status; @@ -148,8 +148,8 @@ stop() { msg_stopping "PostgreSQL $pgdir" busy # is postgresql really alive? - if ps -p "$PG_PID" >/dev/null; then - TMPDIR=/tmp su postgres -c "@pgsqlbindir@/pg_ctl -w -D $pgdir stop -m fast 2>&1 >/dev/null" + if ps -p "$PG_PID" 1>/dev/null 2>&1; then + TMPDIR=/tmp su postgres -c "@pgsqlbindir@/pg_ctl -w -D $pgdir stop -m fast 1>/dev/null 2>&1" pgstatus "$pgdir" if [ "$PG_STATUS" != "not running" ]; then fail @@ -214,8 +214,8 @@ case "$action" in msg_reloading "PostgreSQL $pgdir" busy # is postgresql really alive? - if ps -p "$PG_PID" >/dev/null; then - TMPDIR=/tmp su postgres -c "@pgsqlbindir@/pg_ctl -D $pgdir $pgctlact 2>&1 >/dev/null" + if ps -p "$PG_PID" 1>/dev/null 2>&1; then + TMPDIR=/tmp su postgres -c "@pgsqlbindir@/pg_ctl -D $pgdir $pgctlact 1>/dev/null 2>&1" pgstatus "$pgdir" if [ "$PG_STATUS" = "running" ]; then ok diff --git a/postgresql.spec b/postgresql.spec index a951d26..1a9cf83 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -546,7 +546,7 @@ done %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \ - $RPM_BUILD_ROOT/var/{lib/pgsql,log,run/postgresql} \ + $RPM_BUILD_ROOT/var/{lib/postgresql/%{pgsqlversion},log,run/postgresql} \ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ $RPM_BUILD_ROOT%{_mandir} @@ -786,6 +786,7 @@ fi %dir %{pgsqldatadir}/man/man1 %dir %{pgsqldatadir}/man/man3 %dir %{pgsqldatadir}/man/man7 +%attr(700,postgres,postgres) %dir /var/lib/postgresql/%{pgsqlversion} %files doc %defattr(644,root,root,755) diff --git a/postgresql.sysconfig b/postgresql.sysconfig index dde9282..bf55014 100644 --- a/postgresql.sysconfig +++ b/postgresql.sysconfig @@ -9,10 +9,10 @@ # PG_INIT_LOCALE=C # standard setting -PG_DB_CLUSTERS="/var/lib/pgsql/@pgsqlversion@/main" +PG_DB_CLUSTERS="/var/lib/postgresql/@pgsqlversion@/main" # predictable usage -# PG_DB_CLUSTERS="/var/lib/pgsql/@pgsqlversion@/server1 /var/lib/pgsql/@pgsqlversion@/server2" +# PG_DB_CLUSTERS="/var/lib/postgresql/@pgsqlversion@/server1 /var/lib/postgresql/@pgsqlversion@/server2" # new database disk arrived -# PG_DB_CLUSTERS="/var/lib/pgsql/@pgsqlversion@/server1 /var/lib/pgsql/@pgsqlversion@/server2 /mnt/pgsql/@pgsqlversion@/server3" +# PG_DB_CLUSTERS="/var/lib/postgresql/@pgsqlversion@/server1 /var/lib/postgresql/@pgsqlversion@/server2 /mnt/postgresql/@pgsqlversion@/server3"