diff --git a/wo/cli/plugins/clean.py b/wo/cli/plugins/clean.py index 9fc4474..fd3917e 100644 --- a/wo/cli/plugins/clean.py +++ b/wo/cli/plugins/clean.py @@ -74,19 +74,18 @@ class WOCleanController(CementBaseController): def clean_opcache(self): if (os.path.exists('/usr/sbin/nginx') and os.path.exists( - '/var/www/22222/htdocs/cache/opcache/opgui.php')): + '/var/www/22222/htdocs/cache/opcache/php72.php')): try: Log.info(self, "Cleaning opcache") - payload = {'RESET': '1'} opgui = requests.get( - "http://127.0.0.1/cache/opcache/ocp.php", params=payload) + "http://127.0.0.1/cache/opcache/php72.php") if opgui.status_code != '200' or opgui.status_code != '302': Log.warn(self, 'Cleaning opcache failed') except Exception as e: Log.debug(self, "{0}".format(e)) Log.debug(self, "Unable hit url, " " http://127.0.0.1/cache/opcache/" - "opgui.php?reset=1," + "php72.php," " please check you have admin tools installed") Log.debug(self, "please check you have admin tools installed," " or install them with `wo stack install --admin`") diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 2a5bdc5..f6a29d7 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -606,6 +606,16 @@ def post_pref(self, apt_packages, packages, upgrade=False): encoding='utf-8', mode='w') as myfile: myfile.write("") + # write opcache clean for php72 + if not os.path.exists('{0}22222/htdocs/cache/opcache' + .format(ngxroot)): + os.makedirs('{0}22222/htdocs/cache/opcache' + .format(ngxroot)) + WOFileUtils.textwrite( + self, '{0}22222/htdocs/cache/opcache/php72.php' + .format(ngxroot), + '') + WOFileUtils.chown(self, "{0}22222/htdocs" .format(ngxroot), 'www-data', @@ -743,6 +753,16 @@ def post_pref(self, apt_packages, packages, upgrade=False): encoding='utf-8', mode='w') as myfile: myfile.write("") + # write opcache clean for php73 + if not os.path.exists('{0}22222/htdocs/cache/opcache' + .format(ngxroot)): + os.makedirs('{0}22222/htdocs/cache/opcache' + .format(ngxroot)) + WOFileUtils.textwrite( + self, '{0}22222/htdocs/cache/opcache/php73.php' + .format(ngxroot), + '') + WOFileUtils.chown(self, "{0}22222/htdocs" .format(ngxroot), 'www-data', @@ -879,6 +899,16 @@ def post_pref(self, apt_packages, packages, upgrade=False): self, "{0}22222/htdocs/php/info.php" .format(ngxroot), "") + # write opcache clean for php74 + if not os.path.exists('{0}22222/htdocs/cache/opcache' + .format(ngxroot)): + os.makedirs('{0}22222/htdocs/cache/opcache' + .format(ngxroot)) + WOFileUtils.textwrite( + self, '{0}22222/htdocs/cache/opcache/php74.php' + .format(ngxroot), + '') + WOFileUtils.chown(self, "{0}22222/htdocs" .format(ngxroot), 'www-data', diff --git a/wo/cli/templates/stub_status.mustache b/wo/cli/templates/stub_status.mustache index aa4cb0f..ccbc255 100644 --- a/wo/cli/templates/stub_status.mustache +++ b/wo/cli/templates/stub_status.mustache @@ -28,12 +28,26 @@ server { log_not_found off; } location / { - try_files $uri $uri/ /cache/opcache/opgui.php$is_args$args; + try_files $uri $uri/ /index.php$is_args$args; } - location ~ \.php$ { + location /cache/opcache/php72.php { try_files $uri =404; include fastcgi_params; - fastcgi_pass phpstatus; + fastcgi_pass php72; + access_log off; + log_not_found off; + } + location /cache/opcache/php73.php { + try_files $uri =404; + include fastcgi_params; + fastcgi_pass php73; + access_log off; + log_not_found off; + } + location /cache/opcache/php74.php { + try_files $uri =404; + include fastcgi_params; + fastcgi_pass php74; access_log off; log_not_found off; }