From ace326c0bae112128ed585f305e76df7630c2277 Mon Sep 17 00:00:00 2001
From: Nils Grunwald <nilsgrunwald@msn.com>
Date: Sun, 27 Jul 2025 10:30:08 +0200
Subject: [PATCH] Updated docker-compose files

---
 .gitignore                    |  1 +
 pihole/docker-compose.yml     | 24 +++++++++++++++++++++++
 pihole/docker-compose.yml_bak | 37 +++++++++++++++++++++++++++++++++++
 plex/docker-compose.yaml      | 11 ++++-------
 4 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 pihole/docker-compose.yml
 create mode 100644 pihole/docker-compose.yml_bak

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dbdd555
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/pihole/etc-pihole
\ No newline at end of file
diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml
new file mode 100644
index 0000000..c09c05f
--- /dev/null
+++ b/pihole/docker-compose.yml
@@ -0,0 +1,24 @@
+# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
+services:
+  pihole:
+    container_name: pihole
+    hostname: Pihole
+    image: pihole/pihole:latest
+    network_mode: vlanPihole
+    environment:
+      # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
+      TZ: 'Europe/Berlin'
+      # Set a password to access the web interface. Not setting one will result in a random password being assigned
+      FTLCONF_webserver_api_password: 'inginf95'
+      WEB_PORT: '9090'
+      # Volumes store your data between container upgrades
+    volumes:
+      # For persisting Pi-hole's databases and common configuration file
+      - './etc-pihole:/etc/pihole'
+      # Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards
+      #- './etc-dnsmasq.d:/etc/dnsmasq.d'
+    #cap_add:
+      # See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
+      # Required if you are using Pi-hole as your DHCP server, else not needed
+      #- NET_ADMIN
+    restart: unless-stopped
diff --git a/pihole/docker-compose.yml_bak b/pihole/docker-compose.yml_bak
new file mode 100644
index 0000000..cce618f
--- /dev/null
+++ b/pihole/docker-compose.yml_bak
@@ -0,0 +1,37 @@
+# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
+services:
+  pihole:
+    container_name: pihole
+    image: pihole/pihole:latest
+    ports:
+      # DNS Ports
+      - "53:53/tcp"
+      - "53:53/udp"
+      # Default HTTP Port
+      - "9090:80/tcp"
+      # Default HTTPs Port. FTL will generate a self-signed certificate
+      #- "9043:443/tcp"
+      # Uncomment the below if using Pi-hole as your DHCP Server
+      #- "67:67/udp"
+    networks:
+      - pihole_network
+    environment:
+      # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
+      TZ: 'Europe/Berlin'
+      # Set a password to access the web interface. Not setting one will result in a random password being assigned
+      FTLCONF_webserver_api_password: 'inginf95'
+      # Volumes store your data between container upgrades
+    volumes:
+      # For persisting Pi-hole's databases and common configuration file
+      - './etc-pihole:/etc/pihole'
+      # Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards
+      #- './etc-dnsmasq.d:/etc/dnsmasq.d'
+    #cap_add:
+      # See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
+      # Required if you are using Pi-hole as your DHCP server, else not needed
+      #- NET_ADMIN
+    restart: unless-stopped
+
+networks:
+  pihole_network:
+    driver: bridge
diff --git a/plex/docker-compose.yaml b/plex/docker-compose.yaml
index 4ee4924..097d8cc 100644
--- a/plex/docker-compose.yaml
+++ b/plex/docker-compose.yaml
@@ -14,6 +14,8 @@ services:
       - /media/plex/tv-shows:/tv-shows
       - /media/plex/movies:/movies
       - /media/plex/music:/music
+      - /media/plex/cartoons:/cartoons
+      - /media/plex/comedy:/comedy
     restart: unless-stopped
     ports:
       # Plex DLNA Server
@@ -29,13 +31,8 @@ services:
       - "traefik.http.routers.plex.service=plex"
       - "traefik.http.services.plex.loadbalancer.server.port=32400"
       - "traefik.docker.network=proxy"
-    networks:
-      - traefik_web
+    network_mode: host
 
       
 volumes:
-  plex_config:
-
-networks:
-  traefik_web:
-    external: true 
\ No newline at end of file
+  plex_config:
\ No newline at end of file