diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py index 1123b3e..421ad28 100644 --- a/wo/cli/plugins/secure.py +++ b/wo/cli/plugins/secure.py @@ -117,10 +117,10 @@ class WOSecureController(CementBaseController): Log.info(self, "Please Enter valid port number :") port = input("WordOps admin port [22222]:") pargs.user_input = port - WOShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen " - "{port} default_server ssl http2;/\" " - "/etc/nginx/sites-available/22222" - .format(port=pargs.user_input)) + data = dict(release=WOVar.wo_version, port=port) + WOTemplate.deploy( + self, '/etc/nginx/sites-available/22222', + '22222.mustache', data) WOGit.add(self, ["/etc/nginx"], msg="Adding changed secure port into Git") if not WOService.reload_service(self, 'nginx'): @@ -145,8 +145,8 @@ class WOSecureController(CementBaseController): Log.debug(self, "{0}".format(e)) user_ip = ['127.0.0.1'] for ip_addr in user_ip: - if not ("exist_ip_address "+ip_addr in open('/etc/nginx/common/' - 'acl.conf').read()): + if not ("exist_ip_address " + ip_addr in open('/etc/nginx/common/' + 'acl.conf').read()): WOShellExec.cmd_exec(self, "sed -i " "\"/deny/i allow {whitelist_address}\;\"" " /etc/nginx/common/acl.conf" diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 84dd000..0557ba7 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -322,11 +322,14 @@ def post_pref(self, apt_packages, packages, upgrade=False): os.makedirs('/etc/nginx/sites-enabled') # 22222 port settings - data = dict(webroot=ngxroot, release=WOVar.wo_version) - WOTemplate.deploy( - self, - '/etc/nginx/sites-available/22222', - '22222.mustache', data, overwrite=True) + data = dict(webroot=ngxroot, + release=WOVar.wo_version, port='22222') + if not WOFileUtils.grepcheck( + self, 'WordOps', '/etc/nginx/sites-available/22222'): + WOTemplate.deploy( + self, + '/etc/nginx/sites-available/22222', + '22222.mustache', data, overwrite=True) passwd = ''.join([random.choice (string.ascii_letters + string.digits) for n in range(24)]) diff --git a/wo/cli/templates/22222.mustache b/wo/cli/templates/22222.mustache index ef456cb..ff765e7 100644 --- a/wo/cli/templates/22222.mustache +++ b/wo/cli/templates/22222.mustache @@ -2,13 +2,13 @@ server { - listen 22222 default_server ssl http2; + listen {{port}} default_server ssl http2; access_log /var/log/nginx/22222.access.log rt_cache; error_log /var/log/nginx/22222.error.log; # 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; index index.php index.htm index.html;