Fix for fail2ban

CHANGELOG.md

@@ -10,11 +10,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### v3.12.4 - 2020-10-14
 
+#### Changed
+
+- Redis 6.0.6 available on Ubuntu LTS
+
 #### Fixed
 
 - Avif (AV1 Image Format) & WebP Nginx conditional support([PR #322](https://github.com/WordOps/WordOps/pull/322))
 - Sendmail initial configuration with sendmailconfig
 - SSL certificates export encoding with utf-8
+- Nanorc install on Ubuntu 16.04 LTS
 
 ### v3.12.3 - 2020-10-13
 

tests/travis.sh

@@ -13,6 +13,7 @@ export DEBIAN_FRONTEND=noninteractive
 unset LANG
 export LANG='en_US.UTF-8'
 export LC_ALL='C.UTF-8'
+wo_distro=$(lsb_release -sc)
 
 if [ -z "$1" ]; then
     {
@@ -259,29 +260,31 @@ else
     exit_script
 
 fi
-echo -ne "       wo secure --sshport                [..]\r"
-if {
-    wo secure --sshport 2022
-} >>/var/log/wo/test.log; then
-    echo -ne "       wo secure --sshport                [${CGREEN}OK${CEND}]\\r"
-    echo -ne '\n'
-else
-    echo -e "       wo secure --sshport                [${CRED}FAIL${CEND}]"
-    echo -ne '\n'
-    exit_script
+if [ "$wo_distro" != "focal" ]; then
+    echo -ne "       wo secure --sshport                [..]\r"
+    if {
+        wo secure --sshport 2022
+    } >>/var/log/wo/test.log; then
+        echo -ne "       wo secure --sshport                [${CGREEN}OK${CEND}]\\r"
+        echo -ne '\n'
+    else
+        echo -e "       wo secure --sshport                [${CRED}FAIL${CEND}]"
+        echo -ne '\n'
+        exit_script
 
-fi
-echo -ne "       wo secure --ssh                    [..]\r"
-if {
-    wo secure --ssh --force
-} >>/var/log/wo/test.log; then
-    echo -ne "       wo secure --ssh                    [${CGREEN}OK${CEND}]\\r"
-    echo -ne '\n'
-else
-    echo -e "       wo secure --ssh                    [${CRED}FAIL${CEND}]"
-    echo -ne '\n'
-    exit_script
+    fi
+    echo -ne "       wo secure --ssh                    [..]\r"
+    if {
+        wo secure --ssh --force
+    } >>/var/log/wo/test.log; then
+        echo -ne "       wo secure --ssh                    [${CGREEN}OK${CEND}]\\r"
+        echo -ne '\n'
+    else
+        echo -e "       wo secure --ssh                    [${CRED}FAIL${CEND}]"
+        echo -ne '\n'
+        exit_script
 
+    fi
 fi
 echo -ne "       wo secure --port                   [..]\r"
 if {
@@ -351,18 +354,3 @@ for stack in $stack_purge; do
 
     fi
 done
-
-echo -e "${CGREEN}#############################################${CEND}"
-echo -e '       wo stack fail2ban              '
-echo -e "${CGREEN}#############################################${CEND}"
-if {
-    wo stack install --fail2ban
-} >>/var/log/wo/test.log; then
-    echo -ne "       purging $stack               [${CGREEN}OK${CEND}]\\r"
-    echo -ne '\n'
-else
-    echo -e "        purging $stack              [${CRED}FAIL${CEND}]"
-    echo -ne '\n'
-    exit_script
-
-fi

wo/cli/plugins/stack_pref.py

@@ -139,10 +139,9 @@ def pre_pref(self, apt_packages):
     # add redis repository
     if set(WOVar.wo_redis).issubset(set(apt_packages)):
         if WOVar.wo_distro == 'ubuntu':
-            if not WOVar.wo_platform_codename == 'focal':
-                Log.info(self, "Adding repository for Redis, please wait...")
-                Log.debug(self, 'Adding ppa for redis')
-                WORepo.add(self, ppa=WOVar.wo_redis_repo)
+            Log.info(self, "Adding repository for Redis, please wait...")
+            Log.debug(self, 'Adding ppa for redis')
+            WORepo.add(self, ppa=WOVar.wo_redis_repo)
         else:
             if not WOFileUtils.grepcheck(
                     self, '/etc/apt/sources.list/wo-repo.list',
@@ -153,13 +152,18 @@ def pre_pref(self, apt_packages):
 
     # nano
     if 'nano' in apt_packages:
-        if WOVar.wo_platform_codename == 'bionic':
-            Log.debug(self, 'Adding ppa for nano')
-            WORepo.add(self, ppa=WOVar.wo_ubuntu_backports)
+        if WOVar.wo_distro == 'ubuntu':
+            if WOVar.wo_platform_codename == 'bionic':
+                Log.debug(self, 'Adding ppa for nano')
+                WORepo.add(self, ppa=WOVar.wo_ubuntu_backports)
+            elif WOVar.wo_platform_codename == 'xenial':
+                Log.debug(self, 'Adding ppa for nano')
+                WORepo.add_key(self, WOVar.wo_nginx_key)
+                WORepo.add(self, repo_url=WOVar.wo_extra_repo)
         else:
-            if not WOFileUtils.grepcheck(
+            if (not WOFileUtils.grepcheck(
                     self, '/etc/apt/sources.list/wo-repo.list',
-                    'WordOps'):
+                    'WordOps')):
                 Log.info(self, "Adding repository for Nano, please wait...")
                 Log.debug(self, 'Adding repository for Nano')
                 WORepo.add_key(self, WOVar.wo_nginx_key)

wo/core/variables.py

@@ -111,6 +111,10 @@ class WOVar():
     # Nginx repo and packages
     if wo_distro == 'ubuntu':
         wo_nginx_repo = "ppa:wordops/nginx-wo"
+        wo_extra_repo = (
+            "deb http://download.opensuse.org"
+            "/repositories/home:/virtubox:"
+            "/WordOps/xUbuntu_{0}/ /".format(wo_platform_version))
     else:
         if wo_distro == 'debian':
             if wo_platform_codename == 'jessie':