Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

traefik

Created 3 months agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

53 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

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

Saved diffs

Original text

Open file

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

Changed text

Open file

# 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