From 0cb3248487e4ff15131e15dc7cf76848f25ee57d Mon Sep 17 00:00:00 2001
From: Tobias Stein <t.stein@dkfz-heidelberg.de>
Date: Tue, 6 Aug 2019 16:11:03 +0200
Subject: [PATCH] Set paths after handling dynamic prefix path

---
 image/startup.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/image/startup.sh b/image/startup.sh
index b609c1a..c05c6e4 100755
--- a/image/startup.sh
+++ b/image/startup.sh
@@ -59,15 +59,7 @@ if [ -n "$HTTP_PASSWORD" ]; then
 	sed -i 's|#_HTTP_PASSWORD_#||' /etc/nginx/sites-enabled/default
 fi
 
-# novnc websockify
-ln -s "/usr/local/lib/web/frontend$PREFIX_PATH/static/websockify" "/usr/local/lib/web/frontend$PREFIX_PATH/static/novnc/utils/websockify"
-chmod +x "/usr/local/lib/web/frontend$PREFIX_PATH/static/websockify/run"
-
-# clearup
-PASSWORD=
-HTTP_PASSWORD=
-
-#dynamic prefix path renaming
+# dynamic prefix path renaming
 if [ -n "$DYNAMIC_PREFIX_PATH" ]; then
     PREFIX_PATH="$DYNAMIC_PREFIX_PATH"
     echo "DYNAMIC_PREFIX_PATH: $PREFIX_PATH"
@@ -76,4 +68,12 @@ if [ -n "$DYNAMIC_PREFIX_PATH" ]; then
     cat /etc/nginx/sites-enabled/default
 fi
 
-exec /bin/tini -- /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
+# novnc websockify
+ln -s "/usr/local/lib/web/frontend$PREFIX_PATH/static/websockify" "/usr/local/lib/web/frontend$PREFIX_PATH/static/novnc/utils/websockify"
+chmod +x "/usr/local/lib/web/frontend$PREFIX_PATH/static/websockify/run"
+
+# clearup
+PASSWORD=+
+HTTP_PASSWORD=
+
+exec /bin/tini -- /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
\ No newline at end of file