From e26f0695c051957b1ac52f63281cfdacbea0c3a2 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 21 Jan 2024 10:06:38 +0100 Subject: [PATCH 1/3] Update nfs targets --- compose/grafana/docker-compose.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/compose/grafana/docker-compose.yml b/compose/grafana/docker-compose.yml index 9c95719..f8ed17e 100644 --- a/compose/grafana/docker-compose.yml +++ b/compose/grafana/docker-compose.yml @@ -11,13 +11,13 @@ volumes: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/dockerstorage/grafana/grafana + device: :/docker_config/grafana/grafana loki_data: driver_opts: type: nfs o: addr=dockerstorage,nfsvers=4 - device: :/dockerstorage/grafana/loki + device: :/docker_config/grafana/loki configs: prometheus_config: @@ -37,12 +37,12 @@ services: # - "3100:3100" # command: -config.file=/etc/loki/local-config.yaml - promtail: - image: grafana/promtail:2.6.1 - user: "0:0" - volumes: - - /var/log:/var/log - command: -config.file=/etc/promtail/config.yml +# promtail: +# image: grafana/promtail:2.6.1 +# user: "0:0" +# volumes: +# - /var/log:/var/log +# command: -config.file=/etc/promtail/config.yml prometheus: user: "0:0" @@ -64,8 +64,6 @@ services: user: "0:0" hostname: grafana image: grafana/grafana - depends_on: - - influx environment: - TZ=Europe/Amsterdam configs: From bd775f22b3911bfaa52c7ed05086254413cdac20 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 20 Feb 2024 16:51:29 +0100 Subject: [PATCH 2/3] Updated registry and registrybrowser YML for local use (not in swarm) --- homenetwork/nas/registry.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/homenetwork/nas/registry.yml b/homenetwork/nas/registry.yml index 395803e..5c25b5d 100644 --- a/homenetwork/nas/registry.yml +++ b/homenetwork/nas/registry.yml @@ -2,15 +2,17 @@ version: '3' volumes: registrystorage: - driver_opts: - type: nfs - o: addr=dockerstorage,nfsvers=4 - device: :/dockerstorage/registry + driver: local + driver_opts: + type: none + o: bind + device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry registryauth: - driver_opts: - type: nfs - o: addr=dockerstorage,nfsvers=4 - device: :/dockerstorage/registry/auth + driver: local + driver_opts: + type: none + o: bind + device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry/auth @@ -35,7 +37,9 @@ services: ports: - 8082:8080 environment: - - 'DOCKER_REGISTRY_URL=https://registry.vbchaos.nl' +# - 'DOCKER_REGISTRY_URL=https://registry.vbchaos.nl' + - 'DOCKER_REGISTRY_URL=http://10.10.1.32:5000' - 'PUBLIC_REGISTRY_URL=registry.vbchaos.nl' - 'NO_SSL_VERIFICATION=true' - 'ENABLE_DELETE_IMAGES=true' + - 'SECRET_KEY_BASE=69f08e9e10d29269e2dfa7f2b18eab49bd55e0c627a9d11cdab490b97a84bc46cb51e0210b7c20f9dc4ff52bcb789c1b9ca1c655ca37cc3bf94edd1fd180ef30' From 9c5071e81d505a9a2f2b064d0009150cd10b1dcf Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 26 Feb 2024 12:25:14 +0100 Subject: [PATCH 3/3] 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