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

Fix for redis and variable glob

Browse Source
This commit is contained in:
VirtuBox
2019-08-06 11:37:03 +02:00
parent d0799a08e7
commit 89ebbe9cd6
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -536,15 +536,15 @@ def post_pref(self, apt_packages, packages):
self, "Failed to generate HTTPS " self, "Failed to generate HTTPS "
"certificate for 22222") "certificate for 22222")
if not os.path.isfile('{0}22222/conf/nginx/ssl.conf' if not os.path.isfile('{0}22222/conf/nginx/ssl.conf'
.format(WOVariables.wo_webroot)): .format(WOVariables.wo_webroot)):
with open("/var/www/22222/conf/nginx/" with open("/var/www/22222/conf/nginx/"
"ssl.conf", "a") as php_file: "ssl.conf", "a") as php_file:
php_file.write("ssl_certificate " php_file.write("ssl_certificate "
"/var/www/22222/cert/22222.crt;\n" "/var/www/22222/cert/22222.crt;\n"
"ssl_certificate_key " "ssl_certificate_key "
"/var/www/22222/cert/22222.key;\n") "/var/www/22222/cert/22222.key;\n")
# Nginx Configation into GIT # Nginx Configation into GIT
WOGit.add(self, WOGit.add(self,
@@ -574,7 +574,7 @@ def post_pref(self, apt_packages, packages):
# create nginx configuration for redis # create nginx configuration for redis
if set(WOVariables.wo_redis).issubset(set(apt_packages)): if set(WOVariables.wo_redis).issubset(set(apt_packages)):
if os.path.isdir('/etc/nginx/common'): if os.path.isdir('/etc/nginx/common'):
data = dict() data = dict(upstream="php72")
Log.debug(self, 'Writting the nginx configuration to ' Log.debug(self, 'Writting the nginx configuration to '
'file /etc/nginx/common/redis-php72.conf') 'file /etc/nginx/common/redis-php72.conf')
wo_nginx = open('/etc/nginx/common/redis-php72.conf', wo_nginx = open('/etc/nginx/common/redis-php72.conf',

1
wo/cli/plugins/sync.py
View File

@@ -4,6 +4,7 @@ from wo.core.fileutils import WOFileUtils
from wo.cli.plugins.sitedb import * from wo.cli.plugins.sitedb import *
from wo.core.mysql import * from wo.core.mysql import *
from wo.core.logging import Log from wo.core.logging import Log
import glob
def wo_sync_hook(app): def wo_sync_hook(app):

2
wo/cli/templates/redis.mustache
View File

@@ -10,7 +10,7 @@ location / {
location /redis-fetch { location /redis-fetch {
internal ; internal ;
set $redis_key $args; set $redis_key $args;
redis_pass redis; redis_pass redis;
} }
location /redis-store { location /redis-store {
internal ; internal ;