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

fix EOL

Browse Source
This commit is contained in:
VirtuBox
2019-03-07 19:05:34 +01:00
parent a7fa79148c
commit daa6752660
1 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
wo/cli/plugins/stack.py
View File

@@ -229,40 +229,44 @@ class WOStackController(CementBaseController):
"\"EasyEngine\"", "\"EasyEngine\"",
"\"WordOps{0}\"" "\"WordOps{0}\""
.format(WOVariables.wo_version)) .format(WOVariables.wo_version))
WOFileUtils.searchreplace(self, "/etc/nginx/nginx.conf", WOFileUtils.searchreplace(self, '/etc/nginx/nginx.conf',
"ECDHE-RSA-AES128-GCM-SHA256:" 'ECDHE-RSA-AES128-GCM'
"ECDHE-ECDSA-AES128-GCM-SHA256: '-SHA256:'
"ECDHE-RSA-AES256-GCM-SHA384:" 'ECDHE-ECDSA-AES128'
"ECDHE-ECDSA-AES256-GCM-SHA384:" '-GCM-SHA256:'
"DHE-RSA-AES128-GCM-SHA256:" 'ECDHE-RSA-AES256-GCM-SHA384:'
"DHE-DSS-AES128-GCM-SHA256:" 'ECDHE-ECDSA-AES256-GCM-SHA384:'
"kEDH+AESGCM:" 'DHE-RSA-AES128-GCM-SHA256:'
"ECDHE-RSA-AES128-SHA256:" 'DHE-DSS-AES128-GCM-SHA256:'
"ECDHE-ECDSA-AES128-SHA256:" 'kEDH+AESGCM:'
"ECDHE-RSA-AES128-SHA:" 'ECDHE-RSA-AES128-SHA256:'
"ECDHE-ECDSA-AES128-SHA:" 'ECDHE-ECDSA-AES128-SHA256:'
"ECDHE-RSA-AES256-SHA384:" 'ECDHE-RSA-AES128-SHA:'
"ECDHE-ECDSA-AES256-SHA384:" 'ECDHE-ECDSA-AES128-SHA:'
"ECDHE-RSA-AES256-SHA:" 'ECDHE-RSA-AES256-SHA384:'
"ECDHE-ECDSA-AES256-SHA:" 'ECDHE-ECDSA-AES256-SHA384:'
"DHE-RSA-AES128-SHA256:" 'ECDHE-RSA-AES256-SHA:'
"DHE-RSA-AES128-SHADHE-DSS-AES128-SHA256:" 'ECDHE-ECDSA-AES256-SHA:'
"DHE-RSA-AES256-SHA256:" 'DHE-RSA-AES128-SHA256:'
"DHE-DSS-AES256-SHA:" 'DHE-RSA-AES128-SHA'
"DHE-RSA-AES256-SHA:" 'DHE-DSS-AES128-SHA256:'
"ECDHE-RSA-DES-CBC3-SHA:" 'DHE-RSA-AES256-SHA256:'
"ECDHE-ECDSA-DES-CBC3-SHA:" 'DHE-DSS-AES256-SHA:'
"AES128-GCM-SA256:" 'DHE-RSA-AES256-SHA:'
"AES256-GCM-SHA384:" 'ECDHE-RSA-DES-CBC3-SHA:'
"AES128-SHA256:AES256-SHA256:" 'ECDHE-ECDSA-DES-CBC3-SHA:'
"AES128-SHA:AES256-SHA:AES:" 'AES128-GCM-SA256:'
"CAMELLIA:DES-CBC3-SHA:!aNULL:" 'AES256-GCM-SHA384:'
"!eNULL:!EXPORT:!DES:" 'AES128-SHA256:AES256-SHA256:'
"!RC4:!MD5:!PSK:" 'AES128-SHA:AES256-SHA:AES:'
"!ECDH:!EDH-DSS-DES-CBC3-SHA:" 'CAMELLIA:DES-CBC3-SHA:!aNULL:'
"!EDH-RSA-DES-CBC3-SHA:" '!eNULL:!EXPORT:!DES:'
"!KRB5-DES-CBC3-SHA", '!RC4:!MD5:!PSK:'
"EECDH+CHACHA20:EECDH+AESGCM:EECDH+AES") '!ECDH:!EDH-DSS-DES-CBC3-SHA:'
'!EDH-RSA-DES-CBC3-SHA:'
'!KRB5-DES-CBC3-SHA',
'EECDH+CHACHA20:EECDH+AESGCM:'
'EECDH+AES')
data = dict() data = dict()
Log.debug(self, 'Writting the nginx configuration to ' Log.debug(self, 'Writting the nginx configuration to '
'file /etc/nginx/conf.d/blockips.conf') 'file /etc/nginx/conf.d/blockips.conf')
@@ -792,8 +796,7 @@ class WOStackController(CementBaseController):
" server 127.0.0.1:6379;\n" " server 127.0.0.1:6379;\n"
" keepalive 10;\n}\n") " keepalive 10;\n}\n")
if os.path.isfile("/etc/nginx/nginx.conf") and (not if os.path.isfile("/etc/nginx/nginx.conf") and (not os.path.isfile("/etc/nginx/conf.d/redis.conf")):
os.path.isfile("/etc/nginx/conf.d/redis.conf")):
with open("/etc/nginx/conf.d/redis.conf", "a") as redis_file: with open("/etc/nginx/conf.d/redis.conf", "a") as redis_file:
redis_file.write("# Log format Settings\n" redis_file.write("# Log format Settings\n"
"log_format rt_cache_redis '$remote_addr $upstream_response_time $srcache_fetch_status [$time_local] '\n" "log_format rt_cache_redis '$remote_addr $upstream_response_time $srcache_fetch_status [$time_local] '\n"