diff --git a/debian/changelog b/debian/changelog index 9b81fa2..5e89d1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ patroni (2.0.1-1) UNRELEASED; urgency=medium * debian/patches/offline_intersphinx.patch: Refreshed. * debian/patches/requirements_setuptools.patch: Refreshed. * debian/control (patroni/Depends): Added python3-cdiff. + * debian/patches/startup_scripts.patch: Removed, applied upstream. -- Debian PostgreSQL Maintainers Wed, 26 Aug 2020 15:34:34 +0200 diff --git a/debian/patches/series b/debian/patches/series index cbf14f8..5d7b922 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -startup_scripts.patch acceptance_tests_system_patroni.patch requirements_setuptools.patch offline_intersphinx.patch diff --git a/debian/patches/startup_scripts.patch b/debian/patches/startup_scripts.patch deleted file mode 100644 index 5a0a1bf..0000000 --- a/debian/patches/startup_scripts.patch +++ /dev/null @@ -1,70 +0,0 @@ -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 @@ 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 @@ 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 -Index: patroni/extras/startup-scripts/patroni.service -=================================================================== ---- patroni.orig/extras/startup-scripts/patroni.service -+++ patroni/extras/startup-scripts/patroni.service -@@ -1,9 +1,7 @@ --# This is an example systemd config file for Patroni --# You can copy it to "/etc/systemd/system/patroni.service", -- - [Unit] - Description=Runners to orchestrate a high-availability PostgreSQL --After=syslog.target network.target -+After=network.target -+ConditionPathExists=/etc/patroni/config.yml - - [Service] - Type=simple -@@ -16,17 +14,13 @@ EnvironmentFile=-/etc/patroni_env.conf - - WorkingDirectory=~ - --# Where to send early-startup messages from the server --# This is normally controlled by the global default set by systemd --#StandardOutput=syslog -- - # Pre-commands to start watchdog device - # Uncomment if watchdog is part of your patroni setup - #ExecStartPre=-/usr/bin/sudo /sbin/modprobe softdog - #ExecStartPre=-/usr/bin/sudo /bin/chown postgres /dev/watchdog - - # Start the patroni process --ExecStart=/bin/patroni /etc/patroni.yml -+ExecStart=/usr/bin/patroni /etc/patroni/config.yml - - # Send HUP to reload from patroni.yml - ExecReload=/bin/kill -s HUP $MAINPID