From 616555549c824bfdf4a33223ec4fb51cc12e2072 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 17 Jan 2020 11:48:36 +0100 Subject: [PATCH 1/6] Fix variable port in wo secure --- wo/cli/plugins/secure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py index 421ad28..bcb1aba 100644 --- a/wo/cli/plugins/secure.py +++ b/wo/cli/plugins/secure.py @@ -117,7 +117,7 @@ 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) WOTemplate.deploy( self, '/etc/nginx/sites-available/22222', '22222.mustache', data) From b503cb313279e9fa16fbd7504d98a8f8ca8c5245 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 17 Jan 2020 11:50:31 +0100 Subject: [PATCH 2/6] Fix variable acme_cert in -le --- wo/core/acme.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wo/core/acme.py b/wo/core/acme.py index aceef28..cab1978 100644 --- a/wo/core/acme.py +++ b/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 From 2b16b5a0e3fd7061efc24c29860bdf282b405c73 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 17 Jan 2020 11:52:13 +0100 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 7 +++++++ install | 2 +- setup.py | 2 +- wo/core/variables.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e826a0..1cccebb 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/install b/install index 248d803..3e6b609 100755 --- a/install +++ b/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 diff --git a/setup.py b/setup.py index 2b267e7..06a64dc 100644 --- a/setup.py +++ b/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', diff --git a/wo/core/variables.py b/wo/core/variables.py index c3846e0..146bcba 100644 --- a/wo/core/variables.py +++ b/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" From 81fbb72fe176313427f87f21f85b74c9bb48e539 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 17 Jan 2020 11:57:15 +0100 Subject: [PATCH 4/6] Fix webroot variable in template --- wo/cli/plugins/secure.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py index bcb1aba..ae74baa 100644 --- a/wo/cli/plugins/secure.py +++ b/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=pargs.user_input) + data = dict(release=WOVar.wo_version, + port=pargs.user_input, webroot='/var/www/') WOTemplate.deploy( self, '/etc/nginx/sites-available/22222', '22222.mustache', data) From d90bf5a195482b13d2e44c6ffc245adb62eda9da Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 17 Jan 2020 12:09:47 +0100 Subject: [PATCH 5/6] Add debian packages list to readme.md --- README.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 12cee85..e0bc159 100644 --- a/README.md +++ b/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 site.tld --wp -le=wildcard --dns=dns_cf # wordpress & wildcard SSL certificate with Cloudflare DNS API +wo site create example.com --wp --letsencrypt --hsts # wordpress & letsencrypt with HSTS +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) From 0bd58ef7a7d47f787250fc1ddcddb3ec7caf2deb Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 17 Jan 2020 12:11:24 +0100 Subject: [PATCH 6/6] Add wo secure --port to travis --- tests/travis.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/travis.sh b/tests/travis.sh index 0cb9586..62b1514 100644 --- a/tests/travis.sh +++ b/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}"