treafik -> caddy

proxy/caddy/Caddyfile

@@ -0,0 +1,91 @@
+{
+#  acme_ca https://acme-v02.api.letsencrypt.org/directory	
+  email {env.EMAIL}
+  log {
+    format console
+  }
+}
+
+*.{$DOMAIN} {
+  tls {
+    dns netcup {
+      customer_number {env.NETCUP_CUSTOMER_NUMBER}
+      api_key {env.NETCUP_API_KEY}
+      api_password {env.NETCUP_API_PASSWORD}
+    }
+    propagation_timeout 900s
+    propagation_delay 600s
+    resolvers 46.38.225.230 46.38.252.230
+  }
+  # header Strict-Transport-Security "max-age=63072000"
+
+  @git host git.{$DOMAIN}
+  handle @git {
+    reverse_proxy forgejo:3000
+  }
+
+  @news host news.{$DOMAIN}
+  handle @news {
+    reverse_proxy miniflux:8080
+  }
+
+  @nc-push expression `(host('cloud.{$DOMAIN}') && path('/push/*'))`
+  handle @nc-push {
+    reverse_proxy push:7867
+  }
+
+  @nextcloud host cloud.{$DOMAIN}
+  handle @nextcloud {
+    reverse_proxy webserver-nextcloud:80
+  }
+
+  @office host office.{$DOMAIN}
+  handle @office {
+    reverse_proxy collabora:9980
+  }
+
+  @drawio host drawio.{$DOMAIN}
+  handle @drawio {
+    reverse_proxy drawio:8080
+  }
+
+  @whoami host whoami.{$DOMAIN}
+  handle @whoami {
+    reverse_proxy whoami:80
+  }
+
+  @push host push.{$DOMAIN}
+  handle @push {
+    reverse_proxy ntfy:80
+  }
+
+  @wallabag host wallabag.{$DOMAIN}
+  handle @wallabag {
+    reverse_proxy wallabag:80
+  }
+
+  @www host www.{$DOMAIN}
+  handle @www {
+    reverse_proxy webserver-www:80
+  }
+
+  @mail host mail.{$DOMAIN}
+  handle @mail {
+    reverse_proxy nginx-mailcow:8090
+  }
+
+  # Fallback for otherwise unhandled domains
+  handle {
+    respond 404
+  }
+}
+
+{$DOMAIN} {
+  redir https://www.{$DOMAIN}{uri}
+}
+
+
+
+
+
+

proxy/caddy/Dockerfile

@@ -0,0 +1,7 @@
+FROM caddy:2-builder AS builder
+
+RUN xcaddy build --with github.com/caddy-dns/netcup
+
+FROM caddy:2
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy

proxy/docker-compose.yaml

@@ -1,98 +1,33 @@
 services:
 
-  traefik:
-    image: traefik:${TRAEFIK_VERSION}
+  caddy:
+    image: florianzirker.de/caddy-netcup
+    build: ./caddy
+    networks:
+      - web
     restart: unless-stopped
-    environment:
-      - NETCUP_ENDPOINT=${NETCUP_ENDPOINT}
-      - NETCUP_CUSTOMER_NUMBER=${NETCUP_CUSTOMER_NUMBER}
-      - NETCUP_API_KEY=${NETCUP_API_KEY}
-      - NETCUP_API_PASSWORD=${NETCUP_API_PASSWORD}
-    command:
-      - "--api.insecure=false"
-      - "--api.dashboard=true"
-      - "--providers.docker=true"
-      - "--providers.docker.exposedbydefault=false"
-      - "--providers.docker.network=web"
-      - "--providers.docker.endpoint=tcp://docker-socket-proxy:2375"
-      #- "--log.level=DEBUG"
-      - "--log.level=INFO"
-      #- "--accesslog=true"
-      - "--ping=true"
-      - "--entrypoints.web.address=:80"
-      - "--entrypoints.web.http.redirections.entrypoint.to=websecure"
-      - "--entrypoints.web.http.redirections.entrypoint.scheme=https"
-      - "--entrypoints.websecure.address=:443"
-      - "--providers.file.filename=/etc/traefik/tls.toml"
-      - "--certificatesresolvers.netcup.acme.dnschallenge=true"
-      - "--certificatesresolvers.netcup.acme.dnsChallenge.provider=netcup"
-      - "--certificatesresolvers.netcup.acme.dnsChallenge.resolvers=46.38.225.230:53,46.38.252.230:53"
-      - "--certificatesresolvers.netcup.acme.dnschallenge.delayBeforeCheck=900"
-      - "--certificatesresolvers.netcup.acme.email=${LETSENCRYPT_MAIL}"
-      - "--certificatesresolvers.netcup.acme.storage=/letsencrypt/acme.json"
-      - "--metrics.prometheus=true"
-      - "--metrics.prometheus.addEntryPointsLabels=true"
-      - "--metrics.prometheus.addRoutersLabels=true"
-      - "--metrics.prometheus.addServicesLabels=true"
     ports:
       - "80:80"
       - "443:443"
