Comparer le texte

Trouver la différence entre deux fichiers texte

Éditeur live

Masquer les espaces

Cacher identiques

Sans retour à la ligne

Vue

Niveau de précision

Styles de texte

Coloration syntaxique

Diffchecker Desktop La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !Obtenir Desktop

traefik

Créé l’année dernièreLe diff n'expire jamais

9 suppressions

Lignes
Total
Supprimé

Caractères
Total
Supprimé

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

53 lignes

14 ajouts

Lignes
Total
Ajouté

Caractères
Total
Ajouté

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

53 lignes

services:

traefik:

image: traefik:v3.3.5

container_name: traefik

command:

- "--api.dashboard=true"

- "--providers.docker=true"

- "--providers.docker.exposedbydefault=false"

- "--entrypoints.web.address=:80"

- "--entrypoints.websecure.address=:443"

- "--entrypoints.web.http.redirections.entrypoint.to=websecure"

- "--entrypoints.web.http.redirections.entrypoint.scheme=https"

- "--entrypoints.web.http.redirections.entrypoint.permanent=true"

- "--certificatesresolvers.myresolver.acme.email=mymail@yandex.ru"

- "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"

- "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web"

labels:

- "traefik.enable=true"

# Middleware для редиректа www → корень (работает на обоих entrypoints)

- "traefik.http.middlewares.redirect-www-to-root.redirectregex.regex=^https?://www\\.(.+)"

- "traefik.http.middlewares.redirect-www-to-root.redirectregex.replacement=https://$1"

- "traefik.http.middlewares.redirect-www-to-root.redirectregex.permanent=true"

- "traefik.http.routers.redirect-www.rule=HostRegexp(`www.{domain:[^/]+}`)"

# Правило для HTTP (порт 80) - сначала www→корень, потом HTTP→HTTPS

- "traefik.http.routers.redirect-www.entrypoints=web"

- "traefik.http.routers.redirect-www-http.rule=HostRegexp(`www.{domain:[^/]+}`)"

- "traefik.http.routers.redirect-www.middlewares=redirect-www-to-root"

- "traefik.http.routers.redirect-www-http.entrypoints=web"

- "traefik.http.routers.redirect-www.tls.certresolver=myresolver"

- "traefik.http.routers.redirect-www-http.middlewares=redirect-www-to-root,redirect-to-https@docker"

# Правило для HTTPS (порт 443) - только www→корень

- "traefik.http.routers.redirect-www-https.rule=HostRegexp(`www.{domain:[^/]+}`)"

- "traefik.http.routers.redirect-www-https.entrypoints=websecure"

- "traefik.http.routers.redirect-www-https.middlewares=redirect-www-to-root"

- "traefik.http.routers.redirect-www-https.tls=true"

# Дашборд Traefik

- "traefik.http.routers.traefik.rule=Host(`traefik-server.mystudio.studio`)"

- "traefik.http.routers.traefik.service=api@internal"

- "traefik.http.routers.traefik.entrypoints=websecure"

- "traefik.http.routers.traefik.tls.certresolver=myresolver"

- "traefik.http.routers.traefik.middlewares=auth"

- "traefik.http.middlewares.auth.basicauth.users=admin:$$apr.....K.k/"

- "traefik.http.services.traefik.loadbalancer.server.port=8080"

ports:

- "80:80"

- "443:443"

- "8080:8080"

restart: always

volumes:

- /var/run/docker.sock:/var/run/docker.sock:ro

- traefik_certificates:/letsencrypt

networks:

- traefik_network

volumes:

traefik_certificates:

name: traefik_certificates

networks:

traefik_network:

name: traefik_network

Différences enregistrées

Texte d'origine

Ouvrir un fichier

