external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

add proxmox vnc command, check if targets file exists before retrieving entries

Browse source
This commit is contained in:
Jordan Rodgers 2018-02-12 21:25:06 -05:00
parent 58863732af
commit 3b1740c641
4 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
proxstar/__init__.py
View file

@ -33,7 +33,8 @@ app.config["GIT_REVISION"] = subprocess.check_output(
with open('proxmox_ssh_key', 'w') as key:
key.write(app.config['PROXMOX_SSH_KEY'])
start_websockify(app.config['WEBSOCKIFY_PATH'], app.config['WEBSOCKIFY_TARGET_FILE'])
start_websockify(app.config['WEBSOCKIFY_PATH'],
app.config['WEBSOCKIFY_TARGET_FILE'])
ssh_tunnels = []
@ -196,6 +197,7 @@ def vm_console(vmid):
rtp = 'rtp' in session['userinfo']['groups']
proxmox = connect_proxmox()
if rtp or int(vmid) in get_user_allowed_vms(proxmox, db, user):
start_vm_vnc(proxmox, vmid)
port = str(5900 + int(vmid))
token = add_vnc_target(port)
node = "{}.csh.rit.edu".format(get_vm_node(proxmox, vmid))
@ -464,6 +466,5 @@ def exit_handler():
atexit.register(exit_handler)
if __name__ == "__main__":
app.run()