Makefile

@@ -13,7 +13,7 @@
 
 DOCKER := docker
 
-PROFILES := caddy wordpress gitea adminer uptime-kuma qbittorrent jellyfin watchtower backup syncthing openssh
+PROFILES := caddy wordpress adminer uptime-kuma qbittorrent gitea jellyfin watchtower backup syncthing openssh
 PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
 
 COMPOSE_FILES :=  $(shell find docker-compose*.yml | sed -e 's/^/--file /')

caddy/Caddyfile

@@ -4,12 +4,12 @@
 
 	log {
 		output file /data/logs/access.log
-		format json
+		format console
 	}
 }
 
-import bensuperpc.org/*
-import bensuperpc.com/*
-import bensuperpc.net/*
-import bensuperpc.ovh/*
-import bensuperpc.fr/*
+import bensuperpc.org/Caddyfile
+import bensuperpc.com/Caddyfile
+import bensuperpc.net/Caddyfile
+import bensuperpc.ovh/Caddyfile
+import bensuperpc.fr/Caddyfile

caddy/bensuperpc.net/Caddyfile

@@ -5,15 +5,3 @@ bensuperpc.net {
 www.bensuperpc.net {
 	redir https://www.bensuperpc.org{uri} permanent
 }
-
-git.bensuperpc.net {
-	redir https://git.bensuperpc.org{uri} permanent
-}
-
-jellyfin.bensuperpc.net {
-	redir https://jellyfin.bensuperpc.org{uri} permanent
-}
-
-uptimekuma.bensuperpc.net {
-	redir https://uptimekuma.bensuperpc.org{uri} permanent
-}

docker-compose.adminer.yml

@@ -7,7 +7,7 @@ services:
     container_name: adminer
     profiles:
       - adminer
-    restart: on-failure:5
+    restart: on-failure
     env_file: 
       - env/adminer.env
     depends_on:

docker-compose.backup.yml

@@ -7,7 +7,7 @@ services:
     container_name: backup
     profiles:
       - backup
-    restart: on-failure:5
+    restart: on-failure
     env_file:
       - env/backup.env
     volumes:

docker-compose.caddy.yml

@@ -7,7 +7,7 @@ services:
     container_name: caddy
     profiles:
       - caddy
-    restart: on-failure:5
+    restart: on-failure
     ports:
       - 80:80
       - 443:443
@@ -20,17 +20,19 @@ services:
       - infra-network
     env_file:
       - env/caddy.env
+    cap_add:
+      - NET_ADMIN
     security_opt:
       - no-new-privileges:true
-    cap_drop:
-      - ALL
-    cap_add:
-#      - CHOWN
-#      - FOWNER
-#      - DAC_OVERRIDE
-#      - SETGID
-#      - SETUID
-      - NET_BIND_SERVICE
+    #    cap_drop:
+    #      - ALL
+    #    cap_add:
+    #      - CHOWN
+    #      - FOWNER
+    #      - DAC_OVERRIDE
+    #      - SETGID
+    #      - SETUID
+    #      - NET_BIND_SERVICE
     healthcheck:
       test: pidof caddy || exit 1
       interval: 120s

docker-compose.gitea.yml

@@ -7,7 +7,7 @@ services:
     container_name: gitea
     profiles:
       - gitea
-    restart: on-failure:5
+    restart: on-failure
     depends_on:
       - caddy
     env_file:
@@ -31,7 +31,7 @@ services:
       - gitea
     depends_on:
       - gitea
-    restart: on-failure:5
+    restart: on-failure
     volumes:
       - gitea_db:/var/lib/mysql:rw
     env_file:

docker-compose.jellyfin.yml

@@ -7,7 +7,7 @@ services:
     container_name: jellyfin
     profiles:
       - jellyfin
-    restart: on-failure:5
+    restart: on-failure
     depends_on:
       - caddy
     volumes:

docker-compose.openssh.yml

@@ -7,7 +7,7 @@ services:
     container_name: openssh
     profiles:
       - openssh
-    restart: on-failure:5
+    restart: on-failure
     env_file:
       - env/openssh.env
     volumes:

docker-compose.qbittorrent.yml

@@ -7,7 +7,7 @@ services:
     container_name: qbittorrent
     profiles:
       - qbittorrent
-    restart: on-failure:5
+    restart: on-failure
     depends_on:
       - caddy
     env_file:

docker-compose.syncthing.yml

@@ -7,7 +7,7 @@ services:
     container_name: syncthing
     profiles:
       - syncthing
-    restart: on-failure:5
+    restart: on-failure
     env_file:
       - env/syncthing.env
     volumes:

docker-compose.uptime-kuma.yml

@@ -9,7 +9,7 @@ services:
       - uptime-kuma
     volumes:
       - uptimekuma_data:/app/data
-    restart: on-failure:5
+    restart: on-failure
     networks:
       - infra-network
     security_opt:

docker-compose.watchtower.yml

@@ -7,7 +7,7 @@ services:
     container_name: watchtower
     profiles:
       - watchtower
-    restart: on-failure:5
+    restart: on-failure
     networks:
       - infra-network
     volumes:

docker-compose.wordpress.yml

@@ -7,7 +7,7 @@ services:
     container_name: wordpress
     profiles:
       - wordpress
-    restart: on-failure:5
+    restart: on-failure
     depends_on:
       - wordpress_db
       - caddy
@@ -30,7 +30,7 @@ services:
       - wordpress
     depends_on:
       - caddy
-    restart: on-failure:5
+    restart: on-failure
     volumes:
       - wordpress_db:/var/lib/mysql:rw
     env_file: