From 14f634869d8ff1a4afa88b0000cfd3d88cd4238c Mon Sep 17 00:00:00 2001
From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com>
Date: Sat, 27 Aug 2022 21:20:24 +0200
Subject: [PATCH] Complete basic setup

---
 README.md                         |  5 +++--
 dns/docker-compose.yml            | 29 ++++++++++++++++++++---------
 dropbot/docker-compose.yml        |  1 -
 infrastructure/docker-compose.yml | 11 +++++------
 media/docker-compose.yml          | 21 +++++++++++++--------
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index c2ee49c..ce225ae 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
-# franz
- 
+# Franz
+
+Collection of Docker Compose files for my homeserver
diff --git a/dns/docker-compose.yml b/dns/docker-compose.yml
index 264d094..9fadcfa 100644
--- a/dns/docker-compose.yml
+++ b/dns/docker-compose.yml
@@ -1,11 +1,9 @@
 version: '2'
 
-services: 
+services:
   pihole:
     container_name: pihole
     image: pihole/pihole
-
-    hostname: pihole
     volumes:
       - pihole_dnsmasq:/etc/dnsmasq.d
       - pihole_data:/etc/pihole
@@ -14,15 +12,17 @@ services:
       - IPv6=True
       - TZ=Europe/Berlin
       - SKIPGRAVITYONBOOT=1
-      - VIRTUAL_HOST=pihole
+      - VIRTUAL_HOST=pihole.franz.local
     ports:
      - "53:53/tcp"
      - "53:53/udp"
-     - "8420:80"
+     - 8420:80
     cap_add:
       - NET_ADMIN
     networks:
       traefik_net:
+      dns_net:
+        ipv4_address: 172.28.1.6
     labels:
       - traefik.enable=true
       - traefik.http.routers.pihole.entrypoints=web
@@ -31,7 +31,7 @@ services:
 
   unbound:
     container_name: unbound
-    image: mvance/unbound-rpi
+    image: klutchell/unbound:edge
     volumes:
       - unbound_data:/opt/unbound/etc/unbound
     dns:
@@ -39,11 +39,22 @@ services:
     restart: always
     networks:
       traefik_net:
-        
-networks: 
+      dns_net:
+        ipv4_address: 172.28.1.5
+
+networks:
   traefik_net:
     name: traefik-net
     external: true
+  dns_net:
+    name: dns-net
+    driver: bridge
+    ipam:
+      config:
+      -      
+        subnet: 172.28.1.0/24
+        ip_range: 172.28.1.5/30
+        gateway: 172.28.1.1
 
 volumes:
   pihole_dnsmasq:
@@ -51,4 +62,4 @@ volumes:
   pihole_data:
     name: pihole_data
   unbound_data:
-    name: unbound_data
+    name: unbound_data
\ No newline at end of file
diff --git a/dropbot/docker-compose.yml b/dropbot/docker-compose.yml
index 3a6399b..acb38c0 100644
--- a/dropbot/docker-compose.yml
+++ b/dropbot/docker-compose.yml
@@ -4,7 +4,6 @@ services:
     image: ghcr.io/tychothetaco/twitch-drops-bot
     container_name: dropbot
     user: uid:gid
-    network_mode: "host"
     volumes:
       - dropbot_data:/app/data
     restart: "unless-stopped"
diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml
index 1d6cbeb..aa7cd4a 100644
--- a/infrastructure/docker-compose.yml
+++ b/infrastructure/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     image: "louislam/uptime-kuma"
     volumes:
       - kuma_data:/app/data
-    restart: always   
+    restart: always
     networks:
       traefik_net:
     dns:
@@ -43,16 +43,15 @@ services:
       - flame_secrets.env
     restart: always
     networks:
-      traefik_net:  
-        ipv4_address: 172.26.0.2
+      traefik_net:
     labels:
       - traefik.enable=true
       - traefik.http.routers.flame.entrypoints=web
       - traefik.http.routers.flame.rule=Host(`franz.local`)
     dns:
       - 1.1.1.1
-    
-networks: 
+
+networks:
   traefik_net:
     name: traefik-net
     driver: bridge
@@ -63,4 +62,4 @@ volumes:
   kuma_data:
     name: kuma_data
   flame_data:
-    name: flame_data
+    name: flame_data
\ No newline at end of file
diff --git a/media/docker-compose.yml b/media/docker-compose.yml
index 6b5f310..dc0d75c 100644
--- a/media/docker-compose.yml
+++ b/media/docker-compose.yml
@@ -3,21 +3,26 @@ services:
   jellyfin:
     image: jellyfin/jellyfin
     container_name: jellyfin
-    ports:
-      - "80:80"
-    user: uid:gid
-    network_mode: "host"
     volumes:
       - jellyfin_data:/config
       - jellyfin_cache:/cache
       - /mnt:/media
-    restart: "unless-stopped"
+    networks:
+      traefik_net:
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.jellyfin.entrypoints=web
+      - traefik.http.routers.jellyfin.rule=Host(`jellyfin.franz.local`)
+      - traefik.http.services.jellyfin.loadbalancer.server.port=8096
+    restart: always
 
+networks:
+  traefik_net:
+    name: traefik-net
+    external: true
 
 volumes:
   jellyfin_data:
     name: jellyfin_data
-    external: true
   jellyfin_cache:
-    name: jellyfin_cache
-    external: true
+    name: jellyfin_cache
\ No newline at end of file