umami debugging

docker-compose-deploy.yml

@@ -13,6 +13,8 @@ services:
     ports:
       - "8081:8081"
       - "8080:8080"
+    networks:
+      - app-network
     command: julia --project=. -e 'include("api.jl")' --color=yes --depwarn=no --project=@. --sysimage="pre-compilation/sysimage.so" -q -i -- $$(dirname $$0)/../bootstrap.jl -s=true "$$@"
 
   nginx:
@@ -23,6 +25,8 @@ services:
     ports:
       - "80:80"
       - "443:443"
+    networks:
+      - app-network
     volumes:
       - /etc/letsencrypt:/etc/letsencrypt
       - /usr/share/nginx/html/.well-known:/usr/share/nginx/html/.well-known
@@ -31,6 +35,8 @@ services:
   certbot:
     image: certbot/certbot
     container_name: certbot
+    networks:
+      - app-network
     volumes:
       - /etc/letsencrypt:/etc/letsencrypt
       - /usr/share/nginx/html/.well-known:/usr/share/nginx/html/.well-known
@@ -43,6 +49,8 @@ services:
     restart: always
     ports:
       - "8501:8501"
+    networks:
+      - app-network
     command: streamlit run app.py --global.disableWidgetStateDuplicationWarning true --server.port=8501
 
   umami:
@@ -55,6 +63,8 @@ services:
       HASH_SALT: ${HASH_SALT}
     ports:
       - "3000:3000"
+    networks:
+      - app-network
     depends_on:
       - umami-db
 
@@ -66,9 +76,15 @@ services:
       POSTGRES_USER: umami
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: umami
+    networks:
+      - app-network
     volumes:
       - umami_db_data:/var/lib/postgresql/data
 
 # Define volumes at the root level, outside of services
 volumes:
   umami_db_data:
+
+networks:
+  app-network:
+    driver: bridge

gui/app_pages/Home.py

@@ -16,7 +16,7 @@
 from app_scripts import app_view
 
 components.html(
-    '<script defer src="http://umami:3000/script.js" data-website-id="213d7c39-2f27-43d9-822e-7e0e855273db"></script>'
+    '<script defer src="https://app.batterymodel.com/umami/script.js" data-website-id="213d7c39-2f27-43d9-822e-7e0e855273db"></script>'
 )
 
 

nginx/project.conf

@@ -33,13 +33,13 @@ server {
 
     # Umami analytics application proxy
     location /umami/ {
-        rewrite /umami/(.*) /$1 break;
         proxy_pass http://umami:3000/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+        rewrite /umami/(.*) /$1 break;
     }
 
     # SSL configuration