mirror of
				https://github.com/ComputerScienceHouse/proxstar.git
				synced 2025-03-09 15:40:09 +00:00 
			
		
		
		
	Merge pull request #168 from ComputerScienceHouse/willnilges/websockify_port
Add env var to specify websockify container port
This commit is contained in:
		
						commit
						e545fb6526
					
				
					 2 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -62,6 +62,7 @@ WEBSOCKIFY_PATH = environ.get('PROXSTAR_WEBSOCKIFY_PATH', '/usr/local/bin/websoc
 | 
			
		|||
WEBSOCKIFY_TARGET_FILE = environ.get('PROXSTAR_WEBSOCKIFY_TARGET_FILE', '/opt/proxstar/targets')
 | 
			
		||||
VNC_HOST = environ.get('PROXSTAR_VNC_HOST', 'proxstar-vnc.csh.rit.edu')
 | 
			
		||||
VNC_PORT = environ.get('PROXSTAR_VNC_PORT', '443')
 | 
			
		||||
WEBSOCKIFY_PORT = environ.get('PROXSTAR_WEBSOCKIFY_PORT', '8081')
 | 
			
		||||
 | 
			
		||||
# SENTRY
 | 
			
		||||
# If you set the sentry dsn locally, make sure you use the local-dev or some
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,7 +16,7 @@ def start_websockify(websockify_path, target_file):
 | 
			
		|||
    result = subprocess.run(['pgrep', 'websockify'], stdout=subprocess.PIPE)
 | 
			
		||||
    if not result.stdout:
 | 
			
		||||
        print("Websockify is stopped. Starting websockify.")
 | 
			
		||||
        proxstar_port = app.config.get('VNC_PORT')
 | 
			
		||||
        proxstar_port = app.config.get('WEBSOCKIFY_PORT')
 | 
			
		||||
        subprocess.call(
 | 
			
		||||
            [
 | 
			
		||||
                websockify_path,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue