diff --git a/dashboard/docker-compose.yaml b/heimdall/docker-compose.yaml similarity index 88% rename from dashboard/docker-compose.yaml rename to heimdall/docker-compose.yaml index 03698e1..60dd0cd 100644 --- a/dashboard/docker-compose.yaml +++ b/heimdall/docker-compose.yaml @@ -16,7 +16,7 @@ services: - web labels: - "traefik.enable=true" - - "traefik.http.routers.heimdall.rule=Host(`dashboard.${DOMAIN}`)" + - "traefik.http.routers.heimdall.rule=Host(`heimdall.${DOMAIN}`)" - "traefik.http.routers.heimdall.entrypoints=web" - "traefik.http.services.heimdall.loadbalancer.server.port=80" - "docker.group=selfhost" diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml index c85dcd1..a5f0725 100644 --- a/portainer/docker-compose.yaml +++ b/portainer/docker-compose.yaml @@ -14,7 +14,7 @@ services: - web labels: - "traefik.enable=true" - - "traefik.http.routers.portainer.rule=Host(`portainer.${HOSTNAME}`)" + - "traefik.http.routers.portainer.rule=Host(`portainer.${DOMAIN}`)" - "traefik.http.routers.portainer.entrypoints=web" - "traefik.http.services.portainer.loadbalancer.server.port=9000" - "docker.group=selfhost" diff --git a/proxy/.gitignore b/proxy/.gitignore deleted file mode 100644 index a41a8d8..0000000 --- a/proxy/.gitignore +++ /dev/null @@ -1 +0,0 @@ -extraProviders/ diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 1be2b11..66ff6df 100644 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -16,7 +16,7 @@ services: - "$PWD/extraProviders/:/extraProviders:ro" labels: - "traefik.enable=true" - - "traefik.http.routers.traefik.rule=Host(`traefik.${HOSTNAME}`)" + - "traefik.http.routers.traefik.rule=Host(`traefik.${DOMAIN}`)" - "traefik.http.routers.traefik.entrypoints=web" - "traefik.http.services.traefik.loadbalancer.server.port=8080" - "docker.group=proxy" diff --git a/proxy/extraProviders/pihole.yaml b/proxy/extraProviders/pihole.yaml new file mode 100644 index 0000000..77ed268 --- /dev/null +++ b/proxy/extraProviders/pihole.yaml @@ -0,0 +1,10 @@ +http: + routers: + pihole: + rule: "Host(`pihole.lan`) || Host(`pi.hole`)" + service: pihole + services: + pihole: + loadbalancer: + servers: + - url: "http://192.168.16.5:8081/admin/" diff --git a/smartHome/docker-compose.yaml b/smartHome/docker-compose.yaml index b4a829d..e0f5fe9 100644 --- a/smartHome/docker-compose.yaml +++ b/smartHome/docker-compose.yaml @@ -18,12 +18,12 @@ services: - "docker.group=smartHome" deconz: - image: deconzcommunity/deconz:stable + image: marthoc/deconz network_mode: host privileged: true restart: unless-stopped volumes: - - ${VOLUMES_PATH}/deCONZ:/opt/deCONZ + - ${VOLUMES_PATH}/deCONZ:/root/.local/share/dresden-elektronik/deCONZ - /etc/localtime:/etc/localtime:ro devices: - /dev/ttyACM0