Commit c0ca67ad authored by Sebastian Harl's avatar Sebastian Harl

Merge pull request #3 from mfournier/more-changes-for-5.5.0-3

Fix systemd behavior when the config file is missing.

This was causing problems, for example, when only installing collectd-core which does not provide a config file. The old init script handles this gracefully and so does the service file now.
parents e280f950 72f2e99f
collectd (5.5.0-3) UNRELEASED; urgency=medium collectd (5.5.0-3) UNRELEASED; urgency=medium
* debian/rules, debian/control: * debian/rules, debian/control:
- Avoid hiding compiler options, allowing the buildd log scanner to do - Avoid hiding compiler options at build time, allowing the buildd log
it's job. scanner to do it's job.
- Disable smart plugin on non-linux platforms, due to missing - Disable smart plugin on non-linux platforms, due to missing
libatasmart-dev build-dependency. libatasmart-dev build-dependency.
- Strip out non-deterministic bits out of generated jar files. - Strip out non-deterministic bits out of generated jar files.
* debian/collectd-core.overrides: * debian/collectd-core.overrides:
- Update 'capitalization-error-in-description' lintian override. - Update 'capitalization-error-in-description' lintian override.
* debian/rules, debian/collectd-core.collectd.service:
-- Marc Fournier <marc.fournier@camptocamp.com> Tue, 25 Aug 2015 06:55:52 +0200 - 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.
- 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 <marc@bl.uem.li> Tue, 25 Aug 2015 06:55:52 +0200
collectd (5.5.0-2) unstable; urgency=low collectd (5.5.0-2) unstable; urgency=low
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Description=Statistics collection and monitoring daemon Description=Statistics collection and monitoring daemon
After=local-fs.target network.target After=local-fs.target network.target
Requires=local-fs.target network.target Requires=local-fs.target network.target
ConditionPathExists=/etc/collectd/collectd.conf
Documentation=man:collectd(1) Documentation=man:collectd(1)
Documentation=man:collectd.conf(5) Documentation=man:collectd.conf(5)
Documentation=https://collectd.org Documentation=https://collectd.org
...@@ -10,6 +11,7 @@ Documentation=https://collectd.org ...@@ -10,6 +11,7 @@ Documentation=https://collectd.org
Type=notify Type=notify
NotifyAccess=main NotifyAccess=main
EnvironmentFile=-/etc/default/collectd EnvironmentFile=-/etc/default/collectd
ExecStartPre=/usr/sbin/collectd -t
ExecStart=/usr/sbin/collectd ExecStart=/usr/sbin/collectd
Restart=always Restart=always
RestartSec=10 RestartSec=10
......
...@@ -2,7 +2,7 @@ Source: collectd ...@@ -2,7 +2,7 @@ Source: collectd
Section: utils Section: utils
Priority: optional Priority: optional
Maintainer: Sebastian Harl <tokkee@debian.org> Maintainer: Sebastian Harl <tokkee@debian.org>
Uploaders: Marc Fournier <marc.fournier@camptocamp.com> Uploaders: Marc Fournier <marc@bl.uem.li>
Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism, 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, bison, flex, autotools-dev, libltdl-dev, pkg-config,
iptables-dev (>= 1.4.3.2-2) [linux-any], iptables-dev (>= 1.4.3.2-2) [linux-any],
......
...@@ -281,7 +281,7 @@ binary-arch: build install-arch ...@@ -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/File.pm lib/Collectd/Graph/Filter.pm \
&& rm -f lib/Collectd/Graph/MetaData.pm ) && rm -f lib/Collectd/Graph/MetaData.pm )
dh_installdebconf -a 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_installinit -pcollectd-core --name=collectd -- defaults 95
dh_systemd_start -pcollectd-core dh_systemd_start -pcollectd-core
dh_link -a dh_link -a
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment