summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Weller <lhw@ring0.de>2017-01-26 13:43:03 +0000
committerLennart Weller <lhw@ring0.de>2017-01-26 13:54:06 +0000
commit273b4d88d91cecfa3c720c863ba2b1a636ad563d (patch)
tree31bb498f62cc9e224fd15db78d9adb7552f13187
parentupdated dependencies and links from other packages (diff)
downloadnetdata-273b4d88d91cecfa3c720c863ba2b1a636ad563d.tar.xz
netdata-273b4d88d91cecfa3c720c863ba2b1a636ad563d.zip
changed script/python files permissions and removed patch.
added missing python copyrights
-rw-r--r--debian/copyright29
-rw-r--r--debian/patches/0004-readd-shebang-to-chart-scripts.patch227
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules3
4 files changed, 32 insertions, 228 deletions
diff --git a/debian/copyright b/debian/copyright
index 706028663..625a019e1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -163,6 +163,16 @@ Copyright: 2016 Dmitry Baranovskiy
2016 Sencha Labs
License: Expat
+Files:
+ python.d/python_modules/lm_sensors.py
+Copyright: 2015 Pavel Rojtberg
+License: LGPL-2.1
+
+Files:
+ python.d/python_modules/base.py
+Copyright: 2016 Pawel Krupa
+License: GPL-3+
+
License: LGPL-3+
This library is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
@@ -180,6 +190,25 @@ License: LGPL-3+
On Debian systems, the complete text of the GNU Lesser General Public
License version 3 can be found in /usr/share/common-licenses/LGPL-3.
+License: LGPL-2.1
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU Library
+ General Public License, version 2, can be found in
+ /usr/share/common-licenses/LGPL-2.
+
License: GPL-3+
This program is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
diff --git a/debian/patches/0004-readd-shebang-to-chart-scripts.patch b/debian/patches/0004-readd-shebang-to-chart-scripts.patch
deleted file mode 100644
index ef40c2df6..000000000
--- a/debian/patches/0004-readd-shebang-to-chart-scripts.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From: Lennart Weller <lhw@ring0.de>
-Date: Tue, 24 Jan 2017 16:49:02 +0100
-Subject: re-add shebang to chart scripts
-
----
- charts.d/ap.chart.sh | 2 +-
- charts.d/apache.chart.sh | 2 +-
- charts.d/apcupsd.chart.sh | 2 +-
- charts.d/cpu_apps.chart.sh | 2 +-
- charts.d/cpufreq.chart.sh | 2 +-
- charts.d/example.chart.sh | 2 +-
- charts.d/exim.chart.sh | 2 +-
- charts.d/hddtemp.chart.sh | 2 +-
- charts.d/load_average.chart.sh | 2 +-
- charts.d/mem_apps.chart.sh | 2 +-
- charts.d/mysql.chart.sh | 2 +-
- charts.d/nginx.chart.sh | 2 +-
- charts.d/nut.chart.sh | 2 +-
- charts.d/opensips.chart.sh | 2 +-
- charts.d/phpfpm.chart.sh | 2 +-
- charts.d/postfix.chart.sh | 2 +-
- charts.d/sensors.chart.sh | 2 +-
- charts.d/squid.chart.sh | 2 +-
- charts.d/tomcat.chart.sh | 2 +-
- plugins.d/loopsleepms.sh.inc | 2 +-
- 20 files changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/charts.d/ap.chart.sh b/charts.d/ap.chart.sh
-index 0e85c48..6e30e69 100755
---- a/charts.d/ap.chart.sh
-+++ b/charts.d/ap.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/apache.chart.sh b/charts.d/apache.chart.sh
-index b503e74..294af76 100755
---- a/charts.d/apache.chart.sh
-+++ b/charts.d/apache.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/apcupsd.chart.sh b/charts.d/apcupsd.chart.sh
-index 46a8610..97dd66d 100755
---- a/charts.d/apcupsd.chart.sh
-+++ b/charts.d/apcupsd.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/cpu_apps.chart.sh b/charts.d/cpu_apps.chart.sh
-index 8e07583..868a7ff 100755
---- a/charts.d/cpu_apps.chart.sh
-+++ b/charts.d/cpu_apps.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/cpufreq.chart.sh b/charts.d/cpufreq.chart.sh
-index b21504a..40dd9d2 100755
---- a/charts.d/cpufreq.chart.sh
-+++ b/charts.d/cpufreq.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/example.chart.sh b/charts.d/example.chart.sh
-index 86fde49..e01f313 100755
---- a/charts.d/example.chart.sh
-+++ b/charts.d/example.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/exim.chart.sh b/charts.d/exim.chart.sh
-index 4c70f2c..273b814 100644
---- a/charts.d/exim.chart.sh
-+++ b/charts.d/exim.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/hddtemp.chart.sh b/charts.d/hddtemp.chart.sh
-index 15895c5..81bf76e 100755
---- a/charts.d/hddtemp.chart.sh
-+++ b/charts.d/hddtemp.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/load_average.chart.sh b/charts.d/load_average.chart.sh
-index 70d3aec..14ba723 100755
---- a/charts.d/load_average.chart.sh
-+++ b/charts.d/load_average.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/mem_apps.chart.sh b/charts.d/mem_apps.chart.sh
-index 3bc65fe..4632ae7 100755
---- a/charts.d/mem_apps.chart.sh
-+++ b/charts.d/mem_apps.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/mysql.chart.sh b/charts.d/mysql.chart.sh
-index 1363d01..cf378f7 100755
---- a/charts.d/mysql.chart.sh
-+++ b/charts.d/mysql.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/nginx.chart.sh b/charts.d/nginx.chart.sh
-index 0ae7d63..2f50a25 100755
---- a/charts.d/nginx.chart.sh
-+++ b/charts.d/nginx.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/nut.chart.sh b/charts.d/nut.chart.sh
-index e0b1b4c..c33f1ad 100755
---- a/charts.d/nut.chart.sh
-+++ b/charts.d/nut.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/opensips.chart.sh b/charts.d/opensips.chart.sh
-index 2a0249d..e5ca172 100755
---- a/charts.d/opensips.chart.sh
-+++ b/charts.d/opensips.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/phpfpm.chart.sh b/charts.d/phpfpm.chart.sh
-index a5ee0ad..5a62e2a 100755
---- a/charts.d/phpfpm.chart.sh
-+++ b/charts.d/phpfpm.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
-index 85604fc..2fa864e 100755
---- a/charts.d/postfix.chart.sh
-+++ b/charts.d/postfix.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/sensors.chart.sh b/charts.d/sensors.chart.sh
-index 125c925..91f3287 100755
---- a/charts.d/sensors.chart.sh
-+++ b/charts.d/sensors.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/squid.chart.sh b/charts.d/squid.chart.sh
-index 2c19c35..2e2795b 100755
---- a/charts.d/squid.chart.sh
-+++ b/charts.d/squid.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/charts.d/tomcat.chart.sh b/charts.d/tomcat.chart.sh
-index 44a92c8..491f188 100755
---- a/charts.d/tomcat.chart.sh
-+++ b/charts.d/tomcat.chart.sh
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is loaded from charts.d.plugin
-+#/bin/bash
-
- # netdata
- # real-time performance and health monitoring, done right!
-diff --git a/plugins.d/loopsleepms.sh.inc b/plugins.d/loopsleepms.sh.inc
-index ef3db19..416df94 100644
---- a/plugins.d/loopsleepms.sh.inc
-+++ b/plugins.d/loopsleepms.sh.inc
-@@ -1,4 +1,4 @@
--# no need for shebang - this file is included from other scripts
-+#/bin/bash
-
- LOOPSLEEP_DATE="$(which date 2>/dev/null || command -v date 2>/dev/null)"
- if [ -z "$LOOPSLEEP_DATE" ]
diff --git a/debian/patches/series b/debian/patches/series
index f082ea8d1..8e008db19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-linked-js-css-fonts-removed-from-make.patch
0002-remove-file-serve-restrictions-for-symlinks.patch
0003-hide-update-button.patch
-0004-readd-shebang-to-chart-scripts.patch
diff --git a/debian/rules b/debian/rules
index b3b5fad9d..2845d7056 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,3 +53,6 @@ override_dh_fixperms-arch:
# given extra capabilities in the postinst script.
#
chmod 0754 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/apps.plugin
+ chmod 0644 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/loopsleepms.sh.inc
+ chmod 0644 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/charts.d/*.sh
+ chmod 0644 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/python.d/*.py