Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Nginx configuration Rollback

Browse Source
This commit is contained in:
VirtuBox
2019-08-27 15:12:01 +02:00
parent 5cc1c06e88
commit d24ae7e8d2
7 changed files with 199 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -18,8 +18,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Increase Nginx & MariaDB systemd open_files limits - Increase Nginx & MariaDB systemd open_files limits
- Cronjob to update Cloudflare IPs list - Cronjob to update Cloudflare IPs list
- mariadb-backup to perform full and non-blocking databases backup - mariadb-backup to perform full and non-blocking databases backup
- Nginx configuration check before performing reload/restart - Nginx configuration check before performing start/reload/restart
- Nginx mapping to proxy web-socket connections - Nginx mapping to proxy web-socket connections
- Nginx configuration rollback in case of failure with `wo stack upgrade --nginx`
#### Changed #### Changed

12
wo/cli/plugins/site_functions.py
View File

@@ -978,6 +978,18 @@ def display_cache_settings(self, data):
"page=redis-cache".format(data['site_name'])) "page=redis-cache".format(data['site_name']))
Log.info(self, "Object Cache:\t\tEnable") Log.info(self, "Object Cache:\t\tEnable")
if data['wpfc']:
if data['multisite']:
Log.info(self, "Nginx-Helper configuration :"
"\thttp://{0}/wp-admin/network/settings.php?"
"page=nginx".format(data['site_name']))
else:
Log.info(self, "Nginx-Helper configuration :"
"\thttp://{0}/wp-admin/options-general.php?"
"page=nginx".format(data['site_name']))
def logwatch(self, logfiles): def logwatch(self, logfiles):
import zlib import zlib

305
wo/cli/plugins/stack_pref.py
View File

