From 17c93e2be4ad7b3af0cd6878bdd5d8a4a3e6da99 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 28 Nov 2019 05:53:29 +0100 Subject: Merging upstream version 1.19.0. Signed-off-by: Daniel Baumann --- contrib/debian/rules | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'contrib/debian/rules') diff --git a/contrib/debian/rules b/contrib/debian/rules index 0e17e3953..56d346aeb 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -28,10 +28,6 @@ debian/%.postinst: debian/%.postinst.in override_dh_install: debian/netdata.postinst dh_install - # Remove unneeded .keep files - # - find "$(TOP)" -name .keep -exec rm '{}' ';' - # Set the CUPS plugin install rule # mkdir -p $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d @@ -40,24 +36,9 @@ override_dh_install: debian/netdata.postinst # Set the rest of the software in the main package # - cp -rp $(TEMPTOP)/usr $(TOP)/usr - cp -rp $(TEMPTOP)/var $(TOP)/var - #cp -rp $(TEMPTOP)/etc $(TOP)/etc - - # Copy sample netdata.conf - cp -p $(CURDIR)/system/edit-config $(TOP)/etc/netdata/ - - # Create placeholder dirs in netdata configuration directory - # - mkdir -p $(TOP)/etc/netdata/health.d - mkdir -p $(TOP)/etc/netdata/python.d - mkdir -p $(TOP)/etc/netdata/charts.d - mkdir -p $(TOP)/etc/netdata/cystonm-plugins.d - mkdir -p $(TOP)/etc/netdata/go.d - mkdir -p $(TOP)/etc/netdata/ssl - mkdir -p $(TOP)/etc/netdata/node.d - mkdir -p $(TOP)/etc/netdata/statsd.d - + cp -rp $(TEMPTOP)/usr $(TOP) + cp -rp $(TEMPTOP)/var $(TOP) + cp -rp $(TEMPTOP)/etc $(TOP) # Move files that local user shouldn't be editing to /usr/share/netdata # @@ -110,10 +91,6 @@ override_dh_fixperms: chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/slabinfo.plugin chmod 0750 $(TOP)/usr/libexec/netdata/plugins.d/go.d.plugin - # Support script for configuration file management - # - chmod 0750 $(TOP)/etc/netdata/edit-config - # CUPS plugin package chmod 0750 $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin -- cgit v1.2.3