From 1dad48e65633b4c698be2dd622bfdd3013ffafa3 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 1 Sep 2015 21:22:11 +0200 Subject: [PATCH 1/5] rename systemd service file to respect naming conventions. --- debian/changelog | 3 +++ debian/{collectd.service => collectd-core.collectd.service} | 0 debian/rules | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) rename debian/{collectd.service => collectd-core.collectd.service} (100%) diff --git a/debian/changelog b/debian/changelog index 60835f5..81cf056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ collectd (5.5.0-3) UNRELEASED; urgency=medium - Strip out non-deterministic bits out of generated jar files. * debian/collectd-core.overrides: - Update 'capitalization-error-in-description' lintian override. + * debian/rules, debian/collectd-core.collectd.service: + - Rename systemd service file to collectd-core.collectd.service, to honour + debhelper's naming convention. -- Marc Fournier Tue, 25 Aug 2015 06:55:52 +0200 diff --git a/debian/collectd.service b/debian/collectd-core.collectd.service similarity index 100% rename from debian/collectd.service rename to debian/collectd-core.collectd.service diff --git a/debian/rules b/debian/rules index 3960dff..0da5b2b 100755 --- a/debian/rules +++ b/debian/rules @@ -281,7 +281,7 @@ binary-arch: build install-arch && rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \ && rm -f lib/Collectd/Graph/MetaData.pm ) dh_installdebconf -a - dh_systemd_enable -pcollectd-core --name=collectd collectd.service + dh_systemd_enable -pcollectd-core --name=collectd dh_installinit -pcollectd-core --name=collectd -- defaults 95 dh_systemd_start -pcollectd-core dh_link -a From 8d89cca00c31e0192ff5689fc9fc3419d1f7676d Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 1 Sep 2015 21:34:33 +0200 Subject: [PATCH 2/5] systemd service file: check for config file presence. Thanks to @bzed for reporting this issue ! --- debian/changelog | 2 ++ debian/collectd-core.collectd.service | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 81cf056..75d72ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ collectd (5.5.0-3) UNRELEASED; urgency=medium * debian/rules, debian/collectd-core.collectd.service: - Rename systemd service file to collectd-core.collectd.service, to honour debhelper's naming convention. + * debian/collectd-core.collectd.service: + - Check for configuration file presence before starting the daemon. -- Marc Fournier Tue, 25 Aug 2015 06:55:52 +0200 diff --git a/debian/collectd-core.collectd.service b/debian/collectd-core.collectd.service index 2fee302..7f6f6b3 100644 --- a/debian/collectd-core.collectd.service +++ b/debian/collectd-core.collectd.service @@ -2,6 +2,7 @@ Description=Statistics collection and monitoring daemon After=local-fs.target network.target Requires=local-fs.target network.target +ConditionPathExists=/etc/collectd/collectd.conf Documentation=man:collectd(1) Documentation=man:collectd.conf(5) Documentation=https://collectd.org From fd43093e8d4309df5e4d0d28c5ee358159d8cd50 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 1 Sep 2015 22:01:35 +0200 Subject: [PATCH 3/5] systemd service file: make sure `collectd -t` succeeds --- debian/changelog | 1 + debian/collectd-core.collectd.service | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 75d72ae..5d4df14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ collectd (5.5.0-3) UNRELEASED; urgency=medium debhelper's naming convention. * debian/collectd-core.collectd.service: - Check for configuration file presence before starting the daemon. + - Check for configuration file validity before starting the daemon. -- Marc Fournier Tue, 25 Aug 2015 06:55:52 +0200 diff --git a/debian/collectd-core.collectd.service b/debian/collectd-core.collectd.service index 7f6f6b3..e179f76 100644 --- a/debian/collectd-core.collectd.service +++ b/debian/collectd-core.collectd.service @@ -11,6 +11,7 @@ Documentation=https://collectd.org Type=notify NotifyAccess=main EnvironmentFile=-/etc/default/collectd +ExecStartPre=/usr/sbin/collectd -t ExecStart=/usr/sbin/collectd Restart=always RestartSec=10 From ce3656600fc7b23c7306e6e9390aaee25794b677 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 1 Sep 2015 22:04:22 +0200 Subject: [PATCH 4/5] update my email address --- debian/changelog | 4 +++- debian/control | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d4df14..6973655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,10 @@ collectd (5.5.0-3) UNRELEASED; urgency=medium * debian/collectd-core.collectd.service: - Check for configuration file presence before starting the daemon. - Check for configuration file validity before starting the daemon. + * debian/control, debian/changelog: + - Update my email address to match identity of current GPG key. - -- Marc Fournier Tue, 25 Aug 2015 06:55:52 +0200 + -- Marc Fournier Tue, 25 Aug 2015 06:55:52 +0200 collectd (5.5.0-2) unstable; urgency=low diff --git a/debian/control b/debian/control index f89a0c8..f6982bd 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Uploaders: Marc Fournier +Uploaders: Marc Fournier Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism, bison, flex, autotools-dev, libltdl-dev, pkg-config, iptables-dev (>= 1.4.3.2-2) [linux-any], From 72f2e99f4904f6a0acab64dd41fc71159fd5dedf Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Tue, 1 Sep 2015 22:04:45 +0200 Subject: [PATCH 5/5] better phrasing in changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6973655..e1d060f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ collectd (5.5.0-3) UNRELEASED; urgency=medium * debian/rules, debian/control: - - Avoid hiding compiler options, allowing the buildd log scanner to do - it's job. + - Avoid hiding compiler options at build time, allowing the buildd log + scanner to do it's job. - Disable smart plugin on non-linux platforms, due to missing libatasmart-dev build-dependency. - Strip out non-deterministic bits out of generated jar files.