From cc70f8642106d66aed8f928f070aba5d7e4ec558 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 9 Jul 2019 04:07:27 +0200 Subject: [PATCH] New Nginx build with OpenSSL 1.1.1c --- README.md | 2 +- wo/cli/plugins/stack.py | 15 ++++++++++----- wo/core/variables.py | 12 +----------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index f32fe4d..9a9f7d1 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ - **Easy to install** : One step automated installer with migration from EasyEngine v3 support - **Fast deployment** : Fast and automated WordPress, Nginx, PHP, MySQL & Redis installation -- **Up-to-date** : Nginx 1.16.0 with Brotli support, PHP 7.2 & 7.3, MariaDB 10.3 & Redis 5.0 +- **Up-to-date** : Nginx 1.16.0 with TLS v1.3 & Brotli support, PHP 7.2 & 7.3, MariaDB 10.3 & Redis 5.0 - **Secured** : Hardened WordPress security with strict Nginx location directives - **Powerful** : Optimized Nginx configurations with multiple cache backends support - **SSL** : Let's Encrypt SSL certificates handled by acme.sh diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index 42813a2..6ccffdc 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -189,10 +189,14 @@ class WOStackController(CementBaseController): # add nginx repository if set(WOVariables.wo_nginx).issubset(set(apt_packages)): - Log.info(self, "Adding repository for NGINX, please wait...") - WORepo.add(self, repo_url=WOVariables.wo_nginx_repo) - Log.debug(self, 'Adding repository for Nginx') - WORepo.add_key(self, WOVariables.wo_nginx_key) + if (WOVariables.wo_platform_distro == 'ubuntu'): + Log.info(self, "Adding repository for NGINX, please wait...") + WORepo.add(self, ppa=WOVariables.wo_nginx_repo) + Log.debug(self, 'Adding ppa for Nginx') + else: + WORepo.add(self, repo_url=WOVariables.wo_nginx_repo) + Log.debug(self, 'Adding repository for Nginx') + WORepo.add_key(self, WOVariables.wo_nginx_key) # add php repository if (set(WOVariables.wo_php73).issubset(set(apt_packages)) or @@ -1269,7 +1273,8 @@ class WOStackController(CementBaseController): Log.debug(self, "Extracting file webgrind.tar.gz to " "location /var/lib/wo/tmp/ ") WOExtract.extract( - self, '/var/lib/wo/tmp/webgrind.tar.gz', '/var/lib/wo/tmp/') + self, '/var/lib/wo/tmp/webgrind.tar.gz', + '/var/lib/wo/tmp/') if not os.path.exists('{0}22222/htdocs/php' .format(WOVariables.wo_webroot)): Log.debug(self, "Creating directroy " diff --git a/wo/core/variables.py b/wo/core/variables.py index b89ec51..b4f1412 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -96,18 +96,8 @@ class WOVariables(): wo_nginx_repo = ("deb http://download.opensuse.org" "/repositories/home:" "/virtubox:/WordOps/xUbuntu_14.04/ /") - elif wo_platform_codename == 'xenial': - wo_nginx_repo = ("deb http://download.opensuse.org" - "/repositories/home:" - "/virtubox:/WordOps/xUbuntu_16.04/ /") - elif wo_platform_codename == 'bionic': - wo_nginx_repo = ("deb http://download.opensuse.org" - "/repositories/home:" - "/virtubox:/WordOps/xUbuntu_18.04/ /") else: - wo_nginx_repo = ("deb http://download.opensuse.org" - "/repositories/home:" - "/virtubox:/WordOps/xUbuntu_19.04/ /") + wo_nginx_repo = "ppa:wordops/nginx-wo" elif wo_platform_distro == 'debian': if wo_platform_codename == 'jessie': wo_nginx_repo = ("deb http://download.opensuse.org"