Merge branch 'xenial' into 'master'

Xenial update See merge request !1

Merge branch 'xenial' into 'master'
Xenial update See merge request !1
903fafbd · Czémán Arnold · 2d3cb394 · 74397bb3 · 903fafbd · 903fafbd
Commit 903fafbd authored Jul 04, 2018 by Czémán Arnold
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

miscellaneous/vncproxy.service
+1 -1

requirements/base.txt
+1 -1

No files found.
--- a/miscellaneous/vncproxy.service
+++ b/miscellaneous/vncproxy.service
@@ -6,7 +6,7 @@ After=network.target
 User=cloud
 Group=cloud
 WorkingDirectory=/home/cloud/vncproxy
-ExecStart=/bin/bash -c "source /etc/profile; workon vncproxy; exec python proxy.py"
+ExecStart=/bin/bash -c "source /home/cloud/.virtualenvs/vncproxy/bin/activate; source /home/cloud/.virtualenvs/vncproxy/bin/postactivate; exec python proxy.py"
 Restart=always
 [Install]

--- a/requirements/base.txt
+++ b/requirements/base.txt
 cryptography==2.0
 Django==1.5.4
 Twisted==13.1.0
-pyOpenSSL==0.14
+pyOpenSSL==18.0.0