committed to wrong branch #9

Merged
pim merged 6 commits from dns into master 2023-06-15 11:18:34 +00:00
2 changed files with 25 additions and 8 deletions
Showing only changes of commit 932b930567 - Show all commits

View file

@ -10,6 +10,10 @@ nfs_shares:
path: /mnt/data/freshrss/data path: /mnt/data/freshrss/data
- name: freshrss_extensions - name: freshrss_extensions
path: /mnt/data/freshrss/extensions path: /mnt/data/freshrss/extensions
- name: pihole_data
path: /mnt/data/pihole/data
- name: pihole_dnsmasq
path: /mnt/data/pihole/dnsmasq
database_passwords: database_passwords:
nextcloud: !vault | nextcloud: !vault |

View file

@ -1,11 +1,23 @@
# vi: ft=yaml # vi: ft=yaml
version: "3" version: "3.8"
networks: networks:
traefik: traefik:
external: true external: true
pihole: pihole:
volumes:
data:
driver_opts:
type: "nfs"
o: "addr=192.168.30.10,nolock,soft,rw"
device: ":/mnt/data/pihole/data"
dnsmasq:
driver_opts:
type: "nfs"
o: "addr=192.168.30.10,nolock,soft,rw"
device: ":/mnt/data/pihole/dnsmasq"
services: services:
pihole: pihole:
image: pihole/pihole:latest image: pihole/pihole:latest
@ -18,18 +30,19 @@ services:
WEBPASSWORD: {{ pihole_password }} WEBPASSWORD: {{ pihole_password }}
PIHOLE_DNS_: '192.168.30.1' PIHOLE_DNS_: '192.168.30.1'
volumes: volumes:
- type: bind - type: volume
source: /mnt/data/pihole/data source: data
target: /etc/pihole target: /etc/pihole
- type: bind volume:
source: /mnt/data/pihole/dnsmasq nocopy: true
- type: volume
source: dnsmasq
target: /etc/dnsmasq.d target: /etc/dnsmasq.d
volume:
nocopy: true
networks: networks:
- traefik - traefik
deploy: deploy:
placement:
constraints:
- "node.labels.pihole == true"
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.pihole.entrypoints=localsecure - traefik.http.routers.pihole.entrypoints=localsecure