diff --git a/rpm/redhat/9.4/repmgr/EL-5/repmgr.init b/rpm/redhat/9.4/repmgr/EL-5/repmgr.init index c900170..95e3757 100644 --- a/rpm/redhat/9.4/repmgr/EL-5/repmgr.init +++ b/rpm/redhat/9.4/repmgr/EL-5/repmgr.init @@ -54,7 +54,7 @@ start(){ mkdir -p $(dirname $pidfile) chown $user: $(dirname $pidfile) - su -l repmgr -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose + su -l $user -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose retval=$? [ $retval -eq 0 ] && success echo diff --git a/rpm/redhat/9.4/repmgr/EL-5/repmgr.spec b/rpm/redhat/9.4/repmgr/EL-5/repmgr.spec index aba8b39..29c629a 100644 --- a/rpm/redhat/9.4/repmgr/EL-5/repmgr.spec +++ b/rpm/redhat/9.4/repmgr/EL-5/repmgr.spec @@ -115,7 +115,11 @@ fi # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add %{sname}-%{pgpackageversion} %endif -%{__chown} repmgr: %{_localstatedir}/run/%{sname} +if [ ! -x %{_varrundir} ] +then + %{__mkdir} -m 700 %{_varrundir} + %{__chown} -R repmgr: %{_varrundir} +fi %postun -p /sbin/ldconfig diff --git a/rpm/redhat/9.4/repmgr/EL-6/repmgr.init b/rpm/redhat/9.4/repmgr/EL-6/repmgr.init index c900170..95e3757 100644 --- a/rpm/redhat/9.4/repmgr/EL-6/repmgr.init +++ b/rpm/redhat/9.4/repmgr/EL-6/repmgr.init @@ -54,7 +54,7 @@ start(){ mkdir -p $(dirname $pidfile) chown $user: $(dirname $pidfile) - su -l repmgr -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose + su -l $user -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose retval=$? [ $retval -eq 0 ] && success echo diff --git a/rpm/redhat/9.4/repmgr/EL-6/repmgr.spec b/rpm/redhat/9.4/repmgr/EL-6/repmgr.spec index aba8b39..29c629a 100644 --- a/rpm/redhat/9.4/repmgr/EL-6/repmgr.spec +++ b/rpm/redhat/9.4/repmgr/EL-6/repmgr.spec @@ -115,7 +115,11 @@ fi # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add %{sname}-%{pgpackageversion} %endif -%{__chown} repmgr: %{_localstatedir}/run/%{sname} +if [ ! -x %{_varrundir} ] +then + %{__mkdir} -m 700 %{_varrundir} + %{__chown} -R repmgr: %{_varrundir} +fi %postun -p /sbin/ldconfig diff --git a/rpm/redhat/9.4/repmgr/EL-7/repmgr.init b/rpm/redhat/9.4/repmgr/EL-7/repmgr.init index c900170..95e3757 100644 --- a/rpm/redhat/9.4/repmgr/EL-7/repmgr.init +++ b/rpm/redhat/9.4/repmgr/EL-7/repmgr.init @@ -54,7 +54,7 @@ start(){ mkdir -p $(dirname $pidfile) chown $user: $(dirname $pidfile) - su -l repmgr -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose + su -l $user -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose retval=$? [ $retval -eq 0 ] && success echo diff --git a/rpm/redhat/9.4/repmgr/EL-7/repmgr.spec b/rpm/redhat/9.4/repmgr/EL-7/repmgr.spec index aba8b39..29c629a 100644 --- a/rpm/redhat/9.4/repmgr/EL-7/repmgr.spec +++ b/rpm/redhat/9.4/repmgr/EL-7/repmgr.spec @@ -115,7 +115,11 @@ fi # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add %{sname}-%{pgpackageversion} %endif -%{__chown} repmgr: %{_localstatedir}/run/%{sname} +if [ ! -x %{_varrundir} ] +then + %{__mkdir} -m 700 %{_varrundir} + %{__chown} -R repmgr: %{_varrundir} +fi %postun -p /sbin/ldconfig diff --git a/rpm/redhat/9.4/repmgr/F-20/repmgr.init b/rpm/redhat/9.4/repmgr/F-20/repmgr.init index c900170..95e3757 100644 --- a/rpm/redhat/9.4/repmgr/F-20/repmgr.init +++ b/rpm/redhat/9.4/repmgr/F-20/repmgr.init @@ -54,7 +54,7 @@ start(){ mkdir -p $(dirname $pidfile) chown $user: $(dirname $pidfile) - su -l repmgr -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose + su -l $user -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose retval=$? [ $retval -eq 0 ] && success echo diff --git a/rpm/redhat/9.4/repmgr/F-20/repmgr.spec b/rpm/redhat/9.4/repmgr/F-20/repmgr.spec index aba8b39..29c629a 100644 --- a/rpm/redhat/9.4/repmgr/F-20/repmgr.spec +++ b/rpm/redhat/9.4/repmgr/F-20/repmgr.spec @@ -115,7 +115,11 @@ fi # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add %{sname}-%{pgpackageversion} %endif -%{__chown} repmgr: %{_localstatedir}/run/%{sname} +if [ ! -x %{_varrundir} ] +then + %{__mkdir} -m 700 %{_varrundir} + %{__chown} -R repmgr: %{_varrundir} +fi %postun -p /sbin/ldconfig diff --git a/rpm/redhat/9.4/repmgr/F-21/repmgr.init b/rpm/redhat/9.4/repmgr/F-21/repmgr.init index c900170..95e3757 100644 --- a/rpm/redhat/9.4/repmgr/F-21/repmgr.init +++ b/rpm/redhat/9.4/repmgr/F-21/repmgr.init @@ -54,7 +54,7 @@ start(){ mkdir -p $(dirname $pidfile) chown $user: $(dirname $pidfile) - su -l repmgr -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose + su -l $user -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose retval=$? [ $retval -eq 0 ] && success echo diff --git a/rpm/redhat/9.4/repmgr/F-21/repmgr.spec b/rpm/redhat/9.4/repmgr/F-21/repmgr.spec index aba8b39..29c629a 100644 --- a/rpm/redhat/9.4/repmgr/F-21/repmgr.spec +++ b/rpm/redhat/9.4/repmgr/F-21/repmgr.spec @@ -115,7 +115,11 @@ fi # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add %{sname}-%{pgpackageversion} %endif -%{__chown} repmgr: %{_localstatedir}/run/%{sname} +if [ ! -x %{_varrundir} ] +then + %{__mkdir} -m 700 %{_varrundir} + %{__chown} -R repmgr: %{_varrundir} +fi %postun -p /sbin/ldconfig diff --git a/rpm/redhat/9.4/repmgr/F-22/repmgr.init b/rpm/redhat/9.4/repmgr/F-22/repmgr.init index c900170..95e3757 100644 --- a/rpm/redhat/9.4/repmgr/F-22/repmgr.init +++ b/rpm/redhat/9.4/repmgr/F-22/repmgr.init @@ -54,7 +54,7 @@ start(){ mkdir -p $(dirname $pidfile) chown $user: $(dirname $pidfile) - su -l repmgr -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose + su -l $user -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose retval=$? [ $retval -eq 0 ] && success echo diff --git a/rpm/redhat/9.4/repmgr/F-22/repmgr.spec b/rpm/redhat/9.4/repmgr/F-22/repmgr.spec index aba8b39..5ae706f 100644 --- a/rpm/redhat/9.4/repmgr/F-22/repmgr.spec +++ b/rpm/redhat/9.4/repmgr/F-22/repmgr.spec @@ -115,7 +115,11 @@ fi # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add %{sname}-%{pgpackageversion} %endif -%{__chown} repmgr: %{_localstatedir}/run/%{sname} +if [ ! -x %{_varrundir} ] +then + %{__mkdir} -m 700 %{_varrundir} + %{__chown} -r repmgr: %{_varrundir} +fi %postun -p /sbin/ldconfig diff --git a/rpm/redhat/9.4/repmgr/F-23/repmgr.init b/rpm/redhat/9.4/repmgr/F-23/repmgr.init index c900170..95e3757 100644 --- a/rpm/redhat/9.4/repmgr/F-23/repmgr.init +++ b/rpm/redhat/9.4/repmgr/F-23/repmgr.init @@ -54,7 +54,7 @@ start(){ mkdir -p $(dirname $pidfile) chown $user: $(dirname $pidfile) - su -l repmgr -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose + su -l $user -c "$exec -f $REPMGRDCONF -p $pidfile -d ->> $REPMGRDLOG 2>&1" $user # --monitoring-history --verbose retval=$? [ $retval -eq 0 ] && success echo diff --git a/rpm/redhat/9.4/repmgr/F-23/repmgr.spec b/rpm/redhat/9.4/repmgr/F-23/repmgr.spec index aba8b39..5ae706f 100644 --- a/rpm/redhat/9.4/repmgr/F-23/repmgr.spec +++ b/rpm/redhat/9.4/repmgr/F-23/repmgr.spec @@ -115,7 +115,11 @@ fi # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add %{sname}-%{pgpackageversion} %endif -%{__chown} repmgr: %{_localstatedir}/run/%{sname} +if [ ! -x %{_varrundir} ] +then + %{__mkdir} -m 700 %{_varrundir} + %{__chown} -r repmgr: %{_varrundir} +fi %postun -p /sbin/ldconfig