+      - "443:443/udp"
+    volumes:
+      -  $PWD/caddy/Caddyfile:/etc/caddy/Caddyfile
+      -  ${STORAGE_PATH}/caddy/data:/data
+      -  ${STORAGE_PATH}/caddy/config:/config
+    environment:
+      - NETCUP_CUSTOMER_NUMBER=${NETCUP_CUSTOMER_NUMBER}
+      - NETCUP_API_KEY=${NETCUP_API_KEY}
+      - NETCUP_API_PASSWORD=${NETCUP_API_PASSWORD}
+      - EMAIL=${LETSENCRYPT_MAIL}
+      - DOMAIN=${DOMAIN}
+
+  whoami:
+    image: traefik/whoami
     networks:
       - web
-      - dockersocket
-    volumes:
-      - ${STORAGE_PATH}/letsencrypt:/letsencrypt
-      - $PWD/tls.toml:/etc/traefik/tls.toml
-    healthcheck:
-      test: traefik healthcheck --ping
-      interval: 3s
-      timeout: 1s
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.dashboard.rule=Host(`${FQDN_TRAEFIK}`)"
-      - "traefik.http.routers.dashboard.service=api@internal"
-      - "traefik.http.routers.dashboard.entrypoints=websecure"
-      - "traefik.http.routers.dashboard.tls.certresolver=netcup"
-      - "traefik.http.routers.dashboard.tls.domains[0].main=${DOMAIN}"
-      - "traefik.http.routers.dashboard.tls.domains[0].sans=*.${DOMAIN}"
-      - "traefik.http.routers.dashboard.tls.options=intermediate@file"
-      - "traefik.http.routers.dashboard.middlewares=auth"
-      - "traefik.http.middlewares.auth.basicauth.users=${HTPASSWD}"
       - "docker.group=proxy"
-
-
-  docker-socket-proxy:
-    image: tecnativa/docker-socket-proxy
     restart: unless-stopped
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      # grant privileges as environment variables: https://github.com/Tecnativa/docker-socket-proxy#grant-or-revoke-access-to-certain-api-sections
-      - LOG_LEVEL=warning
-      - CONTAINERS=1
-      - INFO=1
-    networks:
-      - dockersocket
-    healthcheck:
-      test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost:2375/version"]
-      interval: 10s
-      timeout: 3s
-    privileged: true
-    labels:
-      - "docker.group=proxy"
-
-
-#  whoami:
-#    image: traefik/whoami
-#    networks:
-#      - web
-#    labels:
-#      - "traefik.enable=true"
-#      - "traefik.http.routers.whoami.rule=Host(`${FQDN_WHOAMI}`)"
-#      - "traefik.http.routers.whoami.entrypoints=websecure"
-#      - "traefik.http.routers.whoami.tls.certresolver=netcup"
-#      - "docker.group=proxy"
-#    restart: unless-stopped
 
 
 networks:

proxy/tls.toml

@@ -1,14 +0,0 @@
-# generated 2020-12-09, Mozilla Guideline v5.6, Traefik 2.3, intermediate configuration
-# https://ssl-config.mozilla.org/#server=traefik&version=2.3&config=intermediate&guideline=5.6
-
-[tls.options]
-  [tls.options.intermediate]
-    minVersion = "VersionTLS12"
-    cipherSuites = [
-      "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
-      "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-      "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
-      "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-      "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
-      "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305"
-    ]