diff --git a/debian/changelog b/debian/changelog index 7de893b..16038bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ patroni (1.5.0-6) UNRELEASED; urgency=medium [ Michael Banck ] * debian/config.yml: Updated with recent changes from upstream config example. + * debian/patches/patroni_service.patch: Removed, and folded into ... + * debian/patches/startup_scripts.patch: ... this. -- Debian PostgreSQL Maintainers Wed, 26 Sep 2018 16:09:24 +0200 diff --git a/debian/patches/patroni_service.patch b/debian/patches/patroni_service.patch deleted file mode 100644 index 5108bae..0000000 --- a/debian/patches/patroni_service.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/extras/startup-scripts/patroni.service -+++ b/extras/startup-scripts/patroni.service -@@ -1,6 +1,7 @@ - [Unit] - Description=Runners to orchestrate a high-availability PostgreSQL - After=network.target -+ConditionPathExists=/etc/patroni/config.yml - - [Service] - Type=simple diff --git a/debian/patches/series b/debian/patches/series index 8f40b6c..9848edc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,5 @@ sphinx_no_mathjax.patch startup_scripts.patch coverage_binary.patch consul_import.patch -patroni_service.patch behave_failure_logging.patch check_postmaster.patch diff --git a/debian/patches/startup_scripts.patch b/debian/patches/startup_scripts.patch index a8687d5..f08f447 100644 --- a/debian/patches/startup_scripts.patch +++ b/debian/patches/startup_scripts.patch @@ -37,7 +37,7 @@ Index: patroni/extras/startup-scripts/patroni.service =================================================================== --- patroni.orig/extras/startup-scripts/patroni.service +++ patroni/extras/startup-scripts/patroni.service -@@ -1,9 +1,6 @@ +@@ -1,9 +1,7 @@ -# This is an example systemd config file for Patroni -# You can copy it to "/etc/systemd/system/patroni.service", - @@ -45,10 +45,11 @@ Index: patroni/extras/startup-scripts/patroni.service 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,11 +13,7 @@ EnvironmentFile=-/etc/patroni_env.conf +@@ -16,11 +14,7 @@ EnvironmentFile=-/etc/patroni_env.conf WorkingDirectory=~