Commit c65023b9 authored by Nick Busey's avatar Nick Busey

Merge branch 'various_fixes' into 'master'

Various small config changes

See merge request !49
parents 697ea7d2 f0ae96c2
Pipeline #45091965 passed with stages
in 39 seconds
......@@ -17,8 +17,6 @@ services:
- /etc/localtime:/etc/localtime:ro
environment:
- TZ={{ common_timezone }}
ports:
- 9117:9117
networks:
- traefik_network
labels:
......
......@@ -11,9 +11,13 @@ services:
pihole:
image: pihole/pihole:latest
restart: unless-stopped
dns: 1.1.1.1
dns:
- 127.0.0.1
- 1.1.1.1
networks:
- traefik_network
cap_add:
- NET_ADMIN
volumes:
- /var/homelabos/pihole/config/:/etc/pihole/
- /var/homelabos/pihole/dnsmasq.d/:/etc/dnsmasq.d/
......
......@@ -49,9 +49,9 @@ services:
labels:
- "traefik.enable=true"
- "traefik.docker.network=homelabos_traefik"
- "traefik.http.frontend.rule=Host:torrent.{{ domain }}"
- "traefik.http.frontend.rule=Host:transmission.{{ domain }}"
- "traefik.http.protocol=http"
- "traefik.http.port=9091"
- "traefik.tor.frontend.rule=Host:torrent.{{ tor_domain }}"
- "traefik.tor.frontend.rule=Host:transmission.{{ tor_domain }}"
- "traefik.tor.protocol=http"
- "traefik.tor.port=9091"
\ No newline at end of file
- "traefik.tor.port=9091"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment