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

Simplify compile_url

Browse Source
This commit is contained in:
Disassembler 2018-10-31 16:42:45 +01:00
parent 76220d811d
commit 410958a2a7
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
basic/srv/vm/mgr/tools.py
View File

@ -15,8 +15,7 @@ from cryptography.x509.oid import NameOID
def compile_url(domain, port, proto='https'):
port = '' if (proto == 'https' and port == '443') or (proto == 'http' and port == '80') else ':{}'.format(port)
host = '{}{}'.format(domain, port)
return '{}://{}'.format(proto, host) if proto is not None else host
return '{}://{}{}'.format(proto, domain, port)
def get_local_ipv4():
# Return first routable IPv4 address of the VM (container host)

2
basic/srv/vm/mgr/wsgiapp.py
View File

@ -131,7 +131,7 @@ class WSGIApp(object):
self.conf.save()
# Redirect to host setup view
return redirect('/setup-host')
host = tools.compile_url(self.conf['host']['domain'], self.conf['host']['port'], None)
host = tools.compile_url(self.conf['host']['domain'], self.conf['host']['port'])[8:]
if request.session['admin']:
return self.render_template('portal-admin.html', request, host=host)
return self.render_template('portal-user.html', request, host=host)