summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Weller <lhw@ring0.de>2016-05-18 13:01:43 +0000
committerLennart Weller <lhw@ring0.de>2016-05-18 13:01:43 +0000
commit66130d3f4fdb2cea87186dcc2e6c7444b801f900 (patch)
treee2184604b259c0adc9e223789ac80c870078ce28
parentmulti-arch dirs and links with javascript (diff)
downloadnetdata-66130d3f4fdb2cea87186dcc2e6c7444b801f900.tar.xz
netdata-66130d3f4fdb2cea87186dcc2e6c7444b801f900.zip
removed nodejs plugins for now. updated some paths
-rw-r--r--debian/control14
-rw-r--r--debian/netdata-plugins-nodejs.install2
-rw-r--r--debian/netdata.links.in2
-rw-r--r--debian/netdata.postinst.in6
-rwxr-xr-xdebian/rules3
5 files changed, 5 insertions, 22 deletions
diff --git a/debian/control b/debian/control
index e965ed38c..f64bcaff7 100644
--- a/debian/control
+++ b/debian/control
@@ -36,22 +36,10 @@ Package: netdata-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: real-time charts for system monitoring
+Description: real-time charts for system monitoring (Data)
Netdata is a daemon that collects data in realtime (per second)
and presents a web site to view and analyze them. The presentation
is also real-time and full of interactive charts that precisely
render all collected values.
.
This package contains all the architecture independent data
-
-Package: netdata-plugins-nodejs
-Architecture: all
-Multi-Arch: foreign
-Depends: nodejs, netdata, ${misc:Depends}, ${shlibs:Depends}
-Description: real-time charts for system monitoring
- Netdata is a daemon that collects data in realtime (per second)
- and presents a web site to view and analyze them. The presentation
- is also real-time and full of interactive charts that precisely
- render all collected values.
- .
- This package contains all the nodejs plugins
diff --git a/debian/netdata-plugins-nodejs.install b/debian/netdata-plugins-nodejs.install
deleted file mode 100644
index 0ace52d81..000000000
--- a/debian/netdata-plugins-nodejs.install
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/*/netdata/node.d /usr/share/javascript/netdata
-/usr/lib/*/netdata/plugins.d/node.d.plugin /usr/share/javascript/netdata
diff --git a/debian/netdata.links.in b/debian/netdata.links.in
deleted file mode 100644
index 727bc09dc..000000000
--- a/debian/netdata.links.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#/usr/share/javascript/netdata/node.d /usr/lib/@DEB_HOST_MULTIARCH@/netdata/
-#/usr/share/javascript/netdata/plugins.d/node.d.plugin /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d/
diff --git a/debian/netdata.postinst.in b/debian/netdata.postinst.in
index 36a03c0b1..90aa33c1b 100644
--- a/debian/netdata.postinst.in
+++ b/debian/netdata.postinst.in
@@ -17,8 +17,8 @@ case "$1" in
dpkg-statoverride --update --add root netdata 0755 /var/lib/netdata
fi
- if ! dpkg-statoverride --list /var/lib/netdata/www >/dev/null 2>&1; then
- dpkg-statoverride --update --add root netdata 0755 /var/lib/netdata/www
+ if ! dpkg-statoverride --list /usr/share/netdata/web >/dev/null 2>&1; then
+ dpkg-statoverride --update --add root netdata 0755 /usr/share/netdata/web
fi
if ! dpkg-statoverride --list /var/cache/netdata >/dev/null 2>&1; then
@@ -27,7 +27,7 @@ case "$1" in
fi
- chown -R root:netdata /usr/share/netdata/*
+ chown -R root:netdata /usr/share/netdata/web
chown -R root:netdata /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d
setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d/apps.plugin
chown netdata:adm /var/log/netdata
diff --git a/debian/rules b/debian/rules
index 43f312add..432ba1c07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall -O3
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-MULTIARCH_INSTALL = debian/netdata.postinst \
- debian/netdata.links
+MULTIARCH_INSTALL = debian/netdata.postinst
%:
# For jessie and beyond
#