From 2e43ea30451611372fc3d4a395477b1bcf7eadbb Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 23 Mar 2017 21:38:35 +0100
Subject: [PATCH] Upgrade to upstream version 1.6.0 (closes #6) Add YunoHost
 service Switch to systemd syntax

---
 README.md                 | 2 +-
 conf/netdata-deps.control | 4 ++--
 manifest.json             | 1 +
 scripts/_common.sh        | 2 +-
 scripts/install           | 5 ++++-
 scripts/remove            | 5 ++++-
 scripts/restore           | 2 +-
 scripts/upgrade           | 5 ++++-
 8 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 6038b2b..c1fb508 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
 (**physical** & **virtual** servers, **containers**, **IoT** devices), without
 disrupting their core function._
 
-**Shipped version:** 1.5.0
+**Shipped version:** 1.6.0
 
 **Customization brought by the package:**
 
diff --git a/conf/netdata-deps.control b/conf/netdata-deps.control
index 0105cfe..f9f2847 100644
--- a/conf/netdata-deps.control
+++ b/conf/netdata-deps.control
@@ -4,8 +4,8 @@ Homepage: https://https://my-netdata.io/
 Standards-Version: 3.9.2
 
 Package: netdata-deps
-Version: 1.5.0-2
-Depends: zlib1g-dev, uuid-dev, libmnl-dev, gcc, make, git, autoconf, autoconf-archive, autogen, automake, pkg-config, curl, jq, nodejs, python-mysqldb
+Version: 1.6.0-1
+Depends: zlib1g-dev, uuid-dev, libmnl-dev, gcc, make, git, autoconf, autoconf-archive, autogen, automake, pkg-config, curl, jq, nodejs, python-mysqldb, libipmimonitoring-dev
 Architecture: all
 Description: meta package for NetData dependencies
  netdata is a system for distributed real-time performance and health monitoring. It provides unparalleled insights, in real-time, of everything happening on the system it runs  (including applications such as web and database servers), using modern interactive web dashboards.
diff --git a/manifest.json b/manifest.json
index 41f45d3..1c92810 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,6 +6,7 @@
         "en": "real-time performance and health monitoring",
         "fr": "Monitoring serveur en temps reel"
     },
+    "version": "1.6.0",
     "url": "http://my-netdata.io/",
     "license": "GPL-3.0",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index e56e265..193af18 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 #
 
 # Application version
-VERSION="1.5.0"
+VERSION="1.6.0"
 
 # Remote URL to fetch application source archive
 APPLICATION_SOURCE_URL="https://github.com/firehol/netdata/releases/download/v${VERSION}/netdata-${VERSION}.tar.gz"
diff --git a/scripts/install b/scripts/install
index df51545..73062a0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -53,6 +53,9 @@ sudo setfacl -m u:netdata:rw /var/run/dovecot/stats
 # Add netdata to the adm group to access web logs
 sudo usermod -a -G adm netdata
 
+# Declare service for YunoHost monitoring
+sudo yunohost service add netdata --log "/opt/netdata/var/log/netdata/error.log" "/opt/netdata/var/log/netdata/access.log" "/opt/netdata/var/log/netdata/debug.log"
+
 # Restart NetData
 sudo systemctl restart netdata
 
@@ -80,4 +83,4 @@ if [[ $is_public -eq 1 ]]; then
 fi
 
 # Reload services
-sudo service nginx reload
+sudo systemctl reload nginx
diff --git a/scripts/remove b/scripts/remove
index 5d89a1f..57b3bf1 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -37,6 +37,9 @@ sudo setfacl -x u:netdata /var/run/dovecot/stats
 # Remove user and group
 sudo userdel netdata
 
+# Remove service from YunoHost monitoring
+sudo yunohost service remove netdata
+
 # Remove MySQL user
 echo "drop user 'netdata'@'localhost';" | mysql -uroot -p$(sudo cat /etc/yunohost/mysql)
 
@@ -45,6 +48,6 @@ sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
 sudo rm -rf /home/yunohost.app/$app
 
 # Reload nginx service
-sudo service nginx reload
+sudo systemctl reload nginx
 
 
diff --git a/scripts/restore b/scripts/restore
index d768445..58d7cf2 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -64,4 +64,4 @@ sudo chown -R root: "$conf_path"
 sudo cp -a $SRCPATH/nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf"
 
 # Restart webserver
-sudo service nginx reload
+sudo systemctl reload nginx
diff --git a/scripts/upgrade b/scripts/upgrade
index d411eff..640938f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -58,6 +58,9 @@ sudo setfacl -m u:netdata:rw /var/run/dovecot/stats
 # Add netdata to the adm group to access web logs
 sudo usermod -a -G adm netdata
 
+# Declare service for YunoHost monitoring
+sudo yunohost service add netdata --log "/opt/netdata/var/log/netdata/error.log" "/opt/netdata/var/log/netdata/access.log" "/opt/netdata/var/log/netdata/debug.log"
+
 # Restart NetData
 sudo systemctl restart netdata
 
@@ -83,4 +86,4 @@ if [[ $is_public -eq 1 ]]; then
 fi
 
 # Reload nginx service
-sudo service nginx reload
\ No newline at end of file
+sudo systemctl reload nginx
\ No newline at end of file