v3.11.0 (#211)
- PHP 7.4 support - Improved Webp images support with Cloudflare (Issue [#95](https://github.com/WordOps/WordOps/issues/95)). Nginx will not serve webp images alternative with Cloudflare IP ranges. - Stack upgrade for adminer - Check acme.sh installation and setup acme.sh if needed before issuing certificate - Add `--ufw` to `wo stack status` - Add Nginx directive `gzip_static on;` to serve precompressed assets with Cache-Enabler or WP-Rocket. (Issue [#207](https://github.com/WordOps/WordOps/issues/207)) - Previous `--php73` & `--php73=off` flags are replaced by `--php72`, `--php73`, `--php74` to switch site's php version - phpMyAdmin updated to v4.9.2 - Adminer updated to v4.7.5 - Replace dot and dashes by underscores in database names (Issue [#206](https://github.com/WordOps/WordOps/issues/206)) - Increased database name length to 32 characters from domain name + 8 random characters - typo error in motd-news script (Issue [#204](https://github.com/WordOps/WordOps/issues/204)) - Install Nginx before ngxblocker - WordOps install/update script text color - Issue with MySQL stack on Raspbian 9/10 - Typo error (PR [#205](https://github.com/WordOps/WordOps/pull/205)) - php version in `wo debug` (PR [#209](https://github.com/WordOps/WordOps/pull/209)) - SSL certificates expiration display with shared wildcard certificates
This commit is contained in:
@@ -4,6 +4,7 @@ from cement.core.controller import CementBaseController, expose
|
||||
from wo.core.logging import Log
|
||||
from wo.core.services import WOService
|
||||
from wo.core.variables import WOVar
|
||||
from wo.core.fileutils import WOFileUtils
|
||||
|
||||
|
||||
class WOStackStatusController(CementBaseController):
|
||||
@@ -20,17 +21,21 @@ class WOStackStatusController(CementBaseController):
|
||||
wo_system = "/lib/systemd/system/"
|
||||
pargs = self.app.pargs
|
||||
if not (pargs.nginx or pargs.php or
|
||||
pargs.php72 or
|
||||
pargs.php73 or
|
||||
pargs.php74 or
|
||||
pargs.mysql or
|
||||
pargs.redis or
|
||||
pargs.fail2ban or
|
||||
pargs.proftpd or
|
||||
pargs.netdata):
|
||||
pargs.netdata or
|
||||
pargs.ufw):
|
||||
pargs.nginx = True
|
||||
pargs.php = True
|
||||
pargs.mysql = True
|
||||
pargs.fail2ban = True
|
||||
pargs.netdata = True
|
||||
pargs.ufw = True
|
||||
|
||||
if pargs.nginx:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'nginx.service'):
|
||||
@@ -47,6 +52,16 @@ class WOStackStatusController(CementBaseController):
|
||||
services = services + ['php7.3-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.php72:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'):
|
||||
services = services + ['php7.2-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.2-FPM is not installed")
|
||||
|
||||
if pargs.php73:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'):
|
||||
@@ -54,6 +69,12 @@ class WOStackStatusController(CementBaseController):
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
|
||||
if pargs.php74:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.mysql:
|
||||
if ((WOVar.wo_mysql_host == "localhost") or
|
||||
(WOVar.wo_mysql_host == "127.0.0.1")):
|
||||
@@ -103,7 +124,8 @@ class WOStackStatusController(CementBaseController):
|
||||
wo_system = "/lib/systemd/system/"
|
||||
pargs = self.app.pargs
|
||||
if not (pargs.nginx or pargs.php or
|
||||
pargs.php73 or
|
||||
pargs.php72 or pargs.php73 or
|
||||
pargs.php74 or
|
||||
pargs.mysql or
|
||||
pargs.fail2ban or
|
||||
pargs.netdata or
|
||||
@@ -128,6 +150,16 @@ class WOStackStatusController(CementBaseController):
|
||||
services = services + ['php7.3-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.php72:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'):
|
||||
services = services + ['php7.2-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.2-FPM is not installed")
|
||||
|
||||
if pargs.php73:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'):
|
||||
@@ -135,6 +167,12 @@ class WOStackStatusController(CementBaseController):
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
|
||||
if pargs.php74:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.mysql:
|
||||
if ((WOVar.wo_mysql_host == "localhost") or
|
||||
(WOVar.wo_mysql_host == "127.0.0.1")):
|
||||
@@ -184,7 +222,8 @@ class WOStackStatusController(CementBaseController):
|
||||
wo_system = "/lib/systemd/system/"
|
||||
pargs = self.app.pargs
|
||||
if not (pargs.nginx or pargs.php or
|
||||
pargs.php73 or
|
||||
pargs.php72 or pargs.php73 or
|
||||
pargs.php74 or
|
||||
pargs.mysql or
|
||||
pargs.netdata or
|
||||
pargs.proftpd or
|
||||
@@ -210,6 +249,16 @@ class WOStackStatusController(CementBaseController):
|
||||
services = services + ['php7.3-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.php72:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'):
|
||||
services = services + ['php7.2-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.2-FPM is not installed")
|
||||
|
||||
if pargs.php73:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'):
|
||||
@@ -217,6 +266,12 @@ class WOStackStatusController(CementBaseController):
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
|
||||
if pargs.php74:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.mysql:
|
||||
if ((WOVar.wo_mysql_host == "localhost") or
|
||||
(WOVar.wo_mysql_host == "127.0.0.1")):
|
||||
@@ -266,7 +321,9 @@ class WOStackStatusController(CementBaseController):
|
||||
wo_system = "/lib/systemd/system/"
|
||||
pargs = self.app.pargs
|
||||
if not (pargs.nginx or pargs.php or
|
||||
pargs.php72 or
|
||||
pargs.php73 or
|
||||
pargs.php74 or
|
||||
pargs.mysql or
|
||||
pargs.netdata or
|
||||
pargs.proftpd or
|
||||
@@ -277,6 +334,7 @@ class WOStackStatusController(CementBaseController):
|
||||
pargs.mysql = True
|
||||
pargs.fail2ban = True
|
||||
pargs.netdata = True
|
||||
pargs.ufw = True
|
||||
|
||||
if pargs.nginx:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'nginx.service'):
|
||||
@@ -293,6 +351,16 @@ class WOStackStatusController(CementBaseController):
|
||||
services = services + ['php7.3-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.php72:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'):
|
||||
services = services + ['php7.2-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.2-FPM is not installed")
|
||||
|
||||
if pargs.php73:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'):
|
||||
@@ -300,6 +368,12 @@ class WOStackStatusController(CementBaseController):
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
|
||||
if pargs.php74:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.mysql:
|
||||
if ((WOVar.wo_mysql_host == "localhost") or
|
||||
(WOVar.wo_mysql_host == "127.0.0.1")):
|
||||
@@ -338,6 +412,17 @@ class WOStackStatusController(CementBaseController):
|
||||
else:
|
||||
Log.info(self, "Netdata is not installed")
|
||||
|
||||
# UFW
|
||||
if pargs.ufw:
|
||||
if os.path.exists('/usr/sbin/ufw'):
|
||||
if WOFileUtils.grepcheck(
|
||||
self, '/etc/ufw/ufw.conf', 'ENABLED=yes'):
|
||||
Log.info(self, "UFW Firewall is enabled")
|
||||
else:
|
||||
Log.info(self, "UFW Firewall is disabled")
|
||||
else:
|
||||
Log.info(self, "UFW is not installed")
|
||||
|
||||
for service in services:
|
||||
if WOService.get_service_status(self, service):
|
||||
Log.info(self, "{0:10}: {1}".format(service, "Running"))
|
||||
@@ -349,7 +434,8 @@ class WOStackStatusController(CementBaseController):
|
||||
wo_system = "/lib/systemd/system/"
|
||||
pargs = self.app.pargs
|
||||
if not (pargs.nginx or pargs.php or
|
||||
pargs.php73 or
|
||||
pargs.php72 or pargs.php73 or
|
||||
pargs.php74 or
|
||||
pargs.mysql or
|
||||
pargs.netdata or
|
||||
pargs.proftpd or
|
||||
@@ -375,6 +461,16 @@ class WOStackStatusController(CementBaseController):
|
||||
services = services + ['php7.3-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.php72:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'):
|
||||
services = services + ['php7.2-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.2-FPM is not installed")
|
||||
|
||||
if pargs.php73:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'):
|
||||
@@ -382,6 +478,12 @@ class WOStackStatusController(CementBaseController):
|
||||
else:
|
||||
Log.info(self, "PHP7.3-FPM is not installed")
|
||||
|
||||
if pargs.php74:
|
||||
if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'):
|
||||
services = services + ['php7.4-fpm']
|
||||
else:
|
||||
Log.info(self, "PHP7.4-FPM is not installed")
|
||||
|
||||
if pargs.mysql:
|
||||
if ((WOVar.wo_mysql_host == "localhost") or
|
||||
(WOVar.wo_mysql_host == "127.0.0.1")):
|
||||
|
||||
Reference in New Issue
Block a user