From da4d6eaee7b613afcd9fbbd8e6f9580ea4669eb7 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 1 Dec 2023 16:41:14 +0100 Subject: [PATCH 1/3] Prepare WordOps for stable release --- CHANGELOG.md | 15 ++++++++++++++- README.md | 7 ++++--- install | 4 ++-- wo/cli/controllers/base.py | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a88642..6efa9de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Releases -### v3.19.0 - [Unreleased] +### v3.20.0 - [Unreleased] + +### v3.19.0 - 2023-12-01 + +#### Added + +- PHP 8.3 support +- force-ssl-{domain}.conf now available as a mustache template + +#### Fixed + +- wo site update --phpXX errors in some case + +#### Fixed ### v3.18.1 - 2023-09-26 diff --git a/README.md b/README.md index 88117d8..f297ef8 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,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 - **Custom Nginx build** : Nginx 1.24.0 - TLS v1.3 Cloudflare HTTP/2 HPACK & Brotli support -- **Up-to-date** : PHP 7.2, 7.3, 7.4, 8.0, 8.1 & 8.2 - MariaDB 10.11 LTS & Redis 7.0 +- **Up-to-date** : PHP 7.2, 7.3, 7.4, 8.0, 8.1, 8.2 &8.3 - MariaDB 10.11 LTS & Redis 7.0 - **Secured** : Hardened WordPress security with strict Nginx location directives - **Powerful** : Optimized Nginx configurations with multiple cache backends support - **SSL** : Domain, Subdomain & Wildcard Let's Encrypt SSL certificates with DNS API support @@ -86,7 +86,7 @@ Detailed Getting Started guide with additional installation methods can be found ```bash wo site create example.com --wp # install wordpress with PHP 8.1 without any page caching -wo site create example.com --wp --php82 # install wordpress with PHP 8.2 without any page caching +wo site create example.com --wp --php83 # install wordpress with PHP 8.3 without any page caching wo site create example.com --wpfc # install wordpress + nginx fastcgi_cache wo site create example.com --wpredis # install wordpress + nginx redis_cache wo site create example.com --wprocket # install wordpress with WP-Rocket plugin @@ -125,7 +125,7 @@ wo site create example.com --php80 # create example.com with php 8.0 suppor wo site create example.com --php81 # create example.com with php 8.1 support wo site create example.com --php82 # create example.com with php 8.2 support wo site create example.com --mysql # create example.com with php 8.1 & mysql support -wo site create example.com --mysql --php81 # create example.com with php 8.1 & mysql support +wo site create example.com --mysql --php83 # create example.com with php 8.3 & mysql support wo site create example.com --proxy=127.0.0.1:3000 # create example.com with nginx as reverse-proxy ``` @@ -138,6 +138,7 @@ wo site update example.com --php74 # switch to PHP 7.4 wo site update example.com --php80 # switch to PHP 8.0 wo site update example.com --php81 # switch to PHP 8.1 wo site update example.com --php82 # switch to PHP 8.2 +wo site update example.com --php83 # switch to PHP 8.3 ``` ### Sites secured with Let's Encrypt diff --git a/install b/install index af33807..9764a8a 100755 --- a/install +++ b/install @@ -4,12 +4,12 @@ # ------------------------------------------------------------------------- # Website: https://wordops.net # GitHub: https://github.com/WordOps/WordOps -# Copyright (c) 2019-2023 - WordOps +# Copyright (c) 2019-2024 - WordOps # This script is licensed under M.I.T # ------------------------------------------------------------------------- # wget -qO wo wops.cc && sudo -E bash wo # ------------------------------------------------------------------------- -# Version 3.18.1 - 2023-09-26 +# Version 3.19.0 - 2023-12-01 # ------------------------------------------------------------------------- # CONTENTS diff --git a/wo/cli/controllers/base.py b/wo/cli/controllers/base.py index 9d56468..74624f9 100644 --- a/wo/cli/controllers/base.py +++ b/wo/cli/controllers/base.py @@ -8,7 +8,7 @@ VERSION = WOVar.wo_version BANNER = """ WordOps v%s -Copyright (c) 2023 WordOps. +Copyright (c) 2024 WordOps. """ % VERSION From 89c34e021fbeca4607a103adafba9b2a8469dd2d Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 1 Dec 2023 16:52:33 +0100 Subject: [PATCH 2/3] Add MariaDB repo for debian 12 --- wo/cli/plugins/stack_pref.py | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 1f3cdb2..4c91b7b 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -29,8 +29,7 @@ def pre_pref(self, apt_packages): if ("mariadb-server" in apt_packages or "mariadb-client" in apt_packages): # add mariadb repository excepted on raspbian and ubuntu 19.04 - if not (WOVar.wo_distro == 'raspbian' or - WOVar.wo_platform_codename == 'bookworm'): + if not (WOVar.wo_distro == 'raspbian'): Log.info(self, "Adding repository for MySQL, please wait...") mysql_pref = ( "Package: *\nPin: origin mariadb.mirrors.ovh.net" @@ -134,20 +133,15 @@ def pre_pref(self, apt_packages): # nano if 'nano' in apt_packages: - 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) - else: - if WOVar.wo_platform_codename == 'buster': - if (not WOFileUtils.grepcheck( - self, '/etc/apt/sources.list/wo-repo.list', - '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) - WORepo.add(self, repo_url=WOVar.wo_nginx_repo) + if WOVar.wo_platform_codename == 'buster': + if (not WOFileUtils.grepcheck( + self, '/etc/apt/sources.list/wo-repo.list', + '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) + WORepo.add(self, repo_url=WOVar.wo_nginx_repo) def post_pref(self, apt_packages, packages, upgrade=False): @@ -1366,11 +1360,11 @@ def pre_stack(self): self, '/etc/sysctl.d/60-wo-tweaks.conf', 'sysctl.mustache', data, True) # use tcp_bbr congestion algorithm only on new kernels - if (WOVar.wo_platform_codename == 'bionic' or - WOVar.wo_platform_codename == 'focal' or + if (WOVar.wo_platform_codename == 'focal' or WOVar.wo_platform_codename == 'buster' or WOVar.wo_platform_codename == 'jammy' or - WOVar.wo_platform_codename == 'bullseye'): + WOVar.wo_platform_codename == 'bullseye' or + WOVar.wo_platform_codename == 'bookworm'): try: WOShellExec.cmd_exec( self, 'modprobe tcp_bbr') From e7edc69cb783f6ef7617ffe77c3f16361636fe07 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 1 Dec 2023 16:54:51 +0100 Subject: [PATCH 3/3] Set default PHP version to 8.2 --- CHANGELOG.md | 4 ++++ README.md | 6 +++--- config/wo.conf | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6efa9de..9176b7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - PHP 8.3 support - force-ssl-{domain}.conf now available as a mustache template +#### Changed + +- Default PHP version bump to 8.2 + #### Fixed - wo site update --phpXX errors in some case diff --git a/README.md b/README.md index f297ef8..aa84e9e 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ Detailed Getting Started guide with additional installation methods can be found ### Standard WordPress sites ```bash -wo site create example.com --wp # install wordpress with PHP 8.1 without any page caching +wo site create example.com --wp # install wordpress with PHP 8.2 without any page caching wo site create example.com --wp --php83 # install wordpress with PHP 8.3 without any page caching wo site create example.com --wpfc # install wordpress + nginx fastcgi_cache wo site create example.com --wpredis # install wordpress + nginx redis_cache @@ -120,11 +120,11 @@ wo site create example.com --wpsubdomain --wpce # install wpmu-subdomain + C ```bash wo site create example.com --html # create example.com for static/html sites -wo site create example.com --php # create example.com with php 8.1 support +wo site create example.com --php # create example.com with php 8.2 support wo site create example.com --php80 # create example.com with php 8.0 support wo site create example.com --php81 # create example.com with php 8.1 support wo site create example.com --php82 # create example.com with php 8.2 support -wo site create example.com --mysql # create example.com with php 8.1 & mysql support +wo site create example.com --mysql # create example.com with php 8.2 & mysql support wo site create example.com --mysql --php83 # create example.com with php 8.3 & mysql support wo site create example.com --proxy=127.0.0.1:3000 # create example.com with nginx as reverse-proxy ``` diff --git a/config/wo.conf b/config/wo.conf index 162220e..c422139 100644 --- a/config/wo.conf +++ b/config/wo.conf @@ -79,7 +79,7 @@ keylength = "ec-384" [php] ### Default PHP version -version = 8.1 +version = 8.2 [mariadb]