diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2020-03-30 14:05:46 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 14:05:46 +1000 |
| commit | d5d1865469b63385d70645f710728482aed0f23d (patch) | |
| tree | 8f27ba9794542fad7c20db90f997f707a5a19289 /system | |
| parent | 3568c340ada6878686bfe5b6f39a8c75c7c64ca7 (diff) | |
Fix our Debian/Ubuntu packages to actually package the SystemD Unit files we expect. (#8468)
* update netdata.conf for debian build
* Fix Debian Ubuntu SystemD Unit packaging
* avoid duplicate netdata.conf files
violates single source of truth principle, use schema from #8468 instead
* Fixed *DirectoryMode octets and bad ExecStart
* Fix dpkg-statoverride warnings
* Move the copy of debian/netdata.conf into the correct target (override_dh_install)
Co-authored-by: and0x000 <justanpc@gmail.com>
Diffstat (limited to 'system')
| -rw-r--r-- | system/Makefile.am | 3 | ||||
| -rw-r--r-- | system/netdata.service.v235.in | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/system/Makefile.am b/system/Makefile.am index ad68c65541..babad46990 100644 --- a/system/Makefile.am +++ b/system/Makefile.am @@ -7,6 +7,7 @@ CLEANFILES = \ netdata-openrc \ netdata.logrotate \ netdata.service \ + netdata.service.v235 \ netdata-init-d \ netdata-lsb \ netdata-freebsd \ @@ -28,6 +29,7 @@ nodist_noinst_DATA = \ netdata-openrc \ netdata.logrotate \ netdata.service \ + netdata.service.v235 \ netdata-init-d \ netdata-lsb \ netdata-freebsd \ @@ -39,6 +41,7 @@ dist_noinst_DATA = \ netdata-openrc.in \ netdata.logrotate.in \ netdata.service.in \ + netdata.service.v235.in \ netdata-init-d.in \ netdata-lsb.in \ netdata-freebsd.in \ diff --git a/system/netdata.service.v235.in b/system/netdata.service.v235.in index 303acb17c1..fc0e245c5a 100644 --- a/system/netdata.service.v235.in +++ b/system/netdata.service.v235.in @@ -14,11 +14,11 @@ CacheDirectory=netdata StateDirectory=netdata LogsDirectory=netdata RuntimeDirectoryMode=0775 -StateDirectoryMode=0750 -CacheDirectoryMode=0750 -LogsDirectoryMode=0750 -PIDFile=netdata/netdata.pid -ExecStart=@sbindir_POST@/netdata -P $PIDFILE -D +StateDirectoryMode=0755 +CacheDirectoryMode=0755 +LogsDirectoryMode=2750 +EnvironmentFile=-/etc/default/netdata +ExecStart=/usr/sbin/netdata -D $EXTRA_OPTS # saving a big db on slow disks may need some time TimeoutStopSec=60 |