@@ -142,7 +142,7 @@ def pre_pref(self, apt_packages):
WORepo.add(self, ppa=WOVariables.wo_redis_repo) WORepo.add(self, ppa=WOVariables.wo_redis_repo)
def post_pref(self, apt_packages, packages): def post_pref(self, apt_packages, packages, upgrade=False):
"""Post activity after installation of packages""" """Post activity after installation of packages"""
if (apt_packages): if (apt_packages):
# Nginx configuration # Nginx configuration
@@ -151,28 +151,29 @@ def post_pref(self, apt_packages, packages):
ngxcnf = '/etc/nginx/conf.d' ngxcnf = '/etc/nginx/conf.d'
ngxcom = '/etc/nginx/common' ngxcom = '/etc/nginx/common'
ngxroot = '/var/www/' ngxroot = '/var/www/'
if (WOVariables.wo_distro == 'ubuntu' or if upgrade:
WOVariables.wo_platform_codename == 'buster'): if os.path.isdir('/etc/nginx'):
data = dict(tls13=True) WOGit.add(self,
else: ["/etc/nginx"],
data = dict(tls13=False) msg="Adding Nginx into Git")
WOTemplate.tmpl_render(self, data = dict(tls13=True)
'/etc/nginx/nginx.conf', WOTemplate.render(self,
'nginx-core.mustache', data) '/etc/nginx/nginx.conf',
'nginx-core.mustache', data)
if not os.path.isfile('{0}/gzip.conf.disabled'.format(ngxcnf)): if not os.path.isfile('{0}/gzip.conf.disabled'.format(ngxcnf)):
data = dict() data = dict()
WOTemplate.tmpl_render(self, '{0}/gzip.conf'.format(ngxcnf), WOTemplate.render(self, '{0}/gzip.conf'.format(ngxcnf),
'gzip.mustache', data) 'gzip.mustache', data)
if not os.path.isfile('{0}/brotli.conf'.format(ngxcnf)): if not os.path.isfile('{0}/brotli.conf'.format(ngxcnf)):
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/brotli.conf.disabled' '{0}/brotli.conf.disabled'
.format(ngxcnf), .format(ngxcnf),
'brotli.mustache', data) 'brotli.mustache', data)
WOTemplate.tmpl_render(self, '{0}/tweaks.conf'.format(ngxcnf), WOTemplate.render(self, '{0}/tweaks.conf'.format(ngxcnf),
'tweaks.mustache', data) 'tweaks.mustache', data)
# Fix for white screen death with NGINX PLUS # Fix for white screen death with NGINX PLUS
if not WOFileUtils.grep(self, '/etc/nginx/fastcgi_params', if not WOFileUtils.grep(self, '/etc/nginx/fastcgi_params',
@@ -184,29 +185,29 @@ def post_pref(self, apt_packages, packages):
data = dict(php="9000", debug="9001", data = dict(php="9000", debug="9001",
php7="9070", debug7="9170") php7="9070", debug7="9170")
WOTemplate.tmpl_render( WOTemplate.render(
self, '{0}/upstream.conf'.format(ngxcnf), self, '{0}/upstream.conf'.format(ngxcnf),
'upstream.mustache', data, overwrite=True) 'upstream.mustache', data, overwrite=True)
data = dict(phpconf=True if data = dict(phpconf=True if
WOAptGet.is_installed(self, 'php7.2-fpm') WOAptGet.is_installed(self, 'php7.2-fpm')
else False) else False)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/stub_status.conf'.format(ngxcnf), '{0}/stub_status.conf'.format(ngxcnf),
'stub_status.mustache', data) 'stub_status.mustache', data)
data = dict() data = dict()
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/webp.conf'.format(ngxcnf), '{0}/webp.conf'.format(ngxcnf),
'webp.mustache', data) 'webp.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/cloudflare.conf'.format(ngxcnf), '{0}/cloudflare.conf'.format(ngxcnf),
'cloudflare.mustache', data) 'cloudflare.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/map-wp-fastcgi-cache.conf'.format( '{0}/map-wp-fastcgi-cache.conf'.format(
ngxcnf), ngxcnf),
'map-wp.mustache', data) 'map-wp.mustache', data)
# Setup Nginx common directory # Setup Nginx common directory
if not os.path.exists('{0}'.format(ngxcom)): if not os.path.exists('{0}'.format(ngxcom)):
@@ -218,88 +219,88 @@ def post_pref(self, apt_packages, packages):
data = dict() data = dict()
# Common Configuration # Common Configuration
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/locations-wo.conf' '{0}/locations-wo.conf'
.format(ngxcom), .format(ngxcom),
'locations.mustache', data) 'locations.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpsubdir.conf' '{0}/wpsubdir.conf'
.format(ngxcom), .format(ngxcom),
'wpsubdir.mustache', data) 'wpsubdir.mustache', data)
data = dict(upstream="php72") data = dict(upstream="php72")
# PHP 7.2 conf # PHP 7.2 conf
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/php72.conf' '{0}/php72.conf'
.format(ngxcom), .format(ngxcom),
'php.mustache', data) 'php.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/redis-php72.conf' '{0}/redis-php72.conf'
.format(ngxcom), .format(ngxcom),
'redis.mustache', data) 'redis.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpcommon-php72.conf' '{0}/wpcommon-php72.conf'
.format(ngxcom), .format(ngxcom),
'wpcommon.mustache', data) 'wpcommon.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpfc-php72.conf' '{0}/wpfc-php72.conf'
.format(ngxcom), .format(ngxcom),
'wpfc.mustache', data) 'wpfc.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpsc-php72.conf' '{0}/wpsc-php72.conf'
.format(ngxcom), .format(ngxcom),
'wpsc.mustache', data) 'wpsc.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wprocket-php72.conf' '{0}/wprocket-php72.conf'
.format(ngxcom), .format(ngxcom),
'wprocket.mustache', data) 'wprocket.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpce-php72.conf' '{0}/wpce-php72.conf'
.format(ngxcom), .format(ngxcom),
'wpce.mustache', data) 'wpce.mustache', data)
# PHP 7.3 conf # PHP 7.3 conf
if os.path.isdir("/etc/nginx/common"): if os.path.isdir("/etc/nginx/common"):
data = dict(upstream="php73") data = dict(upstream="php73")
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/php73.conf' '{0}/php73.conf'
.format(ngxcom), .format(ngxcom),
'php.mustache', data) 'php.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/redis-php73.conf' '{0}/redis-php73.conf'
.format(ngxcom), .format(ngxcom),
'redis.mustache', data) 'redis.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpcommon-php73.conf' '{0}/wpcommon-php73.conf'
.format(ngxcom), .format(ngxcom),
'wpcommon.mustache', data) 'wpcommon.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpfc-php73.conf' '{0}/wpfc-php73.conf'
.format(ngxcom), .format(ngxcom),
'wpfc.mustache', data) 'wpfc.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpsc-php73.conf' '{0}/wpsc-php73.conf'
.format(ngxcom), .format(ngxcom),
'wpsc.mustache', data) 'wpsc.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wprocket-php73.conf' '{0}/wprocket-php73.conf'
.format(ngxcom), .format(ngxcom),
'wprocket.mustache', data) 'wprocket.mustache', data)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/wpce-php73.conf' '{0}/wpce-php73.conf'
.format(ngxcom), .format(ngxcom),
'wpce.mustache', data) 'wpce.mustache', data)
with open("/etc/nginx/common/release", with open("/etc/nginx/common/release",
"w") as release_file: "w") as release_file:
@@ -310,18 +311,18 @@ def post_pref(self, apt_packages, packages):
# Following files should not be overwrited # Following files should not be overwrited
data = dict(webroot=ngxroot) data = dict(webroot=ngxroot)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/acl.conf' '{0}/acl.conf'
.format(ngxcom), .format(ngxcom),
'acl.mustache', data, overwrite=False) 'acl.mustache', data, overwrite=False)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/blockips.conf' '{0}/blockips.conf'
.format(ngxcnf), .format(ngxcnf),
'blockips.mustache', data, overwrite=False) 'blockips.mustache', data, overwrite=False)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'{0}/fastcgi.conf' '{0}/fastcgi.conf'
.format(ngxcnf), .format(ngxcnf),
'fastcgi.mustache', data, overwrite=False) 'fastcgi.mustache', data, overwrite=False)
# add redis cache format if not already done # add redis cache format if not already done
if (os.path.isfile("/etc/nginx/nginx.conf") and if (os.path.isfile("/etc/nginx/nginx.conf") and
@@ -355,9 +356,9 @@ def post_pref(self, apt_packages, packages):
# 22222 port settings # 22222 port settings
if not os.path.isfile('/etc/nginx/sites-available/22222'): if not os.path.isfile('/etc/nginx/sites-available/22222'):
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'/etc/nginx/sites-available/22222', '/etc/nginx/sites-available/22222',
'22222.mustache', data, overwrite=False) '22222.mustache', data, overwrite=False)
passwd = ''.join([random.choice passwd = ''.join([random.choice
(string.ascii_letters + string.digits) (string.ascii_letters + string.digits)
@@ -455,7 +456,7 @@ def post_pref(self, apt_packages, packages):
Log.debug(self, "{0}".format(e)) Log.debug(self, "{0}".format(e))
Log.error( Log.error(
self, "Failed to generate HTTPS " self, "Failed to generate HTTPS "
"certificate for 22222") "certificate for 22222", False)
if not os.path.isfile('{0}22222/conf/nginx/ssl.conf' if not os.path.isfile('{0}22222/conf/nginx/ssl.conf'
.format(ngxroot)): .format(ngxroot)):
@@ -467,38 +468,36 @@ def post_pref(self, apt_packages, packages):
"ssl_certificate_key " "ssl_certificate_key "
"/var/www/22222/cert/22222.key;\n") "/var/www/22222/cert/22222.key;\n")
server_ip = requests.get('http://v4.wordops.eu') server_ip = requests.get('http://v4.wordops.eu')
WOTemplate.tmpl_render(self, '/opt/cf-update.sh',
'cf-update.mustache', WOTemplate.render(self, '/opt/cf-update.sh',
data, overwrite=False) 'cf-update.mustache',
data, overwrite=False)
WOFileUtils.chmod(self, "/opt/cf-update.sh", 0o775) WOFileUtils.chmod(self, "/opt/cf-update.sh", 0o775)
WOCron.setcron_weekly(self, '/opt/cf-update.sh ' WOCron.setcron_weekly(self, '/opt/cf-update.sh '
'> /dev/null 2>&1', '> /dev/null 2>&1',
comment='Cloudflare IP refresh cronjob ' comment='Cloudflare IP refresh cronjob '
'added by WordOps') 'added by WordOps')
# Nginx Configation into GIT self.msg = (self.msg + ["HTTP Auth User "
WOGit.add(self, "Name: WordOps"] +
["/etc/nginx"], msg="Adding Nginx into Git") ["HTTP Auth Password : {0}"
WOService.reload_service(self, 'nginx') .format(passwd)])
self.msg = (self.msg + ["WordOps backend is available "
"on https://{0}:22222 "
"or https://{1}:22222"
.format(server_ip.text,
WOVariables.wo_fqdn)])
if set(["nginx"]).issubset(set(apt_packages)): if upgrade:
print("WordOps backend configuration was successful\n" try:
"You can access it on : https://{0}:22222"
.format(server_ip))
print("HTTP Auth User Name: WordOps" +
"\nHTTP Auth Password : {0}".format(passwd))
WOService.reload_service(self, 'nginx') WOService.reload_service(self, 'nginx')
else: except CommandExecutionError as e:
self.msg = (self.msg + ["HTTP Auth User " Log.debug(self, "{0}".format(e))
"Name: WordOps"] + WOGit.rollback(self, ["/etc/nginx"])
["HTTP Auth Password : {0}"
.format(passwd)]) # Nginx Configation into GIT
self.msg = (self.msg + ["WordOps backend is available " WOGit.add(self,
"on https://{0}:22222 " ["/etc/nginx"], msg="Adding Nginx into Git")
"or https://{1}:22222" WOService.restart_service(self, 'nginx')
.format(server_ip.text,
WOVariables.wo_fqdn)])
else:
WOService.restart_service(self, 'nginx')
if set(WOVariables.wo_php).issubset(set(apt_packages)): if set(WOVariables.wo_php).issubset(set(apt_packages)):
ngxroot = '/var/www/' ngxroot = '/var/www/'
@@ -964,20 +963,20 @@ def post_pref(self, apt_packages, packages):
if set(WOVariables.wo_fail2ban).issubset(set(apt_packages)): if set(WOVariables.wo_fail2ban).issubset(set(apt_packages)):
if not os.path.isfile("/etc/fail2ban/jail.d/custom.conf"): if not os.path.isfile("/etc/fail2ban/jail.d/custom.conf"):
data = dict() data = dict()
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'/etc/fail2ban/jail.d/custom.conf', '/etc/fail2ban/jail.d/custom.conf',
'fail2ban.mustache', 'fail2ban.mustache',
data, overwrite=False) data, overwrite=False)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'/etc/fail2ban/filter.d/' '/etc/fail2ban/filter.d/'
'wo-wordpress.conf', 'wo-wordpress.conf',
'fail2ban-wp.mustache', 'fail2ban-wp.mustache',
data, overwrite=False) data, overwrite=False)
WOTemplate.tmpl_render(self, WOTemplate.render(self,
'/etc/fail2ban/filter.d/' '/etc/fail2ban/filter.d/'
'nginx-forbidden.conf', 'nginx-forbidden.conf',
'fail2ban-forbidden.mustache', 'fail2ban-forbidden.mustache',
data, overwrite=False) data, overwrite=False)
WOGit.add(self, ["/etc/fail2ban"], WOGit.add(self, ["/etc/fail2ban"],
msg="Adding Fail2ban into Git") msg="Adding Fail2ban into Git")
@@ -1147,9 +1146,9 @@ def post_pref(self, apt_packages, packages):
# Redis configuration # Redis configuration
if set(["clamav"]).issubset(set(apt_packages)): if set(["clamav"]).issubset(set(apt_packages)):
Log.debug("Setting up freshclam cronjob") Log.debug("Setting up freshclam cronjob")
WOTemplate.tmpl_render(self, '/opt/freshclam.sh', WOTemplate.render(self, '/opt/freshclam.sh',
'freshclam.mustache', 'freshclam.mustache',
data, overwrite=False) data, overwrite=False)
WOFileUtils.chmod(self, "/opt/freshclam.sh", 0o775) WOFileUtils.chmod(self, "/opt/freshclam.sh", 0o775)
WOCron.setcron_weekly(self, '/opt/freshclam.sh ' WOCron.setcron_weekly(self, '/opt/freshclam.sh '
'> /dev/null 2>&1', '> /dev/null 2>&1',

4
wo/cli/plugins/stack_upgrade.py
View File

@@ -184,7 +184,7 @@ class WOStackUpgradeController(CementBaseController):
Log.error(self, "Not starting package update") Log.error(self, "Not starting package update")
Log.info(self, "Updating APT packages, please wait...") Log.info(self, "Updating APT packages, please wait...")
if set(WOVariables.wo_nginx).issubset(set(apt_packages)): if set(WOVariables.wo_nginx).issubset(set(apt_packages)):
pre_pref(self, nginx_packages) pre_pref(self, ["nginx-custom", "nginx-wo"])
# apt-get update # apt-get update
WOAptGet.update(self) WOAptGet.update(self)
if set(WOVariables.wo_php).issubset(set(apt_packages)): if set(WOVariables.wo_php).issubset(set(apt_packages)):
@@ -195,7 +195,7 @@ class WOStackUpgradeController(CementBaseController):
auto=False, purge=True) auto=False, purge=True)
# Update packages # Update packages
WOAptGet.install(self, apt_packages) WOAptGet.install(self, apt_packages)
post_pref(self, apt_packages, empty_packages) post_pref(self, apt_packages, empty_packages, True)
# Post Actions after package updates # Post Actions after package updates
if len(packages): if len(packages):

