diff --git a/config.py b/config.py index 88558b3..4632f92 100644 --- a/config.py +++ b/config.py @@ -64,7 +64,8 @@ REDIS_PORT = int(environ.get('PROXSTAR_REDIS_PORT', '6379')) # VNC WEBSOCKIFY_PATH = environ.get('PROXSTAR_WEBSOCKIFY_PATH', '/usr/local/bin/websockify') WEBSOCKIFY_TARGET_FILE = environ.get('PROXSTAR_WEBSOCKIFY_TARGET_FILE', '/opt/proxstar/targets') -VNC_HOST = environ.get('PROXSTAR_VNC_HOST', 'proxmox-vnc.csh.rit.edu') +VNC_HOST = environ.get('PROXSTAR_VNC_HOST', 'proxstar-vnc.csh.rit.edu') +VNC_PORT = environ.get('PROXSTAR_VNC_PORT', '443') # SENTRY # If you set the sentry dsn locally, make sure you use the local-dev or some diff --git a/proxstar/__init__.py b/proxstar/__init__.py index 0364e58..2b7df1f 100644 --- a/proxstar/__init__.py +++ b/proxstar/__init__.py @@ -74,7 +74,7 @@ app.config['GIT_REVISION'] = ( # Probably cursed. if 'localhost' in app.config['SERVER_NAME']: - print("Server name is localhost. Starting websockify...") + print('Server name is localhost. Starting websockify...') start_websockify(app.config['WEBSOCKIFY_PATH'], app.config['WEBSOCKIFY_TARGET_FILE']) # Sentry setup @@ -307,7 +307,7 @@ def vm_console(vmid): # return {'host' : node, 'port' : vnc_port, 'token' : token, 'password' : vnc_ticket}, 200 return { 'host': app.config['VNC_HOST'], - 'port': 8081, + 'port': app.config['VNC_PORT'], 'token': token, 'password': vnc_ticket, }, 200