* debian/patches/patroni_service.patch: Removed, and folded into ...
* debian/patches/startup_scripts.patch: ... this.
This commit is contained in:
parent
4c4b5174b4
commit
c2d94ded1d
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -3,6 +3,8 @@ patroni (1.5.0-6) UNRELEASED; urgency=medium
|
||||||
[ Michael Banck ]
|
[ Michael Banck ]
|
||||||
* debian/config.yml: Updated with recent changes from upstream config
|
* debian/config.yml: Updated with recent changes from upstream config
|
||||||
example.
|
example.
|
||||||
|
* debian/patches/patroni_service.patch: Removed, and folded into ...
|
||||||
|
* debian/patches/startup_scripts.patch: ... this.
|
||||||
|
|
||||||
-- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Wed, 26 Sep 2018 16:09:24 +0200
|
-- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Wed, 26 Sep 2018 16:09:24 +0200
|
||||||
|
|
||||||
|
|
10
debian/patches/patroni_service.patch
vendored
10
debian/patches/patroni_service.patch
vendored
|
@ -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
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -2,6 +2,5 @@ sphinx_no_mathjax.patch
|
||||||
startup_scripts.patch
|
startup_scripts.patch
|
||||||
coverage_binary.patch
|
coverage_binary.patch
|
||||||
consul_import.patch
|
consul_import.patch
|
||||||
patroni_service.patch
|
|
||||||
behave_failure_logging.patch
|
behave_failure_logging.patch
|
||||||
check_postmaster.patch
|
check_postmaster.patch
|
||||||
|
|
5
debian/patches/startup_scripts.patch
vendored
5
debian/patches/startup_scripts.patch
vendored
|
@ -37,7 +37,7 @@ Index: patroni/extras/startup-scripts/patroni.service
|
||||||
===================================================================
|
===================================================================
|
||||||
--- patroni.orig/extras/startup-scripts/patroni.service
|
--- patroni.orig/extras/startup-scripts/patroni.service
|
||||||
+++ patroni/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
|
-# This is an example systemd config file for Patroni
|
||||||
-# You can copy it to "/etc/systemd/system/patroni.service",
|
-# 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
|
Description=Runners to orchestrate a high-availability PostgreSQL
|
||||||
-After=syslog.target network.target
|
-After=syslog.target network.target
|
||||||
+After=network.target
|
+After=network.target
|
||||||
|
+ConditionPathExists=/etc/patroni/config.yml
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
@@ -16,11 +13,7 @@ EnvironmentFile=-/etc/patroni_env.conf
|
@@ -16,11 +14,7 @@ EnvironmentFile=-/etc/patroni_env.conf
|
||||||
|
|
||||||
WorkingDirectory=~
|
WorkingDirectory=~
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue