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

Update 22222 port from template

Browse Source
This commit is contained in:
VirtuBox
2020-01-13 18:24:18 +01:00
parent 9a5b3e3368
commit 2cdec042b5
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,10 +117,10 @@ class WOSecureController(CementBaseController):
Log.info(self, "Please Enter valid port number :") Log.info(self, "Please Enter valid port number :")
port = input("WordOps admin port [22222]:") port = input("WordOps admin port [22222]:")
pargs.user_input = port pargs.user_input = port
WOShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen " data = dict(release=WOVar.wo_version, port=port)
"{port} default_server ssl http2;/\" " WOTemplate.deploy(
"/etc/nginx/sites-available/22222" self, '/etc/nginx/sites-available/22222',
.format(port=pargs.user_input)) '22222.mustache', data)
WOGit.add(self, ["/etc/nginx"], WOGit.add(self, ["/etc/nginx"],
msg="Adding changed secure port into Git") msg="Adding changed secure port into Git")
if not WOService.reload_service(self, 'nginx'): if not WOService.reload_service(self, 'nginx'):
@@ -145,8 +145,8 @@ class WOSecureController(CementBaseController):
Log.debug(self, "{0}".format(e)) Log.debug(self, "{0}".format(e))
user_ip = ['127.0.0.1'] user_ip = ['127.0.0.1']
for ip_addr in user_ip: for ip_addr in user_ip:
if not ("exist_ip_address "+ip_addr in open('/etc/nginx/common/' if not ("exist_ip_address " + ip_addr in open('/etc/nginx/common/'
'acl.conf').read()): 'acl.conf').read()):
WOShellExec.cmd_exec(self, "sed -i " WOShellExec.cmd_exec(self, "sed -i "
"\"/deny/i allow {whitelist_address}\;\"" "\"/deny/i allow {whitelist_address}\;\""
" /etc/nginx/common/acl.conf" " /etc/nginx/common/acl.conf"

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

@@ -322,11 +322,14 @@ def post_pref(self, apt_packages, packages, upgrade=False):
os.makedirs('/etc/nginx/sites-enabled') os.makedirs('/etc/nginx/sites-enabled')
# 22222 port settings # 22222 port settings
data = dict(webroot=ngxroot, release=WOVar.wo_version) data = dict(webroot=ngxroot,
WOTemplate.deploy( release=WOVar.wo_version, port='22222')
self, if not WOFileUtils.grepcheck(
'/etc/nginx/sites-available/22222', self, 'WordOps', '/etc/nginx/sites-available/22222'):
'22222.mustache', data, overwrite=True) WOTemplate.deploy(
self,
'/etc/nginx/sites-available/22222',
'22222.mustache', data, overwrite=True)
passwd = ''.join([random.choice passwd = ''.join([random.choice
(string.ascii_letters + string.digits) (string.ascii_letters + string.digits)
for n in range(24)]) for n in range(24)])

4
wo/cli/templates/22222.mustache
View File

@@ -2,13 +2,13 @@
server { server {
listen 22222 default_server ssl http2; listen {{port}} default_server ssl http2;
access_log /var/log/nginx/22222.access.log rt_cache; access_log /var/log/nginx/22222.access.log rt_cache;
error_log /var/log/nginx/22222.error.log; error_log /var/log/nginx/22222.error.log;
# Force HTTP to HTTPS # Force HTTP to HTTPS
error_page 497 =200 https://$host:22222$request_uri; error_page 497 =200 https://$host:{{port}}$request_uri;
root {{webroot}}22222/htdocs; root {{webroot}}22222/htdocs;
index index.php index.htm index.html; index index.php index.htm index.html;