diff --git a/pica-nginx/README.md b/pica-nginx/README.md index 361ccca71cf8b567e146cc12ffb8b11519cb9fe6..c2b93dd67dd9c3b29934b34b1427053d2fc8b6cc 100644 --- a/pica-nginx/README.md +++ b/pica-nginx/README.md @@ -33,13 +33,14 @@ mon_site: volumes: - mon_site:/var/www/html labels: - traefik.frontend.rule: Host:mon_site.picasoft.net - traefik.port: 80 + traefik.http.routers.mon_site.entrypoints: websecure + traefik.http.routers.mon_site.rule: Host(`mon_site.picasoft.net`) + traefik.http.services.mon_site.loadbalancer.server.port: 80 traefik.enable: true environment: AUTOINDEX: true networks: - - docker_default + - proxy restart: unless-stopped ``` diff --git a/pica-nginx/docker-compose.yml b/pica-nginx/docker-compose.yml index da771c665239e66461315230eaab9cb4d7d98dcb..f56fe1c8bfcc49ded7c57448a07ada24b8507daa 100644 --- a/pica-nginx/docker-compose.yml +++ b/pica-nginx/docker-compose.yml @@ -15,7 +15,7 @@ volumes: name: stiegler networks: - docker_default: + proxy: external: true x-image-name: &NGINX_IMAGE @@ -29,11 +29,12 @@ services: volumes: - website:/var/www/html labels: - traefik.frontend.rule: Host:www.picasoft.net,picasoft.net - traefik.port: 80 + traefik.http.routers.website.entrypoints: websecure + traefik.http.routers.website.rule: Host(`www.picasoft.net`, `picasoft.net`) + traefik.http.services.website.loadbalancer.server.port: 80 traefik.enable: true networks: - - docker_default + - proxy restart: unless-stopped doc: @@ -43,11 +44,12 @@ services: volumes: - doc:/var/www/html labels: - traefik.frontend.rule: Host:doc.picasoft.net - traefik.port: 80 + traefik.http.routers.doc.entrypoints: websecure + traefik.http.routers.doc.rule: Host(`doc.picasoft.net`) + traefik.http.services.doc.loadbalancer.server.port: 80 traefik.enable: true networks: - - docker_default + - proxy restart: unless-stopped school: @@ -57,11 +59,12 @@ services: volumes: - school:/var/www/html labels: - traefik.frontend.rule: Host:school.picasoft.net - traefik.port: 80 + traefik.http.routers.school.entrypoints: websecure + traefik.http.routers.school.rule: Host(`school.picasoft.net`) + traefik.http.services.school.loadbalancer.server.port: 80 traefik.enable: true networks: - - docker_default + - proxy restart: unless-stopped radio: @@ -71,13 +74,14 @@ services: volumes: - radio:/var/www/html labels: - traefik.frontend.rule: Host:radio.picasoft.net - traefik.port: 80 + traefik.http.routers.radio.entrypoints: websecure + traefik.http.routers.radio.rule: Host(`radio.picasoft.net`) + traefik.http.services.radio.loadbalancer.server.port: 80 traefik.enable: true networks: - - docker_default + - proxy restart: unless-stopped - + culture: container_name: culture image: *NGINX_IMAGE @@ -85,13 +89,14 @@ services: volumes: - culture:/var/www/html labels: - traefik.frontend.rule: Host:culture.picasoft.net - traefik.port: 80 + traefik.http.routers.culture.entrypoints: websecure + traefik.http.routers.culture.rule: Host(`culture.picasoft.net`) + traefik.http.services.culture.loadbalancer.server.port: 80 traefik.enable: true environment: AUTOINDEX: "true" networks: - - docker_default + - proxy restart: unless-stopped stiegler: @@ -101,9 +106,10 @@ services: volumes: - stiegler:/var/www/html labels: - traefik.frontend.rule: Host:stiegler.picasoft.net - traefik.port: 80 + traefik.http.routers.stiegler.entrypoints: websecure + traefik.http.routers.stiegler.rule: Host(`stiegler.picasoft.net`) + traefik.http.services.stiegler.loadbalancer.server.port: 80 traefik.enable: true networks: - - docker_default + - proxy restart: unless-stopped