From 765ec54ef6701bf84cecd9347f27408fa05495b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ellensohn?= <bjoern.ellensohn@gmail.com>
Date: Wed, 20 Mar 2024 12:01:11 +0100
Subject: [PATCH] changes to caddy

---
 config/caddy/Caddyfile             |  50 ++++++++++++++++++++-------
 config/npm/database.sqlite         | Bin 106496 -> 106496 bytes
 config/npm/nginx/proxy_host/3.conf |   1 -
 docker-compose.yaml                |  52 ++++++++++++++++++-----------
 4 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/config/caddy/Caddyfile b/config/caddy/Caddyfile
index 827b802..ef88462 100644
--- a/config/caddy/Caddyfile
+++ b/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 {
-	root * /usr/share/caddy
-	file_server browse
-}
-
-http://config.loki {
-	reverse_proxy olivetin:1337
-}
-
-http://control.loki {
-	reverse_proxy foxglove:8080
-}
+# http://loki/config {
+# 	handle_path /config* {
+# 		rewrite * /
+# 		reverse_proxy olivetin:1337
+# 	}
+# }
diff --git a/config/npm/database.sqlite b/config/npm/database.sqlite
index 77b2214fb8f1783afaf299b6c9fc2aa0c68408e4..09a55a77107cdd46aa583ed30fb166c22cac0ce7 100644
GIT binary patch
delta 765
zcmaiyO=}ZD7{@bqO*h8W6pTgM*l|Ft(73zVfOYLbi0H*i58kpN4!e_Na5J;rOteyh
zwN+FQt5{qt74+7NpyW{SV!=<~QM`z^-uwv8Zd<4&=$vMr*WdG>XK^dJxRrb{3T9r8
zmBGxXTLmqvWCjPu0q(d|)I8qE_1<a?|EQAQP8>6ayv#;=yEmNup1!#}t(;7lW=hSE
z12sCCWumIN)Y5>e7WHDOpqquF4h`Khi<Yh*FqxKdp@KYqo1&`69qcuETg<+C|K;-i
zI`-OR60rtl^EDC#$lAGEutHiSXjGw%TG+P{bZI~wLGKVq+mLYqvFGu-#Dz@~NE?Hi
ziv`x=N}3<=`FpjfjaEAEa8|d>DVxPU3r26+=mc2MGH0+(Jpwf%oZZ|wDo%oev<0kV
z8Q|Isb(=!?l?CKu(UhFpP8}5HFM*M;ybjKWWDT4<)UEb5KG?s84lApP%-8gf)bqhB
z%Bs|HNxA;0kUJ9Tcp8j8b^55(#}toJh(=L5z8sOb3y8YND!qOHa>ie>qe;}_F0E7I
z);N=h2g=E>F~aN=I1}DjlgK|GgR#w71DpcG{~HQ)!*44<yZZ3j@jd=0BYmp(G411b
z0uu9wbJJiVZXauR!sRVYS&iWqX(MZIQ$mS05q?|;7xU552+CRH{RgVbJ-Hu(vhbY+
Ra+3M?Gw^wH<qeoi{s9(i<(U8g

delta 84
zcmZoTz}9epZGtqT>qHr6M%RrAy7~glyzI>KjESWwnI-W#`RT%&=jx{ya53|)VBk08
o%i&$ISx{gW@8%V2V;*rabM`Ut9_GHy*#{JC;N0Ffld*^m05GE(BLDyZ

diff --git a/config/npm/nginx/proxy_host/3.conf b/config/npm/nginx/proxy_host/3.conf
index 0dbb4cc..f6a7346 100644
--- a/config/npm/nginx/proxy_host/3.conf
+++ b/config/npm/nginx/proxy_host/3.conf
@@ -56,4 +56,3 @@ listen [::]:80;
   # Custom
   include /data/nginx/custom/server_proxy[.]conf;
 }
-
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6595f2b..2dcc6cc 100644
--- a/docker-compose.yaml
+++ b/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
-  #   #user "bjoern.ellensohn@unileoben.ac.at" 
-  #   #password "cpsloki_npm"
-  #   image: 'jc21/nginx-proxy-manager:latest'
-  #   restart: unless-stopped
-  #   ports:
-  #     - '80:80'
-  #     - '81:81'
-  #     - '443:443'
-  #   extra_hosts:
-  #   - "host.docker.internal:host-gateway"
-  #   #network_mode: host
-  #   volumes:
-  #     - ./config/npm:/data
-  #     - ./config/npm/letsencrypt:/etc/letsencrypt
-  #   depends_on:
-  #     - foxglove
-  #     - olivetin
+  npm: # nginx proxy manager for reverse proxying the webservices
+    #user "bjoern.ellensohn@unileoben.ac.at" cpsAdmin@unileoben.ac.at
+    #password "cpsloki_npm"
+    image: 'jc21/nginx-proxy-manager:latest'
+    restart: unless-stopped
+    networks:
+      - caddy_network
+    ports:
+      - '80:80'
+      - '81:81'
+      - '443:443'
+    extra_hosts:
+    - "host.docker.internal:host-gateway"
+    #network_mode: host
+    volumes:
+      - npm-data:/data
+      - npm-letsencrypt:/etc/letsencrypt
+    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:
\ No newline at end of file
+  portainer_data:
+  npm-data:
+  npm-letsencrypt:
\ No newline at end of file