From ddc047d0ed7d1ca4b5bb42dfaf68ed0515dd19ac Mon Sep 17 00:00:00 2001 From: Drew Michel Date: Tue, 6 Nov 2018 13:49:10 -0500 Subject: [PATCH] Revert "Add support for running ffwd under systemd" --- debian/control.in | 1 - debian/ffwd.service.in | 11 ----------- debian/rules.in | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 debian/ffwd.service.in diff --git a/debian/control.in b/debian/control.in index 0a4992ae..24d50811 100644 --- a/debian/control.in +++ b/debian/control.in @@ -4,7 +4,6 @@ Priority: extra Maintainer: IO Build-Depends: debhelper, - dh-systemd, default-jdk (>= 1.8), maven3 | maven (>= 3) Standards-Version: 3.9.1 diff --git a/debian/ffwd.service.in b/debian/ffwd.service.in deleted file mode 100644 index 36ffed05..00000000 --- a/debian/ffwd.service.in +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=fast-forward monitoring agent -Documentation=https://github.com/spotify/ffwd - -[Service] -ExecStart=/usr/bin/ffwd-RELEASE /etc/ffwd/ffwd-RELEASE.yaml -ExecStopPost=/bin/sleep 10 -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/debian/rules.in b/debian/rules.in index b30730ad..568800bf 100755 --- a/debian/rules.in +++ b/debian/rules.in @@ -26,7 +26,7 @@ FFWD=$(BUILD)/ffwd-RELEASE DEB_VERSION:=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') %: - dh $@ --with=systemd + dh $@ override_dh_auto_clean: rm -rf $(BUILD)