Spotter-Cluster/vmmgr
2
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge rebuild_nginx into update_host

Browse Source
This commit is contained in:
Disassembler 2019-06-04 08:42:41 +02:00
parent d6f738c47e
commit ebd24befaf
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr/lib/python3.6/vmmgr/vmmgr.py
View File

@ -55,14 +55,10 @@ class VMMgr:
self.reload_nginx() self.reload_nginx()
def update_host(self, domain, port): def update_host(self, domain, port):
# Update domain and port and rebuild all configuration. Web interface calls restart_nginx() in WSGI close handler # Update domain and port, rebuild all configuration and restart nginx
self.domain = self.conf['host']['domain'] = domain self.domain = self.conf['host']['domain'] = domain
self.port = self.conf['host']['port'] = port self.port = self.conf['host']['port'] = port
self.conf.save() self.conf.save()
# Rebuild and restart nginx if it was requested.
self.rebuild_nginx()
def rebuild_nginx(self):
# Rebuild nginx config for the portal app. Web interface calls restart_nginx() in WSGI close handler # Rebuild nginx config for the portal app. Web interface calls restart_nginx() in WSGI close handler
with open(os.path.join(NGINX_DIR, 'default.conf'), 'w') as f: with open(os.path.join(NGINX_DIR, 'default.conf'), 'w') as f:
f.write(templates.NGINX_DEFAULT.format(port=self.port, domain_esc=self.domain.replace('.', '\\.'))) f.write(templates.NGINX_DEFAULT.format(port=self.port, domain_esc=self.domain.replace('.', '\\.')))