services:
  traefik:
    image: traefik:v3.3.5
    container_name: traefik
    command:
      - "--api.dashboard=true"
      - "--providers.docker=true"
      - "--providers.docker.exposedbydefault=false"
      - "--entrypoints.web.address=:80"
      - "--entrypoints.websecure.address=:443"
      - "--entrypoints.web.http.redirections.entrypoint.to=websecure"
      - "--entrypoints.web.http.redirections.entrypoint.scheme=https"
      - "--entrypoints.web.http.redirections.entrypoint.permanent=true"
      - "--certificatesresolvers.myresolver.acme.email=mymail@yandex.ru"
      - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
      - "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web"
    labels:
      - "traefik.enable=true"

- "traefik.http.middlewares.redirect-www-to-root.redirectregex.regex=^https?://www\\.(.+)"
      - "traefik.http.middlewares.redirect-www-to-root.redirectregex.replacement=https://$1"
      - "traefik.http.middlewares.redirect-www-to-root.redirectregex.permanent=true"

- "traefik.http.routers.redirect-www.rule=HostRegexp(`www.{domain:[^/]+}`)"
      - "traefik.http.routers.redirect-www.entrypoints=web"
      - "traefik.http.routers.redirect-www.middlewares=redirect-www-to-root"
      - "traefik.http.routers.redirect-www.tls.certresolver=myresolver"

- "traefik.http.routers.traefik.rule=Host(`traefik-server.mystudio.studio`)"
      - "traefik.http.routers.traefik.service=api@internal"
      - "traefik.http.routers.traefik.entrypoints=websecure"
      - "traefik.http.routers.traefik.tls.certresolver=myresolver"
      - "traefik.http.routers.traefik.middlewares=auth"
      - "traefik.http.middlewares.auth.basicauth.users=admin:$$apr.....K.k/"
      - "traefik.http.services.traefik.loadbalancer.server.port=8080"
    ports:
      - "80:80"
      - "443:443"
      - "8080:8080"
    restart: always
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
      - traefik_certificates:/letsencrypt
    networks:
      - traefik_network

volumes:
  traefik_certificates:
    name: traefik_certificates

networks:
  traefik_network:
    name: traefik_network

Texte modifié

Ouvrir un fichier

# Middleware для редиректа www → корень (работает на обоих entrypoints)
      - "traefik.http.middlewares.redirect-www-to-root.redirectregex.regex=^https?://www\\.(.+)"
      - "traefik.http.middlewares.redirect-www-to-root.redirectregex.replacement=https://$1"
      - "traefik.http.middlewares.redirect-www-to-root.redirectregex.permanent=true"

# Правило для HTTP (порт 80) - сначала www→корень, потом HTTP→HTTPS
      - "traefik.http.routers.redirect-www-http.rule=HostRegexp(`www.{domain:[^/]+}`)"
      - "traefik.http.routers.redirect-www-http.entrypoints=web"
      - "traefik.http.routers.redirect-www-http.middlewares=redirect-www-to-root,redirect-to-https@docker"

# Правило для HTTPS (порт 443) - только www→корень
      - "traefik.http.routers.redirect-www-https.rule=HostRegexp(`www.{domain:[^/]+}`)"
      - "traefik.http.routers.redirect-www-https.entrypoints=websecure"
      - "traefik.http.routers.redirect-www-https.middlewares=redirect-www-to-root"
      - "traefik.http.routers.redirect-www-https.tls=true"

# Дашборд Traefik
      - "traefik.http.routers.traefik.rule=Host(`traefik-server.mystudio.studio`)"
      - "traefik.http.routers.traefik.service=api@internal"
      - "traefik.http.routers.traefik.entrypoints=websecure"
      - "traefik.http.routers.traefik.tls.certresolver=myresolver"
      - "traefik.http.routers.traefik.middlewares=auth"
      - "traefik.http.middlewares.auth.basicauth.users=admin:$$apr.....K.k/"
      - "traefik.http.services.traefik.loadbalancer.server.port=8080"
    ports:
      - "80:80"
      - "443:443"
      - "8080:8080"
    restart: always
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
      - traefik_certificates:/letsencrypt
    networks:
      - traefik_network