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

Fix variables_hash_bucket_size

Browse Source
This commit is contained in:
VirtuBox
2019-12-05 20:36:18 +01:00
parent 69d6b67b8b
commit e45955a513
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -8,9 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### v3.9.x - [Unreleased] ### v3.9.x - [Unreleased]
#### Changed #### Fixed
- Install ngxblocker with Nginx to set proper values for variables_hash_bucket_size & variables_hash_max_size without conflicts - Issue with Nginx variables_hash_bucket_size & variables_hash_max_size
### v3.11.1 - 2019-12-04 ### v3.11.1 - 2019-12-04

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

@@ -321,9 +321,15 @@ def post_pref(self, apt_packages, packages, upgrade=False):
"'\"$http_referer\" " "'\"$http_referer\" "
"\"$http_user_agent\"';\n") "\"$http_user_agent\"';\n")
# Nginx-Plus does not have nginx if not os.path.exists('/etc/nginx/bots.d'):
# package structure like this WOFileUtils.textwrite(
# So creating directories self, '/etc/nginx/conf.d/variables-hash.conf',
'variables_hash_max_size 4096;\n'
'variables_hash_bucket_size 4096;')
# Nginx-Plus does not have nginx
# package structure like this
# So creating directories
if not os.path.exists('/etc/nginx/sites-available'): if not os.path.exists('/etc/nginx/sites-available'):
Log.debug(self, 'Creating directory' Log.debug(self, 'Creating directory'
'/etc/nginx/sites-available') '/etc/nginx/sites-available')
@@ -1585,11 +1591,16 @@ def post_pref(self, apt_packages, packages, upgrade=False):
# ngxblocker # ngxblocker
if any('/usr/local/sbin/install-ngxblocker' == x[1] if any('/usr/local/sbin/install-ngxblocker' == x[1]
for x in packages): for x in packages):
# remove duplicate directives
if os.path.exists('/etc/nginx/conf.d/variables-hash.conf'):
WOFileUtils.rm(self, '/etc/nginx/conf.d/variables-hash.conf')
WOFileUtils.chmod( WOFileUtils.chmod(
self, "/usr/local/sbin/install-ngxblocker", 0o700) self, "/usr/local/sbin/install-ngxblocker", 0o700)
WOShellExec.cmd_exec(self, '/usr/local/sbin/install-ngxblocker -x') WOShellExec.cmd_exec(self, '/usr/local/sbin/install-ngxblocker -x')
WOFileUtils.chmod( WOFileUtils.chmod(
self, "/usr/local/sbin/update-ngxblocker", 0o700) self, "/usr/local/sbin/update-ngxblocker", 0o700)
if not WOService.restart_service(self, 'nginx'):
Log.error(self, 'ngxblocker install failed')
def pre_stack(self): def pre_stack(self):

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

@@ -269,8 +269,6 @@ class WOStackUpgradeController(CementBaseController):
'/usr/local/sbin/update-ngxblocker', '/usr/local/sbin/update-ngxblocker',
'ngxblocker' 'ngxblocker'
]] ]]
else:
Log.info(self, "ngxblocker is not installed")
if ((not (apt_packages)) and (not(packages))): if ((not (apt_packages)) and (not(packages))):
self.app.args.print_help() self.app.args.print_help()
@@ -347,6 +345,9 @@ class WOStackUpgradeController(CementBaseController):
WOFileUtils.chmod(self, "/usr/local/bin/wp", 0o775) WOFileUtils.chmod(self, "/usr/local/bin/wp", 0o775)
if WOAptGet.is_selected(self, 'ngxblocker', packages): if WOAptGet.is_selected(self, 'ngxblocker', packages):
if os.path.exists('/etc/nginx/conf.d/variables-hash.conf'):
WOFileUtils.rm(
self, '/etc/nginx/conf.d/variables-hash.conf')
WOFileUtils.chmod( WOFileUtils.chmod(
self, '/usr/local/sbin/update-ngxblocker', 0o775) self, '/usr/local/sbin/update-ngxblocker', 0o775)
WOShellExec.cmd_exec( WOShellExec.cmd_exec(