diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-05-08 16:27:04 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-05-08 16:27:04 +0000 |
commit | a836a244a3d2bdd4da1ee2641e3e957850668cea (patch) | |
tree | cb87c75b3677fab7144f868435243f864048a1e6 /contrib | |
parent | Adding upstream version 1.38.1. (diff) | |
download | netdata-a836a244a3d2bdd4da1ee2641e3e957850668cea.tar.xz netdata-a836a244a3d2bdd4da1ee2641e3e957850668cea.zip |
Adding upstream version 1.39.0.upstream/1.39.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/README.md | 4 | ||||
-rw-r--r-- | contrib/debian/conffiles | 4 | ||||
-rw-r--r-- | contrib/debian/control | 1 | ||||
-rwxr-xr-x | contrib/debian/rules | 11 |
4 files changed, 17 insertions, 3 deletions
diff --git a/contrib/README.md b/contrib/README.md index 36abd3b10..2a5e64050 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -1,6 +1,10 @@ <!-- title: "Netdata contrib" custom_edit_url: https://github.com/netdata/netdata/edit/master/contrib/README.md +sidebar_label: "Netdata contrib" +learn_status: "Published" +learn_topic_type: "References" +learn_rel_path: "Developers" --> # Netdata contrib diff --git a/contrib/debian/conffiles b/contrib/debian/conffiles new file mode 100644 index 000000000..5ea613f3d --- /dev/null +++ b/contrib/debian/conffiles @@ -0,0 +1,4 @@ +/etc/default/netdata +/etc/init.d/netdata +/etc/logrotate.d/netdata +/etc/netdata/netdata.conf diff --git a/contrib/debian/control b/contrib/debian/control index c5e5791ff..eeeb8d25c 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9.20160709), libssl-dev, libmnl-dev, libjson-c-dev, + libyaml-dev, libcups2-dev, libipmimonitoring-dev, libnetfilter-acct-dev, diff --git a/contrib/debian/rules b/contrib/debian/rules index a4820cd4a..149b19ec7 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -10,9 +10,9 @@ BASE_CONFIG = system/netdata.conf SYSTEMD_VERSION = $(shell /bin/sh -c "systemd --version 2>&1 | head -n 1 | cut -f 2 -d ' '") ifeq ($(shell test $(SYSTEMD_VERSION) -ge 235 && echo "1"), 1) -SYSTEMD_UNIT = system/netdata.service.v235 +SYSTEMD_UNIT = system/systemd/netdata.service.v235 else -SYSTEMD_UNIT = system/netdata.service +SYSTEMD_UNIT = system/systemd/netdata.service endif ifeq ($(shell test `uname -m` != "x86_64" && echo "1"), 1) @@ -124,9 +124,14 @@ override_dh_fixperms: chmod 4750 $(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d/freeipmi.plugin override_dh_installlogrotate: - cp system/netdata.logrotate debian/netdata.logrotate + cp system/logrotate/netdata debian/netdata.logrotate dh_installlogrotate +override_dh_installdeb: + dh_installdeb + @echo "Recreating conffiles without auto-adding /etc files" + @cp $(CURDIR)/debian/conffiles $(CURDIR)/debian/netdata/DEBIAN/conffiles + override_dh_clean: dh_clean |