25
wo/core/git.py
View File

@@ -55,3 +55,28 @@ class WOGit:
return True return True
else: else:
return False return False
def rollback(self, paths, msg="Rolling-Back"):
"""
Rollback last commit to restore previous.
configuration and commit changes automatically
"""
for path in paths:
global git
git = git.bake("--git-dir={0}/.git".format(path),
"--work-tree={0}".format(path))
if os.path.isdir(path):
if not os.path.isdir(path+"/.git"):
Log.error(self, "Unable to find a git repository at {0}"
.format(path))
try:
Log.debug(self, "WOGit: git reset HEAD~ at {0}"
.format(path))
git.reset("HEAD~ --soft")
git.stash("save \"Rollback\"")
except ErrorReturnCode as e:
Log.debug(self, "{0}".format(e))
Log.error(self, "Unable to git reset at {0} "
.format(path))
else:
Log.debug(self, "WOGit: Path {0} not present".format(path))

10
wo/core/services.py
View File

@@ -27,7 +27,7 @@ class WOService():
"[" + Log.ENDC + "OK" + Log.OKBLUE + "]") "[" + Log.ENDC + "OK" + Log.OKBLUE + "]")
return True return True
else: else:
Log.error( Log.info(
self, "Starting Nginx " + "[" + Log.FAIL + self, "Starting Nginx " + "[" + Log.FAIL +
"Failed" + Log.OKBLUE+"]") "Failed" + Log.OKBLUE+"]")
return False return False
@@ -88,13 +88,13 @@ class WOService():
"[" + Log.ENDC + "OK" + Log.OKBLUE + "]") "[" + Log.ENDC + "OK" + Log.OKBLUE + "]")
return True return True
else: else:
Log.error( Log.info(self, "Restarting Nginx " + "[" + Log.FAIL +
self, "Restarting Nginx " + "[" + Log.FAIL + "Failed" + Log.OKBLUE+"]")
"Failed" + Log.OKBLUE+"]")
return False return False
else: else:
service_cmd = ('service {0} restart'.format(service_name)) service_cmd = ('service {0} restart'.format(service_name))
Log.info(self, "Restart : {0:10}".format(service_name), end='') Log.info(self, "Restart : {0:10}".format(
service_name), end='')
retcode = subprocess.getstatusoutput(service_cmd) retcode = subprocess.getstatusoutput(service_cmd)
if retcode[0] == 0: if retcode[0] == 0:
Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]") Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]")

2
wo/core/template.py
View File

@@ -7,7 +7,7 @@ Render Templates
class WOTemplate(): class WOTemplate():
def tmpl_render(self, fileconf, template, data, overwrite=True): def render(self, fileconf, template, data, overwrite=True):
data = dict(data) data = dict(data)
if (not os.path.isfile('{0}.custom' if (not os.path.isfile('{0}.custom'
.format(fileconf))): .format(fileconf))):