Merge branch 'develop'

.github/workflows/deploy.yml

@@ -390,6 +390,9 @@ jobs:
       GF_SECURITY_ADMIN_USER: ${{ secrets.GF_SECURITY_ADMIN_USER }}
       GF_SECURITY_ADMIN_PASSWORD: ${{ secrets.GF_SECURITY_ADMIN_PASSWORD }}
       GF_SERVER_SERVE_FROM_SUB_PATH: false
+      GF_SERVER_DOMAIN: cyt.is-cool.dev
+      GF_SERVER_HTTP_PORT: 443
+      GF_SERVER_PROTOCOL: https
 
   docker-push-prometheus:
     name: Push prometheus service Docker Image to GitHub Packages

docker-compose.yml

@@ -227,6 +227,9 @@ services:
       - GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER:-admin}
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-changeme}
       - GF_SERVER_SERVE_FROM_SUB_PATH=${GF_SERVER_SERVE_FROM_SUB_PATH:-true}
+      - GF_SERVER_DOMAIN=${GF_SERVER_DOMAIN:-}
+      - GF_SERVER_HTTP_PORT=${GF_SERVER_HTTP_PORT:-}
+      - GF_SERVER_PROTOCOL=${GF_PROTOCOL:-}
     ports:
       - "9091:9091"
     depends_on: 

proxy/default.conf

@@ -11,11 +11,6 @@ server {
     ssl_certificate_key /etc/nginx/ssl/private.key;
     ssl_trusted_certificate /etc/nginx/ssl/ca_bundle.crt;
 
-    location / {
-        proxy_pass http://webapp:3000;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
     location /api/ {
         proxy_pass http://gatewayservice:8000/;
         proxy_set_header X-Forwarded-Proto $scheme;
@@ -35,4 +30,9 @@ server {
     location /robots.txt {
         alias /usr/share/nginx/html/robots.txt;
     }
+
+    location / {
+        proxy_pass http://webapp:3000;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
 }

webapp/src/locals/en.json

@@ -124,7 +124,7 @@
     "social_tooltip_delete": "Delete friend",
     "social_tooltip_profile": "View profile",
     "social_tooltip_back": "Back",
-    "social_tooltip_add": "Add friends",
+    "social_add": "Add friends",
     "social_empty_jordi": "Oops, this seems empty ...",
     "social_deletemodal_title": "Remove friend",
     "social_deletemodal_text": "Are you sure you want to remove % from your friend list?",