Merge pull request #335 from WordOps/updating-configuration

WordOps install fix

.github/workflows/main.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        platform: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04]
+
+    runs-on: ${{ matrix.platform }}
+    
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare VM
+      run: |
+        unset LANG
+        sudo apt update -qq
+        sudo LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php -y
+        sudo rm -rf /etc/mysql /var/lib/mysql
+        sudo apt-get purge --option=Dpkg::options::=--force-all --assume-yes graphviz* redis* php* mysql*
+        sudo apt-get install -qq git python3-setuptools python3-dev python3-apt python3-wheel python3-pip ccze tree
+        sudo apt-get -qq autoremove --purge
+        sudo python3 setup.py sdist bdist_wheel
+        sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > $HOME/.gitconfig'
+    - name: Install WordOps
+      run: sudo timeout 1800 bash install --travis
+    - name: Run tests
+      run: sudo timeout 1800 bash tests/travis.sh --actions

.travis.yml

@@ -2,7 +2,8 @@ language: shell
 
 jobs:
   include:
-    - os: linux
+    - if: branch = master
+      os: linux
       dist: xenial
     - if: branch = master
       os: linux

CHANGELOG.md

@@ -8,6 +8,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### v3.9.x - [Unreleased]
 
+#### v3.13.2 - 2020-10-27
+
+#### Fixed
+
+- WordOps install issues on some servers
+- MariaDB systemd service not fully enabled after upgrade
+
 #### v3.13.1 - 2020-10-26
 
 #### Fixed

install

@@ -9,7 +9,7 @@
 # -------------------------------------------------------------------------
 # wget -qO wo wops.cc && sudo -E bash wo
 # -------------------------------------------------------------------------
-# Version 3.13.1 - 2020-10-26
+# Version 3.13.2 - 2020-10-27
 # -------------------------------------------------------------------------
 
 # CONTENTS
@@ -207,14 +207,14 @@ wo_install_dep() {
     wo_linux_distro=$(lsb_release -is)
     if [ "$wo_linux_distro" == "Ubuntu" ]; then
         # install dependencies
-        apt-get -option=Dpkg::options::=--force-confmiss --option=Dpkg::options::=--force-confold --assume-yes install \
+        apt-get --option=Dpkg::options::=--force-confmiss --option=Dpkg::options::=--force-confold --assume-yes install \
             build-essential curl gzip python3-pip python3-apt python3-venv gcc python3-dev sqlite3 git tar software-properties-common pigz \
             gnupg2 cron ccze rsync apt-transport-https tree haveged ufw unattended-upgrades tzdata ntp zstd idn \
             python3-distutils-extra libapt-pkg-dev >/dev/null 2>&1
         curl -sL https://download.opensuse.org/repositories/home:/virtubox:/WordOps/xUbuntu_18.04/Release.key | apt-key add -
     else
         # install dependencies
-        apt-get -option=Dpkg::options::=--force-confmiss --option=Dpkg::options::=--force-confold --assume-yes install \
+        apt-get --option=Dpkg::options::=--force-confmiss --option=Dpkg::options::=--force-confold --assume-yes install \
             build-essential curl gzip dirmngr sudo python3-pip python3-apt python3-venv gcc python3-dev ca-certificates sqlite3 git tar \
             software-properties-common pigz apt-transport-https gnupg2 cron ccze rsync tree haveged ufw unattended-upgrades tzdata ntp zstd idn \
             python3-distutils-extra libapt-pkg-dev >/dev/null 2>&1
@@ -437,6 +437,7 @@ wo_install() {
         cd /usr/local/lib/python3."$python_ver"/dist-packages || exit 1
     fi
     python3 -m pip uninstall -yq wo wordops ee
+    cd || exit 1
     if [ -d /opt/wo/lib/python3."$python_ver"/site-packages/apt ]; then
         source /opt/wo/bin/activate
         python3 -m pip install -U pip setuptools wheel
@@ -473,6 +474,10 @@ wo_install() {
     rm -rf /usr/local/bin/wo /usr/local/lib/python3."$python_ver"/dist-packages/{etc,usr}
     ln -s /opt/wo/bin/wo /usr/local/bin/
     deactivate
+    if ! { /usr/local/bin/wo >/dev/null 2>&1; }; then
+        python3 -m venv --system-site-packages /opt/wo
+    fi
+
 }
 
 # Clone Github repository if it doesn't exist

setup.py

@@ -27,7 +27,7 @@ if os.geteuid() == 0:
         os.makedirs('/var/lib/wo/tmp/')
 
 setup(name='wordops',
-      version='3.13.1',
+      version='3.13.2',
       description='An essential toolset that eases server administration',
       long_description=LONG,
       long_description_content_type='text/markdown',

tests/travis.sh

@@ -31,7 +31,11 @@ exit_script() {
 echo -e "${CGREEN}#############################################${CEND}"
 echo -e '       stack install             '
 echo -e "${CGREEN}#############################################${CEND}"
+if [ "$wo_distro" != "xenial" ]; then
 stack_list='nginx php php73 php74 mysql redis fail2ban clamav proftpd netdata phpmyadmin composer dashboard extplorer adminer redis sendmail phpredisadmin mysqltuner utils ufw ngxblocker cheat nanorc'
+else
+stack_list='nginx php php73 php74 mysql redis fail2ban clamav proftpd netdata phpmyadmin composer dashboard extplorer adminer redis phpredisadmin mysqltuner utils ufw ngxblocker cheat nanorc'
+fi
 for stack in $stack_list; do
     echo -ne "       Installing $stack               [..]\r"
     if {

wo/cli/plugins/stack_migrate.py

@@ -59,6 +59,7 @@ class WOStackMigrateController(CementBaseController):
         WOFileUtils.create_symlink(
             self, ['/etc/mysql/mariadb.cnf', '/etc/mysql/my.cnf'])
         WOShellExec.cmd_exec(self, 'systemctl daemon-reload')
+        WOShellExec.cmd_exec(self, 'systemctl enable mariadb')
         post_pref(self, WOVar.wo_mysql, [])
 
     @expose(hide=True)

wo/core/variables.py

@@ -14,7 +14,7 @@ class WOVar():
     """Intialization of core variables"""
 
     # WordOps version
-    wo_version = "3.13.1"
+    wo_version = "3.13.2"
     # WordOps packages versions
     wo_wp_cli = "2.4.0"
     wo_adminer = "4.7.5"