From 9c5071e81d505a9a2f2b064d0009150cd10b1dcf Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 26 Feb 2024 12:25:14 +0100 Subject: [PATCH] Updated YMLs for DNS pihole and exporter for individual naming. Also removed alot of unnecessary code --- homenetwork/dns/pihole_mason.yml | 59 ++++++-------------------------- homenetwork/dns/pihole_phil.yml | 59 ++++++-------------------------- 2 files changed, 20 insertions(+), 98 deletions(-) diff --git a/homenetwork/dns/pihole_mason.yml b/homenetwork/dns/pihole_mason.yml index 2abe4dd..3afa2e2 100644 --- a/homenetwork/dns/pihole_mason.yml +++ b/homenetwork/dns/pihole_mason.yml @@ -1,78 +1,39 @@ version: "3.7" -#volumes: -# pihole: - services: - pihole: + mason-ph: image: pihole/pihole:latest container_name: "mason-ph" - hostname: "pihole" -# user: "root:root" + networks: + - pihole_network ports: - "53:53/udp" - "53:53/tcp" - "80:80" -# - target: 53 -# published: 53 -# protocol: tcp -# - target: 53 -# published: 53 -# protocol: udp -# - target: 80 -# published: 8053 -# protocol: tcp -# network_mode: "host" volumes: - type: bind source: /pihole_data target: /etc/pihole -# - pihole:/etc/pihole -# - "/home/ansible/stacks/lighttpd/external.conf:/etc/lighttpd/external.conf" -# - dnsmasq:/etc/dnsmasq.d -# depends_on: -# - cloudflared restart: always environment: TZ: Europe/Amsterdam -# - "DNS1=1.1.1.1" -# - "REV_SERVER=true" -# - "REV_SERVER_CIDR=192.168.1.0/24" #Update these fields to match your environment -# - "REV_SERVER_TARGET=192.168.1.1" -# - "REV_SERVER_DOMAIN=home.local" WEBPASSWORD: 'password' -# networks: -# - web -# deploy: -# mode: global -# replicas: 1 -# placement: -# constraints: -# - "node.labels.dns==true" pihole_exporter: image: ekofr/pihole-exporter container_name: pihole_exporter - expose: - - 9617 + ports: + - 9617:9617 environment: - PIHOLE_HOSTNAME: pihole -# PIHOLE_PORT: 8053 + PIHOLE_HOSTNAME: mason-ph PIHOLE_PASSWORD: password INTERVAL: 30s PORT: 9617 restart: always -# deploy: -# labels: -# - "traefik.enable=false" -# mode: replicated -# replicas: 1 -# placement: -# constraints: -# - "node.hostname==swarm-master" + networks: + - pihole_network networks: - web: -# external: true - name: web + pihole_network: + driver: bridge diff --git a/homenetwork/dns/pihole_phil.yml b/homenetwork/dns/pihole_phil.yml index a04a13f..78d1073 100644 --- a/homenetwork/dns/pihole_phil.yml +++ b/homenetwork/dns/pihole_phil.yml @@ -1,78 +1,39 @@ version: "3.7" -#volumes: -# pihole: - services: - pihole: + phil-ph: image: pihole/pihole:latest container_name: "phil-ph" - hostname: "pihole" -# user: "root:root" + networks: + - pihole_network ports: - "53:53/udp" - "53:53/tcp" - "80:80" -# - target: 53 -# published: 53 -# protocol: tcp -# - target: 53 -# published: 53 -# protocol: udp -# - target: 80 -# published: 8053 -# protocol: tcp -# network_mode: "host" volumes: - type: bind source: /pihole_data target: /etc/pihole -# - pihole:/etc/pihole -# - "/home/ansible/stacks/lighttpd/external.conf:/etc/lighttpd/external.conf" -# - dnsmasq:/etc/dnsmasq.d -# depends_on: -# - cloudflared restart: always environment: TZ: Europe/Amsterdam -# - "DNS1=1.1.1.1" -# - "REV_SERVER=true" -# - "REV_SERVER_CIDR=192.168.1.0/24" #Update these fields to match your environment -# - "REV_SERVER_TARGET=192.168.1.1" -# - "REV_SERVER_DOMAIN=home.local" WEBPASSWORD: 'password' -# networks: -# - web -# deploy: -# mode: global -# replicas: 1 -# placement: -# constraints: -# - "node.labels.dns==true" pihole_exporter: image: ekofr/pihole-exporter container_name: pihole_exporter - expose: - - 9617 + ports: + - 9617:9617 environment: - PIHOLE_HOSTNAME: pihole -# PIHOLE_PORT: 8053 + PIHOLE_HOSTNAME: phil-ph PIHOLE_PASSWORD: password INTERVAL: 30s PORT: 9617 restart: always -# deploy: -# labels: -# - "traefik.enable=false" -# mode: replicated -# replicas: 1 -# placement: -# constraints: -# - "node.hostname==swarm-master" + networks: + - pihole_network networks: - web: -# external: true - name: web + pihole_network: + driver: bridge