Updating paths for upstreams /usr/lib/netdata to /usr/libexec/netdata transition.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 20 insertions, 19 deletions

diff --git a/debian/netdata-plugins-bash.install b/debian/netdata-plugins-bash.install
index 64cbf1a4a..ce0f65526 100644
--- a/debian/netdata-plugins-bash.install
+++ b/debian/netdata-plugins-bash.install
@@ -1,6 +1,6 @@
 etc/netdata/charts.d
-usr/lib/netdata/charts.d/*.sh
 usr/lib/netdata/conf.d/charts.d
 usr/lib/netdata/conf.d/charts.d.conf
 usr/lib/netdata/conf.d/ioping.conf
-usr/lib/netdata/plugins.d
+usr/libexec/netdata/charts.d/*.sh
+usr/libexec/netdata/plugins.d
diff --git a/debian/netdata-plugins-python.install b/debian/netdata-plugins-python.install
index 8eff5e9ea..b0de49f05 100644
--- a/debian/netdata-plugins-python.install
+++ b/debian/netdata-plugins-python.install
@@ -1,4 +1,4 @@
 etc/netdata/python.d
 usr/lib/netdata/conf.d/python.d
 usr/lib/netdata/conf.d/python.d.conf
-usr/lib/netdata/python.d
+usr/libexec/netdata/python.d
diff --git a/debian/rules b/debian/rules
index 06dda0e92..e13c9a2c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,9 @@ override_dh_auto_configure:
 execute_after_dh_auto_install:
 	# Removing unused files
 	rm -f debian/tmp/etc/netdata/.install-type
-	rm -f debian/tmp/etc/netdata/netdata-updater.conf
-	rm -f debian/tmp/usr/lib/netdata/install-service.sh
+	rm -f debian/tmp/usr/libexec/netdata/install-service.sh
+	rm -f debian/tmp/usr/lib/netdata/conf.d/netdata-updater.conf
+	rm -f debian/tmp/usr/libexec/netdata/netdata-updater.sh
 	rm -rf debian/tmp/usr/lib/netdata/system
 
 	# Building without aws kinesis backend (needs aws sdk)
@@ -53,11 +54,11 @@ override_dh_install-arch:
 	cp debian/local/netdata/netdata.conf debian/netdata-core/etc/netdata
 	touch debian/netdata-core/etc/netdata/.opt-out-from-anonymous-statistics
 
-	mkdir -p debian/netdata-core/usr/lib/netdata/plugins.d
+	mkdir -p debian/netdata-core/usr/libexec/netdata/plugins.d
 	for plugin in cgroup-network apps.plugin nfacct.plugin perf.plugin slabinfo.plugin; \
 	do \
-		cp debian/tmp/usr/lib/netdata/plugins.d/$${plugin} \
-		   debian/netdata-core/usr/lib/netdata/plugins.d; \
+		cp debian/tmp/usr/libexec/netdata/plugins.d/$${plugin} \
+		   debian/netdata-core/usr/libexec/netdata/plugins.d; \
 	done
 
 	dh_install -a
@@ -68,18 +69,18 @@ override_dh_install-indep:
 	dh_install -i
 
 	# Move architecture dependent plugins
-	mkdir -p debian/netdata-core/usr/lib/netdata/plugins.d
+	mkdir -p debian/netdata-core/usr/libexec/netdata/plugins.d
 	for plugin in cgroup-network apps.plugin nfacct.plugin perf.plugin slabinfo.plugin; \
 	do \
-		mv -f debian/netdata-plugins-bash/usr/lib/netdata/plugins.d/$${plugin} \
-		   debian/netdata-core/usr/lib/netdata/plugins.d; \
+		mv -f debian/netdata-plugins-bash/usr/libexec/netdata/plugins.d/$${plugin} \
+		   debian/netdata-core/usr/libexec/netdata/plugins.d; \
 	done
 
-	mkdir -p debian/netdata-plugins-python/usr/lib/netdata/plugins.d
+	mkdir -p debian/netdata-plugins-python/usr/libexec/netdata/plugins.d
 	for plugin in python.d.plugin; \
 	do \
-		mv debian/netdata-plugins-bash/usr/lib/netdata/plugins.d/$${plugin} \
-		   debian/netdata-plugins-python/usr/lib/netdata/plugins.d; \
+		mv debian/netdata-plugins-bash/usr/libexec/netdata/plugins.d/$${plugin} \
+		   debian/netdata-plugins-python/usr/libexec/netdata/plugins.d; \
 	done
 
 	# Setting package version (update check)
@@ -98,14 +99,14 @@ override_dh_fixperms-arch:
 
 	# apps.plugin should only be runnable by the netdata user. It will be
 	# given extra capabilities in the postinst script.
-	chmod 0754 debian/netdata-core/usr/lib/netdata/plugins.d/apps.plugin
-	chmod 4754 debian/netdata-core/usr/lib/netdata/plugins.d/perf.plugin
+	chmod 0754 debian/netdata-core/usr/libexec/netdata/plugins.d/apps.plugin
+	chmod 4754 debian/netdata-core/usr/libexec/netdata/plugins.d/perf.plugin
 
 override_dh_fixperms-indep:
 	dh_fixperms -i
 
 	# apps.plugin should only be runnable by the netdata user. It will be
 	# given extra capabilities in the postinst script.
-	chmod 0644 debian/netdata-plugins-bash/usr/lib/netdata/charts.d/*.sh
-	chmod 0644 debian/netdata-plugins-bash/usr/lib/netdata/plugins.d/*.sh.inc
-	chmod 0644 debian/netdata-plugins-python/usr/lib/netdata/python.d/*.py
+	chmod 0644 debian/netdata-plugins-bash/usr/libexec/netdata/charts.d/*.sh
+	chmod 0644 debian/netdata-plugins-bash/usr/libexec/netdata/plugins.d/*.sh.inc
+	chmod 0644 debian/netdata-plugins-python/usr/libexec/netdata/python.d/*.py