diff --git a/CHANGELOG.md b/CHANGELOG.md index 95a3f46..a342710 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### v3.9.x - [Unreleased] +### v3.12.2 - 2020-05-15 + +#### Fixed + +- Wrong PHP upstream for WordOps backend + ### v3.12.1 - 2020-05-14 #### Fixed diff --git a/install b/install index 4ad1640..7133297 100755 --- a/install +++ b/install @@ -9,7 +9,7 @@ # ------------------------------------------------------------------------- # wget -qO wo wops.cc && sudo -E bash wo # ------------------------------------------------------------------------- -# Version 3.12.1 - 2020-05-14 +# Version 3.12.2 - 2020-05-14 # ------------------------------------------------------------------------- # CONTENTS diff --git a/setup.py b/setup.py index 13ba302..83fd867 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.12.1', + version='3.12.2', description='An essential toolset that eases server administration', long_description=LONG, long_description_content_type='text/markdown', diff --git a/wo/cli/templates/22222.mustache b/wo/cli/templates/22222.mustache index ff765e7..9b4ad32 100644 --- a/wo/cli/templates/22222.mustache +++ b/wo/cli/templates/22222.mustache @@ -42,7 +42,7 @@ server { location ~ \.php$ { try_files $uri =404; include fastcgi_params; - fastcgi_pass php72; + fastcgi_pass multiphp; } location /netdata { diff --git a/wo/cli/templates/upstream.mustache b/wo/cli/templates/upstream.mustache index 8d6e25f..1a75efb 100644 --- a/wo/cli/templates/upstream.mustache +++ b/wo/cli/templates/upstream.mustache @@ -104,3 +104,14 @@ upstream redis { server 127.0.0.1:6379; keepalive 10; } + +#------------------------------- +# Multi PHP +#------------------------------- + +# Multi PHP upstream for WordOps backend +upstream multiphp { + server unix:/var/run/php/php73-fpm.sock; + server unix:/var/run/php/php74-fpm.sock; + server unix:/var/run/php/php72-fpm.sock; +} \ No newline at end of file diff --git a/wo/core/variables.py b/wo/core/variables.py index 2c5a718..a8654a3 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.12.1" + wo_version = "3.12.2" # WordOps packages versions wo_wp_cli = "2.4.0" wo_adminer = "4.7.5"