Merge pull request #244 from WordOps/updating-configuration

v3.11.4

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.11.4 - 2020-01-17
+
+#### Fixed
+
+- `wo secure --port` variable error
+- `--letsencrypt` variable error
+
 ### v3.11.3 - 2020-01-16
 
 #### Added

README.md

@@ -63,7 +63,6 @@
 #### Also compatible
 
 - Ubuntu 16.04 LTS (Xenial)
-- Ubuntu 19.04 (Disco)
 - Debian 9 (Stretch)
 - Debian 10 (Buster)
 - Raspbian 9 (Stretch)
@@ -121,7 +120,7 @@ wo site create example.com --wpsubdomain --wpce     # install wpmu-subdomain + C
 wo site create example.com --html     # create example.com for static/html sites
 wo site create example.com --php      # create example.com with php support
 wo site create example.com --php73      # create example.com with php 7.3 support
-wo site create example.com --php73      # create example.com with php 7.4 support
+wo site create example.com --php74      # create example.com with php 7.4 support
 wo site create example.com --mysql    # create example.com with php & mysql support
 wo site create example.com --mysql --php73   # create example.com with php 7.3 & mysql support
 wo site create example.com --mysql --php74   # create example.com with php 7.4 & mysql support
@@ -141,8 +140,8 @@ wo site update example.com --php74 # switch to PHP 7.4
 ```bash
 wo site create example.com --wp -le #  wordpress & letsencrypt
 wo site create sub.example.com --wp -le # wordpress & letsencrypt subdomain
-wo site create site.tld --wp --letsencrypt --hsts # wordpress & letsencrypt with HSTS
+wo site create example.com --wp --letsencrypt --hsts # wordpress & letsencrypt with HSTS
-wo site create site.tld --wp -le=wildcard --dns=dns_cf # wordpress & wildcard SSL certificate with Cloudflare DNS API
+wo site create example.com --wp -le=wildcard --dns=dns_cf # wordpress & wildcard SSL certificate with Cloudflare DNS API
 ```
 
 ## Update WordOps
@@ -183,9 +182,16 @@ Apps & Tools shipped with WordOps :
 - [ClamAV](https://github.com/Cisco-Talos/clamav-devel)
 - [cheat.sh](https://github.com/chubin/cheat.sh)
 - [ProFTPd](https://github.com/proftpd/proftpd)
-- [nginx-ultimate-bad-bot-blocker](https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/)
+- [Nginx-ultimate-bad-bot-blocker](https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/)
+- [Nanorc](https://github.com/scopatz/nanorc)
 
-Cache Plugins supported by WordOps :
+Third-party debian packages shipped with WordOps :
+
+- [Nginx-wo by WordOps](https://build.opensuse.org/package/show/home:virtubox:WordOps/nginx)
+- [PHP by Ondřej Surý](https://launchpad.net/~ondrej/+archive/ubuntu/php)
+- [Redis by Chris Lea](https://launchpad.net/~chris-lea/+archive/ubuntu/redis-server)
+
+WordPress Cache Plugins supported by WordOps :
 
 - [Nginx-helper](https://github.com/rtCamp/nginx-helper)
 - [Cache-Enabler](https://github.com/keycdn/cache-enabler)

install

@@ -9,7 +9,7 @@
 # -------------------------------------------------------------------------
 # wget -qO wo wops.cc && sudo bash wo
 # -------------------------------------------------------------------------
-# Version 3.11.3 - 2020-01-16
+# Version 3.11.4 - 2020-01-17
 # -------------------------------------------------------------------------
 
 # CONTENTS

setup.py

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

tests/travis.sh

@@ -276,6 +276,18 @@ else
     echo -ne '\n'
     exit_script
 
+fi
+echo -ne "       wo secure --port                   [..]\r"
+if {
+    wo secure --port 22223
+} >>/var/log/wo/test.log; then
+    echo -ne "       wo secure --port                   [${CGREEN}OK${CEND}]\\r"
+    echo -ne '\n'
+else
+    echo -e "       wo secure --port                   [${CRED}FAIL${CEND}]"
+    echo -ne '\n'
+    exit_script
+
 fi
 
 echo -e "${CGREEN}#############################################${CEND}"

wo/cli/plugins/secure.py

@@ -117,7 +117,8 @@ class WOSecureController(CementBaseController):
                 Log.info(self, "Please Enter valid port number :")
                 port = input("WordOps admin port [22222]:")
             pargs.user_input = port
-        data = dict(release=WOVar.wo_version, port=port)
+        data = dict(release=WOVar.wo_version,
+                    port=pargs.user_input, webroot='/var/www/')
         WOTemplate.deploy(
             self, '/etc/nginx/sites-available/22222',
             '22222.mustache', data)

wo/core/acme.py

@@ -206,6 +206,8 @@ class WOAcme:
     def cert_check(self, wo_domain_name):
         """Check certificate existance with acme.sh and return Boolean"""
         WOAcme.export_cert(self)
+        # set variable acme_cert
+        acme_cert = False
         # define new csv dialect
         csv.register_dialect('acmeconf', delimiter='|')
         # open file

wo/core/variables.py

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