Improve restart en failure

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

Makefile

@@ -13,7 +13,7 @@
 
 DOCKER := docker
 
-PROFILES := caddy wordpress adminer uptime-kuma qbittorrent gitea jellyfin watchtower backup openssh dns-server syncthing
+PROFILES := caddy wordpress gitea adminer uptime-kuma qbittorrent 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 console
+		format json
 	}
 }
 
-import bensuperpc.org/Caddyfile
+import bensuperpc.org/*
-import bensuperpc.com/Caddyfile
+import bensuperpc.com/*
-import bensuperpc.net/Caddyfile
+import bensuperpc.net/*
-import bensuperpc.ovh/Caddyfile
+import bensuperpc.ovh/*
-import bensuperpc.fr/Caddyfile
+import bensuperpc.fr/*

caddy/bensuperpc.net/Caddyfile

@@ -5,3 +5,15 @@ 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
+}

caddy/bensuperpc.org/Caddyfile

@@ -69,10 +69,6 @@ syncthing.bensuperpc.org {
 	}
 }
 
-dns.bensuperpc.org {
-	reverse_proxy dns-server:5380
-}
-
 link.bensuperpc.org {
 	# TODO: Use service with database
 	# Friendly links

docker-compose.adminer.yml

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

docker-compose.backup.yml

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

docker-compose.caddy.yml

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

docker-compose.dns.yml

@@ -1,23 +0,0 @@
-version: '3.9'
-
-services:
-  dns-server:
-    container_name: dns-server
-    hostname: dns-server
-    profiles:
-      - dns-server
-    image: technitium/dns-server:latest
-    restart: on-failure
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-    volumes:
-      - dns-config:/etc/dns
-    env_file:
-      - env/technitium.env
-
-volumes:
-  dns-config:
-    name: dns-config
-

docker-compose.gitea.yml

@@ -7,7 +7,7 @@ services:
     container_name: gitea
     profiles:
       - gitea
-    restart: on-failure
+    restart: on-failure:5
     depends_on:
       - caddy
     env_file:
@@ -31,7 +31,7 @@ services:
       - gitea
     depends_on:
       - gitea
-    restart: on-failure
+    restart: on-failure:5
     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
+    restart: on-failure:5
     depends_on:
       - caddy
     volumes:

docker-compose.openssh.yml

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

docker-compose.qbittorrent.yml

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

docker-compose.syncthing.yml

@@ -7,7 +7,7 @@ services:
     container_name: syncthing
     profiles:
       - syncthing
-    restart: on-failure
+    restart: on-failure:5
     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
+    restart: on-failure:5
     networks:
       - infra-network
     security_opt:

docker-compose.watchtower.yml

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

docker-compose.wordpress.yml

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

env/technitium.env

@@ -1,18 +0,0 @@
-DNS_SERVER_DOMAIN=dns-server
-DNS_SERVER_ADMIN_PASSWORD=fddsdfF548TjSNbi490fzZspmLSDf
-# DNS_SERVER_ADMIN_PASSWORD_FILE=password.txt
-# DNS_SERVER_PREFER_IPV6=false
-# DNS_SERVER_WEB_SERVICE_HTTP_PORT=5380
-# DNS_SERVER_WEB_SERVICE_HTTPS_PORT=53443
-# DNS_SERVER_WEB_SERVICE_ENABLE_HTTPS=true
-# DNS_SERVER_WEB_SERVICE_USE_SELF_SIGNED_CERT=false
-# DNS_SERVER_OPTIONAL_PROTOCOL_DNS_OVER_HTTP=true
-# DNS_SERVER_RECURSION=AllowOnlyForPrivateNetworks
-# DNS_SERVER_RECURSION_DENIED_NETWORKS=1.1.1.0/24
-# DNS_SERVER_RECURSION_ALLOWED_NETWORKS=127.0.0.1, 192.168.1.0/24
-# DNS_SERVER_ENABLE_BLOCKING=false
-# DNS_SERVER_ALLOW_TXT_BLOCKING_REPORT=false
-# DNS_SERVER_BLOCK_LIST_URLS=
-# DNS_SERVER_FORWARDERS=1.1.1.1, 8.8.8.8
-# DNS_SERVER_FORWARDER_PROTOCOL=Tcp
-# DNS_SERVER_LOG_USING_LOCAL_TIME=true