Merge pull request #591 from WordOps/updating-configuration

Prepare WordOps for stable release

CHANGELOG.md

@@ -6,7 +6,24 @@ 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
+
+#### Changed
+
+- Default PHP version bump to 8.2
+
+#### Fixed
+
+- wo site update --phpXX errors in some case
+
+#### Fixed
 
 ### v3.18.1 - 2023-09-26
 

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
@@ -85,8 +85,8 @@ 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  --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
@@ -120,12 +120,12 @@ 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 --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

config/wo.conf

@@ -79,7 +79,7 @@ keylength = "ec-384"
 [php]
 
 ### Default PHP version
-version = 8.1
+version = 8.2
 
 [mariadb]
 

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

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
 
 

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
+        if not (WOVar.wo_distro == 'raspbian'):
-                WOVar.wo_platform_codename == 'bookworm'):
             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 == 'buster':
-            if WOVar.wo_platform_codename == 'bionic':
+            if (not WOFileUtils.grepcheck(
-                Log.debug(self, 'Adding ppa for nano')
+                    self, '/etc/apt/sources.list/wo-repo.list',
-                WORepo.add(self, ppa=WOVar.wo_ubuntu_backports)
+                    'WordOps')):
-        else:
+                Log.info(self,
-            if WOVar.wo_platform_codename == 'buster':
+                         "Adding repository for Nano, please wait...")
-                if (not WOFileUtils.grepcheck(
+                Log.debug(self, 'Adding repository for Nano')
-                        self, '/etc/apt/sources.list/wo-repo.list',
+                WORepo.add_key(self, WOVar.wo_nginx_key)
-                        'WordOps')):
+                WORepo.add(self, repo_url=WOVar.wo_nginx_repo)
-                    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
+            if (WOVar.wo_platform_codename == 'focal' or
-                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')