update compose

caddy/Caddyfile

@@ -3,6 +3,11 @@
     metrics {
         per_host
     }
+    log {
+        output file /var/log/caddy/access.log
+        format json
+        level DEBUG
+    }
 }
 
 :2019 {
@@ -11,98 +16,56 @@
 
 ############## grafana ##############
 {$GRAFANA_DOMAIN} {
-    tls /etc/ssl/custom/{$GRAFANA_CRT} /etc/ssl/custom/{$GRAFANA_KEY}
-
     request_body {
         max_size 2048MB
     }
 
-    reverse_proxy http://grafana:3000 {
+    reverse_proxy http://grafana:3000
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
-        header_up -CF-*
-    }
 }
 
 ############## gitea ##############
 {$GITEA_DOMAIN} {
-    tls /etc/ssl/custom/{$GITEA_CRT} /etc/ssl/custom/{$GITEA_KEY}
-
     request_body {
         max_size 512MB
     }
 
-    reverse_proxy http://gitea:3000 {
+    reverse_proxy http://gitea:3000
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
-        header_up -CF-*
-    }
 }
 
 ############## slash ##############
 {$SLASH_DOMAIN} {
-    tls /etc/ssl/custom/{$SLASH_CRT} /etc/ssl/custom/{$SLASH_KEY}
-
     request_body {
         max_size 10MB
     }
 
-    reverse_proxy http://slash:5231 {
+    reverse_proxy http://slash:5231
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
-        header_up -CF-*
-    }
 }
 
 ############## memos ##############
 {$MEMOS_DOMAIN} {
-    tls /etc/ssl/custom/{$MEMOS_CRT} /etc/ssl/custom/{$MEMOS_KEY}
-
     request_body {
         max_size 1024MB
     }
 
-    reverse_proxy http://memos:5230 {
+    reverse_proxy http://memos:5230
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
-        header_up -CF-*
-    }
 }
 
 ############## wg-easy ##############
 {$WG_EASY_DOMAIN} {
-    tls /etc/ssl/custom/{$WG_EASY_CRT} /etc/ssl/custom/{$WG_EASY_KEY}
-
     request_body {
         max_size 10MB
     }
 
-    reverse_proxy http://wg-easy:51821 {
+    reverse_proxy http://wg-easy:51821
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
-        header_up -CF-*
-    }
 }
 
 ############## vaultwarden ##############
 {$VAULTWARDEN_DOMAIN} {
-    tls /etc/ssl/custom/{$VAULTWARDEN_CRT} /etc/ssl/custom/{$VAULTWARDEN_KEY}
-
     request_body {
         max_size 128MB
     }
 
-    reverse_proxy http://vaultwarden {
+    reverse_proxy http://vaultwarden
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
-        header_up -CF-*
-    }
 }
 
 ############## sftpgo ##############
@@ -111,81 +74,51 @@
         max_size 8120MB
     }
 
-    reverse_proxy http://sftpgo:8080 {
+    reverse_proxy http://sftpgo:8080
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
-        header_up -CF-*
-    }
 }
 
 ############## glance ##############
 {$GLANCE_DOMAIN} {
-    tls /etc/ssl/custom/{$GLANCE_CRT} /etc/ssl/custom/{$GLANCE_KEY}
-
     request_body {
         max_size 64MB
     }
 
-    reverse_proxy http://glance:8080 {
+    reverse_proxy http://glance:8080
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
-        header_up -CF-*
-    }
 }
 
 ############## ghost ##############
 {$GHOST_DOMAIN} {
-    tls /etc/ssl/custom/{$GHOST_CRT} /etc/ssl/custom/{$GHOST_KEY}
-
     request_body {
         max_size 124MB
     }
 
     reverse_proxy http://ghost:2368 {
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
         header_up X-Forwarded-Proto {http.request.scheme}
         header_up Host {http.request.host}
-        header_up -CF-*
     }
 }
 
 ############## immich ##############
 {$IMMICH_DOMAIN} {
-    tls /etc/ssl/custom/{$IMMICH_CRT} /etc/ssl/custom/{$IMMICH_KEY}
-
     request_body {
         max_size 1024MB
     }
 
     reverse_proxy http://immich_server:2283 {
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
         header_up X-Forwarded-Proto {http.request.scheme}
         header_up Host {http.request.host}
-        header_up -CF-*
     }
 }
 
 ############## uptime-kuma ##############
 {$UPTIME_KUMA_DOMAIN} {
-    tls /etc/ssl/custom/{$UPTIME_KUMA_CRT} /etc/ssl/custom/{$UPTIME_KUMA_KEY}
-
     request_body {
         max_size 1024MB
     }
 
     reverse_proxy http://uptime_kuma:3001 {
-        header_up X-Real-IP {http.request.header.Cf-Connecting-Ip}
-        header_up X-Forwarded-For {http.request.header.Cf-Connecting-Ip}
-        header_up X-Country-Code {http.request.header.Cf-Ipcountry}
         header_up X-Forwarded-Proto {http.request.scheme}
         header_up Host {http.request.host}
-        header_up -CF-*
     }
 }
 

caddy/docker-compose.yml

@@ -23,6 +23,7 @@ services:
       - ./ssl:/etc/ssl/custom/
       - ./data/data:/data
       - ./data/config:/config
+      - ./data/log:/var/log/caddy
       - ../private_volume:/private_volume
     env_file:
       - ./.env

memos/docker-compose.yml

@@ -7,6 +7,7 @@ networks:
 services:
   memos:
     image: neosmemo/memos:0.25
+    restart: unless-stopped
     container_name: memos
     labels:
       - "com.centurylinklabs.watchtower.enable=true"

prometheus/docker-compose.yml

@@ -5,10 +5,6 @@ networks:
     name: grafana
     driver: bridge
     external: true
-  caddy:
-    name: caddy
-    driver: bridge
-    external: true
 
 services:
   prometheus:
@@ -18,7 +14,6 @@ services:
     networks:
       - prometheus
       - grafana
-      - caddy
     command: "--config.file=/etc/prometheus/prometheus.yaml --storage.tsdb.retention.time=10d --storage.tsdb.retention.size=15GB"
     volumes:
       - ./data/config/prometheus.yaml:/etc/prometheus/prometheus.yaml:ro