Update environment variables

Author: malte-hansen

.env-prod renamed to .env.production

@@ -9,7 +9,7 @@ VITE_VSCODE_SERV_URL=change-vscode-url
 
 VITE_AUTH_DISABLED_ACCESS_TOKEN=SPECIAL_TOKEN
 VITE_AUTH_DISABLED_PROFILE_NAME=Jessy Doe
-VITE_AUTH_DISABLED_NICKNAME=Jessy
+VITE_AUTH_DISABLED_NICKNAME=change-nickname
 VITE_AUTH_DISABLED_SUB=9000
 
 VITE_ONLY_SHOW_TOKEN=change-token

default.conf.template

@@ -4,19 +4,19 @@ server {
   # BEGIN User-Service
 
   location /user {
-    proxy_pass ${NGINX_COLLAB_SERV_URL};
+    proxy_pass ${USER_URL};
     proxy_http_version 1.1;
     proxy_set_header Host $host;
   }
 
   location /token {
-    proxy_pass ${NGINX_COLLAB_SERV_URL};
+    proxy_pass ${USER_URL};
     proxy_http_version 1.1;
     proxy_set_header Host $host;
   }
 
   location /snapshot {
-    proxy_pass ${NGINX_COLLAB_SERV_URL};
+    proxy_pass ${USER_URL};
     proxy_http_version 1.1;
     proxy_set_header Host $host;
   }
@@ -26,19 +26,19 @@ server {
   # BEGIN Dynamic-Data
 
   location ~* /v2/landscapes/[0-9a-z-]+/structure {
-    proxy_pass ${NGINX_SPAN_SERV_URL};
+    proxy_pass ${LANDSCAPE_URL};
     proxy_http_version 1.1;
     proxy_set_header Host $host;
   }
 
   location ~* /v2/landscapes/[0-9a-z-]+/dynamic {
-    proxy_pass ${NGINX_SPAN_SERV_URL};
+    proxy_pass ${TRACE_URL};
     proxy_http_version 1.1;
     proxy_set_header Host $host;
   }
 
   location ~* /v2/landscapes/[0-9a-z-]+/timestamps {
-    proxy_pass ${NGINX_SPAN_SERV_URL};
+    proxy_pass ${TIMESTAMPS_URL};
     proxy_http_version 1.1;
     proxy_set_header Host $host;
   }
@@ -48,7 +48,7 @@ server {
   # BEGIN Static-Data
 
   location /v2/code {
-    proxy_pass ${NGINX_CODE_SERV_URL};
+    proxy_pass ${CODE_SERV_URL};
     proxy_http_version 1.1;
     proxy_set_header Host $host;
   }
@@ -58,14 +58,14 @@ server {
   # BEGIN Collab
 
   location /room {
-    proxy_pass ${NGINX_COLLAB_SERV_URL};
+    proxy_pass ${COLLABORATION_URL};
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
   }
 
   location /socket.io {
-    proxy_pass ${NGINX_COLLAB_SERV_URL};
+    proxy_pass ${COLLABORATION_URL};
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
@@ -79,7 +79,7 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $host;
 
-    proxy_pass ${NGINX_VSCODE_SERV_URL};
+    proxy_pass ${VSCODE_SERV_URL};
 
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;

variable-substitute.sh

@@ -1,22 +1,23 @@
 #!/bin/sh
 set -eu
 
-sed -i "s#change-code-url#$FRONTEND_HOST_URL#g" /usr/share/nginx/html/index.html
+echo "FRONTEND_HOST_URL: $FRONTEND_HOST_URL"
 
-sed -i "s#change-span-url#$FRONTEND_HOST_URL#g" /usr/share/nginx/html/index.html
+find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|change-code-url|$FRONTEND_HOST_URL|g" '{}' +
 
-sed -i "s#change-user-url#$FRONTEND_HOST_URL#g" /usr/share/nginx/html/index.html
+find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|change-vscode-url|$FRONTEND_HOST_URL|g" '{}' +
 
-sed -i "s#change-vscode-url#$FRONTEND_HOST_URL#g" /usr/share/nginx/html/index.html
+find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|change-user-url|$FRONTEND_HOST_URL|g" '{}' +
 
-sed -i "s#change-collaboration-url#$FRONTEND_HOST_URL#g" /usr/share/nginx/html/index.html
+find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|change-collaboration-url|$FRONTEND_HOST_URL|g" '{}' +
 
-sed -i "s#change-frontend-host-name#$FRONTEND_HOST_NAME#g" /usr/share/nginx/html/index.html
+find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|change-span-url|$FRONTEND_HOST_URL|g" '{}' +
 
-DEFAULT_NICKNAME="${NO_AUTH_USER_NICKNAME:-Jessy}"
-sed -i "s#Jessy#$DEFAULT_NICKNAME#g" /usr/share/nginx/html/index.html
+DEFAULT_NICKNAME="${VITE_AUTH_DISABLED_NICKNAME:-Jessy}"
+find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|change-nickname|$FRONTEND_HOST_URL|g" '{}' +
+sed -i "s#change-nickname#$DEFAULT_NICKNAME#g" /usr/share/nginx/html/index.html
 
 DEFAULT_TOKEN="${ONLY_SHOW_TOKEN:-}"
-sed -i "s#change-token#$DEFAULT_TOKEN#g" /usr/share/nginx/html/index.html
+find /usr/share/nginx/html -type f \( -name '*.js' -o -name '*.css' \) -exec sed -i "s|change-token|$DEFAULT_TOKEN|g" '{}' +
 
 exec "$@"