From 266b8bdf6c85f31b4b6f787d4493d746d088b7a8 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sat, 15 Nov 2025 01:46:04 +0100 Subject: [PATCH] Comments cleanup&rewritten --- traefik/dynamic/dynamic.yml | 86 +++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 4cd2dfa..721710d 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -1,6 +1,6 @@ http: routers: - # Traefik Dashboard (локальный) + # Traefik Dashboard (ADMIN, local only) traefik-dashboard: rule: "Host(`traefik.workstation`)" entryPoints: @@ -11,27 +11,7 @@ http: - security-headers tls: {} - # Portainer (публичный) - portainer: - rule: "Host(`portainer.forust.xyz`)" - entryPoints: - - websecure - service: portainer - middlewares: - - security-headers - tls: {} - - # AdGuard Home (публичный) - adguard: - rule: "Host(`adguard.forust.xyz`)" - entryPoints: - - websecure - service: adguard - middlewares: - - security-headers - tls: {} - - # Nextcloud AIO Interface (локальный) + # Nextcloud AIO Interface (ADMIN, local is better) nextcloud-aio: rule: "Host(`nextcloud-aio.workstation`)" entryPoints: @@ -41,7 +21,28 @@ http: - security-headers tls: {} - # Nextcloud Main (публичный) + # Portainer (public (account required)) + portainer: + rule: "Host(`portainer.forust.xyz`)" + entryPoints: + - websecure + service: portainer + middlewares: + - security-headers + tls: {} + + # AdGuard Home (public (account required)) + adguard: + rule: "Host(`adguard.forust.xyz`)" + entryPoints: + - websecure + service: adguard + middlewares: + - security-headers + tls: {} + + + # Nextcloud Main (public (account required)) nextcloud: rule: "Host(`nextcloud.forust.xyz`)" entrypoints: @@ -51,7 +52,7 @@ http: - nextcloud-chain tls: {} - # Dockmon (публичный) + # Dockmon (public (account required)) dockmon: rule: "Host(`dockmon.forust.xyz`)" entryPoints: @@ -62,7 +63,17 @@ http: - security-headers tls: {} - # Glance (локальный) + # Gitea (public (account required)) + gitea: + rule: "Host(`gitea.forust.xyz`)" + entryPoints: + - websecure + service: gitea + middlewares: + - security-headers + tls: {} + + # Glance (local only) glance: rule: "Host(`glance.workstation`)" entryPoints: @@ -72,7 +83,7 @@ http: - security-headers tls: {} - # Watercrawl (локальный) + # Watercrawl (local only) watercrawl: rule: "Host(`watercrawl.workstation`)" entryPoints: @@ -82,7 +93,7 @@ http: - security-headers tls: {} - # N8N (локальный) + # N8N (local only) n8n: rule: "Host(`n8n.workstation`)" entryPoints: @@ -92,15 +103,6 @@ http: - security-headers tls: {} - # Gitea (публичный) - gitea: - rule: "Host(`gitea.forust.xyz`)" - entryPoints: - - websecure - service: gitea - middlewares: - - security-headers - tls: {} services: # Portainer @@ -171,21 +173,21 @@ http: scheme: https permanent: true - # Basic Auth для Traefik Dashboard + # Basic Auth Traefik Dashboard auth: basicAuth: users: - "admin:$$apr1$$57E60OUM$$JoYwmLr/uZKaTy6U4IQd9." realm: "Traefik Dashboard" - # Basic Auth для Dockmon + # Basic Auth Dockmon dockmon-auth: basicAuth: users: - "admin:$$apr1$$.bCpmIHl$$dxPEKdw5aZLAwo8wUz52b1" realm: "Dockmon Access" - # Cloudflare IP Whitelist (опционально) + # Cloudflare IP Whitelist cloudflare-ipwhitelist: ipWhiteList: sourceRange: @@ -245,17 +247,17 @@ http: # TLS Configuration tls: certificates: - # Cloudflare Origin CA для публичных доменов *.forust.xyz + # Cloudflare Origin CA *.forust.xyz - certFile: /certs/cloudflare.pem keyFile: /certs/cloudflare.key - # Локальный сертификат для *.workstation + # Local certificate - certFile: /certs/workstation+1.pem keyFile: /certs/workstation+1-key.pem stores: default: defaultCertificate: - # По умолчанию используем локальный сертификат + # Fallback local certificate certFile: /certs/workstation+1.pem keyFile: /certs/workstation+1-key.pem