Merge pull request #112 from WordOps/develop

Develop

.travis.yml

@@ -1,5 +1,5 @@
 sudo: required
-dist: bionic
+dist: xenial
 
 language: bash
 
@@ -24,13 +24,13 @@ before_script:
   - sudo bash -c 'echo example.com > /etc/hostname'
   - sudo apt-get -qq purge mysql* graphviz* redis*
   - sudo apt-get -qq autoremove --purge
+  - unset LANG
+  - sudo apt-get install --assume-yes --quiet git python3-setuptools python3-dev python3-apt ccze tree
 
 script:
   - lsb_release -a
-  - unset LANG
   - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig'
   - sudo echo "Travis Banch = $TRAVIS_BRANCH"
-  - sudo apt-get install -qq --force-yes git python3-setuptools python3-dev python3-apt ccze tree
   - sudo bash install --travis
   - sudo wo --help && sudo wo stack install && sudo wo stack install --proftpd
   - sudo wo site create html.net --html && sudo wo site create php.com --php && sudo wo site create mysql.com --mysql && sudo wo site create proxy.com --proxy=127.0.0.1:3000

CHANGELOG.md

@@ -8,6 +8,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### v3.9.x - [Unreleased]
 
+### v3.9.7.1 - 2019-08-09
+
+#### Changed
+
+- Cement framework updated to v2.8.0
+- Psutil updated to v5.6.3
+- PyMySQL updated to v0.9.3
+
+#### Fixed
+
+- Missing import in `wo sync`
+- redis.conf incorrect permissions
+
 ### v3.9.7 - 2019-08-02
 
 #### Added

install

@@ -7,10 +7,10 @@
 # Copyright (c) 2019 - WordOps
 # This script is licensed under M.I.T
 # -------------------------------------------------------------------------
-# Version 3.9.7 - 2019-08-02
+# Version 3.9.7.1 - 2019-08-08
 # -------------------------------------------------------------------------
 readonly wo_version_old="2.2.3"
-readonly wo_version_new="3.9.7"
+readonly wo_version_new="3.9.7.1"
 # CONTENTS
 # ---
 # 1. VARIABLES AND DECLARATIONS

requirements.txt

@@ -1 +1 @@
-cement>=2.4.0
+cement>=2.8.0

setup.py

@@ -56,7 +56,7 @@ if not os.path.isfile('/root/.gitconfig'):
     shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
 
 setup(name='wo',
-      version='3.9.7',
+      version='3.9.7.1',
       description=long_description,
       long_description=long_description,
       classifiers=[],
@@ -77,14 +77,15 @@ setup(name='wo',
           # "nose",
           # "coverage",
           # Required to function
-          'cement == 2.4',
+          'cement == 2.8.0',
           'pystache',
           'python-apt',
           'pynginxconfig',
-          'PyMySQL == 0.8.0',
+          'PyMySQL',
-          'psutil == 3.1.1',
+          'psutil',
           'sh',
           'SQLAlchemy',
+          'requests',
       ],
       data_files=[('/etc/wo', ['config/wo.conf']),
                   ('/etc/wo/plugins.d', conf),

wo/cli/plugins/stack.py

@@ -1792,6 +1792,10 @@ class WOStackController(CementBaseController):
                                                   "noeviction",
                                                   "maxmemory-policy "
                                                   "allkeys-lru")
+                        WOFileUtils.chown(self, '/etc/redis/redis.conf',
+                                          'redis',
+                                          'redis',
+                                          recursive=False)
                         WOService.restart_service(self, 'redis-server')
             if 'mariadb-server' in apt_packages:
                 # setting innodb memory usage

wo/cli/plugins/sync.py

@@ -4,6 +4,7 @@ from wo.core.fileutils import WOFileUtils
 from wo.cli.plugins.sitedb import *
 from wo.core.mysql import *
 from wo.core.logging import Log
+import glob
 
 
 def wo_sync_hook(app):

wo/core/variables.py

@@ -10,7 +10,7 @@ class WOVariables():
     """Intialization of core variables"""
 
     # WordOps version
-    wo_version = "3.9.7"
+    wo_version = "3.9.7.1"
     # WordOps packages versions
     wo_wp_cli = "2.2.0"
     wo_adminer = "4.7.2"