diff --git a/heimdall/docker-compose.yml b/heimdall/docker-compose.yml index aee3ede..3f89c24 100644 --- a/heimdall/docker-compose.yml +++ b/heimdall/docker-compose.yml @@ -10,15 +10,9 @@ services: - TZ=Europe/Zurich volumes: - heimdall:/config - labels: - - "traefik.enable=true" - - "traefik.http.routers.heimdall.rule=Host(`heimdall.2li.ch`)" - - "traefik.http.routers.heimdall.entrypoints=websecure" - - "traefik.http.routers.heimdall.tls.certresolver=myresolver" - - "traefik.http.routers.heimdall.middlewares=default-headers@file" restart: unless-stopped - networks: - - proxy + ports: + - 8081:80 volumes: heimdall: @@ -26,8 +20,3 @@ volumes: type: "nfs" o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1" device: ":/server_data/heimdall" - -networks: - proxy: - external: - name: "proxy" diff --git a/raspi-services/docker-compose.yml b/raspi-services/docker-compose.yml index 833899d..f239c8d 100644 --- a/raspi-services/docker-compose.yml +++ b/raspi-services/docker-compose.yml @@ -1,18 +1,6 @@ version: "3" services: - traefik: - image: "traefik:v2.2" - ports: - - "4433:443" - volumes: - - "./traefik.yaml:/etc/traefik/traefik.yaml:ro" - - "./letsencrypt:/letsencrypt" - - "/var/run/docker.sock:/var/run/docker.sock:ro" - restart: unless-stopped - networks: - - proxy - grav: build: . environment: @@ -22,15 +10,8 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.routers.grav.rule=Host(`2li.ch`,`www.2li.ch`)" - - "traefik.http.routers.grav.entrypoints=websecure" - - "traefik.http.routers.grav.tls.certresolver=myresolver" - - "traefik.http.services.grav.loadbalancer.server.port=80" - - "traefik.http.routers.grav.middlewares=default-headers@file" - networks: - - proxy + ports: + - 8080:80 volumes: grav: @@ -38,8 +19,3 @@ volumes: type: "nfs" o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1" device: ":/server_data/grav" - -networks: - proxy: - external: - name: proxy diff --git a/rss-bridge/docker-compose.yml b/rss-bridge/docker-compose.yml index 41dc392..b6fc0a6 100644 --- a/rss-bridge/docker-compose.yml +++ b/rss-bridge/docker-compose.yml @@ -4,18 +4,6 @@ services: image: rssbridge/rss-bridge:latest volumes: - ./whitelist.txt:/app/whitelist.txt - labels: - - "traefik.enable=true" - - "traefik.http.routers.rss-bridge.rule=Host(`rss-bridge.2li.ch`)" - - "traefik.http.routers.rss-bridge.entrypoints=websecure" - - "traefik.http.routers.rss-bridge.tls.certresolver=myresolver" - - "traefik.http.routers.rss-bridge.middlewares=default-headers@file" restart: unless-stopped - networks: - - proxy - -networks: - proxy: - external: - name: "proxy" - \ No newline at end of file + ports: + - 8082:80