update travis & stack

.travis.yml

@@ -23,6 +23,8 @@ script:
   - sudo apt-get install -y --force-yes git python3-setuptools python3-dev python3-apt ccze
   - sudo bash install $TRAVIS_BRANCH
   - sudo wo --help
+  - sudo sed -i 's/# debug = false/debug = true/' /etc/wo/wo.conf
+  - sudo sed -i 's/to_console = false/to_console = true/' /etc/wo/wo.conf
   - sudo wo stack install || sudo tail -n50 /var/log/wo/wordops.log
   - sudo wo stack install --web  || sudo tail -n50 /var/log/wo/wordops.log
   - sudo wo stack install --admin || sudo tail -n50 /var/log/wo/wordops.log

wo/cli/plugins/stack.py

@@ -150,13 +150,11 @@ class WOStackController(CementBaseController):
         if set(WOVariables.wo_nginx).issubset(set(apt_packages)):
             Log.info(self, "Adding repository for NGINX, please wait...")
             WORepo.add(self, repo_url=WOVariables.wo_nginx_repo)
-            Log.debug(self, 'Adding ppa of Nginx')
-
-            try:
-                WOShellExec.cmd_exec(self, "wget -qO - https://build"
-                                           ".opensuse.org/"
-                                           "projects/home:virtubox/public_key"
-                                           " | sudo apt-key add -", log=False)
+            Log.debug(self, 'Adding repository for Nginx')
+            WOShellExec.cmd_exec(self, "wget -qO - https://build"
+                                       ".opensuse.org/"
+                                       "projects/home:virtubox/public_key |"
+                                       "sudo apt-key add -")
             except CommandExecutionError as e:
                 Log.error("Failed to add Nginx repository key")
 

wo/cli/plugins/stack_upgrade.py

@@ -73,7 +73,7 @@ class WOStackUpgradeController(CementBaseController):
         Log.info(self, "Updating apt-cache, please wait...")
         WOAptGet.update(self)
         Log.info(self, "Installing packages, please wait ...")
-        if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
+        if (WOVariables.wo_platform_distro == 'ubuntu'):
             WOAptGet.install(self, WOVariables.wo_php + WOVariables.wo_php_extra)
         else:
             WOAptGet.install(self, WOVariables.wo_php)

wo/cli/plugins/update.py

@@ -23,7 +23,8 @@ class WOUpdateController(CementBaseController):
     @expose(hide=True)
     def default(self):
         filename = "woupdate" + time.strftime("%Y%m%d-%H%M%S")
-        WODownload.download(self, [["https://raw.githubusercontent.com/WordOps/WordOps/master/install",
+        WODownload.download(self, [["https://raw.githubusercontent.com/"
+                                    "WordOps/WordOps/master/install",
                                     "/tmp/{0}".format(filename),
                                     "update script"]])
         try:

wo/core/variables.py

@@ -97,7 +97,7 @@ class WOVariables():
         wo_nginx_repo = ("deb http://download.opensuse.org/repositories/home:"
                          "/virtubox:/WordOps/Debian_9.0/ /")
 
-    wo_nginx = ["nginx-custom", "nginx-ee"]
+    wo_nginx = ["nginx-custom", "nginx-wo"]
     wo_nginx_key = '188C9FB063F0247A'
 
     # PHP repo and packages