Compare commits

...

5 Commits

5 changed files with 9 additions and 30 deletions

View File

@@ -38,7 +38,7 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.routers.semaphore.entrypoints=web"
- "traefik.http.routers.semaphore.rule=Host(`semaphore.lan`)"
- "traefik.http.routers.semaphore.rule=Host(`ansible.lan`)"
- "traefik.http.routers.semaphore.service=semaphore"
- "traefik.http.services.semaphore.loadbalancer.server.port=3000"
- "com.centurylinklabs.watchtower.monitor-only=true"

View File

@@ -2,6 +2,7 @@ networks:
proxy:
external: false
name: proxy
enable_ipv6: true
volumes:
letsencrypt:
@@ -11,7 +12,7 @@ volumes:
services:
traefik:
image: traefik:v2.11
image: traefik:v3
container_name: traefik
restart: unless-stopped
command:
@@ -20,7 +21,6 @@ services:
- --providers.docker=true
- --providers.docker.network=proxy
- --providers.docker.exposedByDefault=false
- --providers.docker.swarmMode=false
- --entryPoints.web.address=:80
- --entryPoints.websecure.address=:443
- --entryPoints.ssh.address=:222/tcp

View File

@@ -42,15 +42,14 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.routers.git.entrypoints=web"
- "traefik.http.routers.git.rule=Host(`cs-git.ddnss.de`)"
- "traefik.http.routers.git.rule=Host(`gitea.fam-steinle.de`)"
- "traefik.http.routers.git.middlewares=git"
- "traefik.http.middlewares.git.redirectscheme.scheme=https"
- "traefik.http.routers.git-secure.entrypoints=websecure"
- "traefik.http.routers.git-secure.rule=Host(`cs-git.ddnss.de`)"
- "traefik.http.routers.git-secure.rule=Host(`gitea.fam-steinle.de`)"
- "traefik.http.routers.git-secure.service=git-secure"
- "traefik.http.routers.git-secure.tls=true"
- "traefik.http.routers.git-secure.tls.certresolver=myresolver"
- "traefik.http.routers.git-secure.tls.domains[0].main=cs-git.ddnss.de"
- "traefik.http.services.git-secure.loadbalancer.server.port=3000"
- "traefik.tcp.routers.git-ssh.entrypoints=ssh"
- "traefik.tcp.routers.git-ssh.rule=HostSNI(`*`)"
@@ -82,7 +81,5 @@ services:
- gitea-runner:/data
- /var/run/docker.sock:/var/run/docker.sock
environment:
- GITEA_INSTANCE_URL=https://cs-git.ddnss.de
- GITEA_RUNNER_REGISTRATION_TOKEN=HrObSjviNcpHt8cEnjgxHK5ctLMSYlDPWSCmvVzs
networks:
- gitea
- GITEA_INSTANCE_URL=https://gitea.fam-steinle.de
- GITEA_RUNNER_REGISTRATION_TOKEN=FQDt05qG37BLO0OBl6eX94aNNVE9Ni5nFdeVFoKm

View File

@@ -28,21 +28,6 @@ services:
- "traefik.http.routers.prometheus.service=prometheus"
- "traefik.http.services.prometheus.loadbalancer.server.port=9090"
speedtest:
image: cs-git.ddnss.de/home/speedtest-web
container_name: speedtest-web
restart: unless-stopped
volumes:
- /media/backup/speedtest.csv:/var/www/html/speedtest.csv
networks:
- proxy
labels:
- "traefik.enable=true"
- "traefik.http.routers.speedtest.rule=Host(`speedtest.fam-steinle.de`)"
- "traefik.http.routers.speedtest.entrypoints=web"
- "traefik.http.routers.speedtest.service=speedtest"
- "traefik.http.services.speedtest.loadbalancer.server.port=8080"
cadvisor:
image: gcr.io/cadvisor/cadvisor:v0.51.0
container_name: cadvisor
@@ -117,7 +102,4 @@ services:
WATCHTOWER_REMOVE_VOLUMES: true
WATCHTOWER_WARN_ON_HEAD_FAILURE: "never"
WATCHTOWER_SCHEDULE: "0 20 4 * * *"
WATCHTOWER_NOTIFICATIONS: "shoutrrr"
WATCHTOWER_NOTIFICATION_URL: "mattermost://watchtower@cs-mm.ddnss.de/og4ckuqet7fafb8kjuaigzuh7c"
WATCHTOWER_NOTIFICATION_TEMPLATE: "{{range .}} Minisforum - {{.Time.Format \"2006-01-02 15:04:05\"}} ({{.Level}}): {{.Message}}{{println}}{{end}}"

View File

@@ -18,11 +18,11 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.routers.vault.entrypoints=web"
- "traefik.http.routers.vault.rule=Host(`cs-vault.ddnss.de`)"
- "traefik.http.routers.vault.rule=Host(`vault.fam-steinle.de`)"
- "traefik.http.routers.vault.middlewares=vault"
- "traefik.http.middlewares.vault.redirectscheme.scheme=https"
- "traefik.http.routers.vault-secure.entrypoints=websecure"
- "traefik.http.routers.vault-secure.rule=Host(`cs-vault.ddnss.de`)"
- "traefik.http.routers.vault-secure.rule=Host(`vault.fam-steinle.de`)"
- "traefik.http.routers.vault-secure.service=vault-secure"
- "traefik.http.routers.vault-secure.tls=true"
- "traefik.http.routers.vault-secure.tls.certresolver=myresolver"