* debian/patches/startup_scripts.patch: Updated.

This commit is contained in:
Michael Banck 2018-01-24 07:02:56 +01:00
parent dba3332fcd
commit 1c14a2bb17
2 changed files with 33 additions and 28 deletions

1
debian/changelog vendored
View file

@ -8,6 +8,7 @@ patroni (1.4.1-1) UNRELEASED; urgency=medium
[ Michael Banck ]
* debian/patches/pgpass_in_testsuite.patch: Removed, no longer needed.
* debian/patches/sphinx_no_mathjax.patch: Refreshed.
* debian/patches/startup_scripts.patch: Updated.
-- Christoph Berg <myon@debian.org> Mon, 25 Dec 2017 18:03:36 +0100

View file

@ -1,38 +1,42 @@
--- ./extras/startup-scripts/patroni 2017-09-08 10:56:09.000000000 +0200
+++ debian/patroni.init 2017-09-14 14:49:36.103403273 +0200
@@ -18,7 +18,7 @@
GROUP="postgres"
NAME=patroni
-PATRONI="/opt/patroni/$NAME.py"
Index: patroni/extras/startup-scripts/patroni
===================================================================
--- patroni.orig/extras/startup-scripts/patroni
+++ patroni/extras/startup-scripts/patroni
@@ -18,7 +18,7 @@ USER="postgres"
GROUP="postgres"
NAME=patroni
-PATRONI="/opt/patroni/$NAME.py"
+PATRONI="/usr/bin/$NAME"
PIDFILE="/var/run/$NAME.pid"
# Set this parameter, if you have several Postgres versions installed
@@ -114,6 +114,12 @@
kill -HUP $CHILDPID
;;
PIDFILE="/var/run/$NAME.pid"
# Set this parameter, if you have several Postgres versions installed
@@ -114,6 +114,12 @@ case "$1" in
kill -HUP $CHILDPID
;;
+ force-reload)
+ log_success_msg "Rorce-reloading Patroni configuration"
+ get_pid
+ kill -HUP $CHILDPID
+ ;;
+
status)
get_pid
if start-stop-daemon -T --pid $CHILDPID; then
@@ -130,7 +136,7 @@
;;
*)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|status}"
status)
get_pid
if start-stop-daemon -T --pid $CHILDPID; then
@@ -130,7 +136,7 @@ case "$1" in
;;
*)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|status}"
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload|status}"
exit 1
;;
esac
--- ./extras/startup-scripts/patroni.service 2017-09-08 10:56:09.000000000 +0200
+++ debian/patroni.service 2017-09-14 14:50:02.095431685 +0200
exit 1
;;
esac
Index: patroni/extras/startup-scripts/patroni.service
===================================================================
--- patroni.orig/extras/startup-scripts/patroni.service
+++ patroni/extras/startup-scripts/patroni.service
@@ -1,9 +1,6 @@
-# This is an example systemd config file for Patroni
-# You can copy it to "/etc/systemd/system/patroni.service",
@ -44,7 +48,7 @@
[Service]
Type=simple
@@ -11,11 +8,7 @@
@@ -11,11 +8,7 @@ Type=simple
User=postgres
Group=postgres