diff --git a/docker-compose.yml b/docker-compose.yml index 6c1452c..6012725 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,37 @@ networks: + default: web: external: true services: nginx: image: nginx:alpine - ports: - - "80:80" volumes: - ./public:/usr/share/nginx/html:ro - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro restart: unless-stopped - environment: - - NGINX_HOST=localhost - - NGINX_PORT=80 + labels: + # Explicitly tell Traefik to expose this container + - traefik.enable=true + - traefik.docker.network=web + # HTTPS + - traefik.http.services.mg-hugo-service-secure.loadbalancer.server.port=80 + - traefik.http.routers.mg-hugo-secure.service=mg-hugo-service-secure + - traefik.http.routers.mg-hugo-secure.entrypoints=websecure + - traefik.http.routers.mg-hugo-secure.tls.certresolver=le + - traefik.http.routers.mg-hugo-secure.rule=Host(`mistergeek.fr`, `www.mistergeek.fr`, `mistergeek.net`, `www.mistergeek.net`, `agence-webside.fr`, `www.agence-webside.fr`) + - traefik.http.middlewares.mg-hugo-secure-cache.compress=true + # HTTP + - traefik.http.services.mg-hugo-service-insecure.loadbalancer.server.port=80 + - traefik.http.routers.mg-hugo-insecure.service=mg-hugo-service-insecure + - traefik.http.routers.mg-hugo-insecure.entrypoints=web + - traefik.http.routers.mg-hugo-insecure.rule=Host(`mistergeek.fr`, `www.mistergeek.fr`, `mistergeek.net`, `www.mistergeek.net`, `agence-webside.fr`, `www.agence-webside.fr`) + - traefik.http.middlewares.mg-hugo-insecure-cache.compress=true + - traefik.http.routers.traefik.tls=true + - traefik.http.routers.traefik.tls.certresolver=le + # GZIP + - traefik.http.routers.traefik.middlewares=traefik-compress + - traefik.http.middlewares.traefik-compress.compress=true networks: - web @@ -21,9 +39,8 @@ services: build: context: . dockerfile: Dockerfile - entrypoint: /bin/sh volumes: - .:/app networks: - - web + - default # command: ls -l diff --git a/nginx.conf b/nginx.conf index 53b1d73..d3b547c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,6 +1,13 @@ server { listen 80; - server_name localhost; + server_name mistergeek.fr mistergeek.net agence-webside.fr; + return 301 https://www.mistergeek.net$request_uri; +} + +server { + listen 80; + server_name www.mistergeek.net; + root /usr/share/nginx/html; index index.html index.htm;