Fix systemd integration

Bump DH compat to 10 to get systemd integration; patch patroni.service to start
only if /etc/patroni/config.yml exists; install service file directly from
extras/startup-scripts/ instead of via debian/.
This commit is contained in:
Christoph Berg 2018-02-07 10:41:56 +01:00
parent a94394c293
commit dd508183f8
7 changed files with 16 additions and 4 deletions

2
debian/changelog vendored
View file

@ -4,6 +4,8 @@ patroni (1.4.2-2) UNRELEASED; urgency=medium
* debian/tests: Tidy /tmp/pgpass?.
* debian/tests: Use zookeeperd when etcd-server is not available.
* features/environment.py: Make "import consul" optional.
* Bump DH compat to 10 to get systemd integration; patch patroni.service to
start only if /etc/patroni/config.yml exists.
-- Debian PostgreSQL Maintainers <pkg-postgresql-public@lists.alioth.debian.org> Sat, 03 Feb 2018 14:09:20 +0100

2
debian/compat vendored
View file

@ -1 +1 @@
9
10

2
debian/control vendored
View file

@ -5,7 +5,7 @@ Maintainer: Debian PostgreSQL Maintainers <pkg-postgresql-public@lists.alioth.de
Uploaders: Michael Banck <michael.banck@credativ.de>,
Adrian Vondendriesch <adrian.vondendriesch@credativ.de>,
Build-Depends:
debhelper (>= 9),
debhelper (>= 10),
dh-python,
libjs-jquery,
libjs-mathjax,

10
debian/patches/patroni_service.patch vendored Normal file
View file

@ -0,0 +1,10 @@
--- 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

View file

@ -3,3 +3,4 @@ startup_scripts.patch
coverage_binary.patch
relax_requirements.patch
consul_import.patch
patroni_service.patch

View file

@ -1 +1 @@
debian/patroni.service lib/systemd/system
extras/startup-scripts/patroni.service lib/systemd/system

1
debian/rules vendored
View file

@ -19,7 +19,6 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install
cp extras/startup-scripts/patroni debian/patroni.init
cp extras/startup-scripts/patroni.service debian/
override_dh_installdocs:
dh_installdocs