changes to caddy

config/caddy/Caddyfile

@@ -1,17 +1,43 @@
+# http://loki {
+# 	root * /usr/share/caddy
+# 	file_server browse
+# }
+
+# http://loki/config {
+# 	reverse_proxy /config/* foxglove:8080
+# }
+
+# http://browse.loki {
+# 	root * /usr/share/caddy
+# 	file_server browse
+# }
+
+# http://config.loki {
+# 	reverse_proxy localhost:1337
+# }
+
+# http://control.loki {
+# 	reverse_proxy foxglove:8080
+# }
+
 http://loki {
 	root * /usr/share/caddy
 	file_server browse
+
+	handle_path /config* {
+		#rewrite * /
+		reverse_proxy olivetin:1337
+	}
+
+	handle_path /viz* {
+		#rewrite * /
+		reverse_proxy foxglove:8080
+	}
 }
 
-http://browse.loki {
+# http://loki/config {
-	root * /usr/share/caddy
+# 	handle_path /config* {
-	file_server browse
+# 		rewrite * /
-}
+# 		reverse_proxy olivetin:1337
-
+# 	}
-http://config.loki {
+# }
-	reverse_proxy olivetin:1337
-}
-
-http://control.loki {
-	reverse_proxy foxglove:8080
-}

config/npm/nginx/proxy_host/3.conf

@@ -56,4 +56,3 @@ listen [::]:80;
   # Custom
   include /data/nginx/custom/server_proxy[.]conf;
 }
-

docker-compose.yaml

@@ -162,6 +162,8 @@ services:
       
       # - /var/lib/docker:/var/lib/docker
       - ~/.ssh/id_rsa:/root/.ssh/id_rsa
+    networks:
+      - caddy_network
     ports:
       - "1337:1337"
     restart: unless-stopped
@@ -225,6 +227,8 @@ services:
     image: ghcr.io/foxglove/studio:latest
     depends_on:
       - foxglove_bridge
+    networks:
+      - caddy_network
     ports:
       - 8080:8080
     volumes:
@@ -245,27 +249,31 @@ services:
 # Core Services for Web Management                                                                                             #
 ################################################################################################################################
 
-  # npm: # nginx proxy manager for reverse proxying the webservices
+  npm: # nginx proxy manager for reverse proxying the webservices
-  #   #user "bjoern.ellensohn@unileoben.ac.at" 
+    #user "bjoern.ellensohn@unileoben.ac.at" cpsAdmin@unileoben.ac.at
-  #   #password "cpsloki_npm"
+    #password "cpsloki_npm"
-  #   image: 'jc21/nginx-proxy-manager:latest'
+    image: 'jc21/nginx-proxy-manager:latest'
-  #   restart: unless-stopped
+    restart: unless-stopped
-  #   ports:
+    networks:
-  #     - '80:80'
+      - caddy_network
-  #     - '81:81'
+    ports:
-  #     - '443:443'
+      - '80:80'
-  #   extra_hosts:
+      - '81:81'
-  #   - "host.docker.internal:host-gateway"
+      - '443:443'
-  #   #network_mode: host
+    extra_hosts:
-  #   volumes:
+    - "host.docker.internal:host-gateway"
-  #     - ./config/npm:/data
+    #network_mode: host
-  #     - ./config/npm/letsencrypt:/etc/letsencrypt
+    volumes:
-  #   depends_on:
+      - npm-data:/data
-  #     - foxglove
+      - npm-letsencrypt:/etc/letsencrypt
-  #     - olivetin
+    depends_on:
+      - foxglove
+      - olivetin
 
   caddy:
     image: caddy:latest
+    networks:
+      - caddy_network
     ports:
       - "80:80"
       - "443:443"
@@ -280,6 +288,10 @@ services:
 ################################################################################################################################
 # Docker related extra stuff                                                                                                   #
 ################################################################################################################################
-networks: {}
+networks:
+  caddy_network:
+    driver: bridge
 volumes: 
-  portainer_data:
+  portainer_data:
+  npm-data:
+  npm-letsencrypt: