From c87a4da2617b291ec25b71b30949f8cae4cb6389 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Mon, 2 Sep 2019 02:44:43 +0200
Subject: [PATCH] Update changelog, improve netdata stack upgrade

---
 CHANGELOG.md                    |  2 ++
 wo/cli/plugins/stack_upgrade.py | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c982290..0526cfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 #### Changed
 
 - do not terminate stack install process on errors
+- WordOps internal log rotation limit increased to 1MB
 
 #### Fixed
 
@@ -26,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - add LANG='en_US.UTF-8' in install script
 - Read public_suffix list with utf8 encoding. Issue [#128](https://github.com/WordOps/WordOps/issues/128)
 - Netdata uninstall script path. PR [#135](https://github.com/WordOps/WordOps/pull/135)
+- SSL Certificates expiration for subdomains
 
 ### v3.9.8.7 - 2019-08-31
 
diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py
index 3809d6f..606998f 100644
--- a/wo/cli/plugins/stack_upgrade.py
+++ b/wo/cli/plugins/stack_upgrade.py
@@ -145,7 +145,8 @@ class WOStackUpgradeController(CementBaseController):
                 Log.info(self, "WPCLI is not installed with WordOps")
 
         if pargs.netdata:
-            if os.path.isdir('/opt/netdata'):
+            if (os.path.isdir('/opt/netdata') or
+                    os.path.isdir('/etc/netdata')):
                 packages = packages + [['https://my-netdata.io/'
                                         'kickstart-static64.sh',
                                         '/var/lib/wo/tmp/kickstart.sh',
@@ -223,9 +224,16 @@ class WOStackUpgradeController(CementBaseController):
 
                 if pargs.netdata:
                     Log.info(self, "Upgrading Netdata, please wait...")
-                    WOShellExec.cmd_exec(self, "/bin/bash /var/lib/wo/tmp/"
-                                         "kickstart.sh "
-                                         "--dont-wait")
+                    if os.path.isdir('/opt/netdata'):
+                        WOShellExec.cmd_exec(
+                            self, "bash /opt/netdata/usr/"
+                            "libexec/netdata/netdata-"
+                            "updater.sh")
+                    elif os.path.isdir('/etc/netdata'):
+                        WOShellExec.cmd_exec(
+                            self, "bash /usr/"
+                            "libexec/netdata/netdata-"
+                            "updater.sh")
 
                 if pargs.dashboard:
                     Log.debug(self, "Extracting wo-dashboard.tar.gz "