From d9bb25d1644fc745d3b7ceafbf453630657312fb Mon Sep 17 00:00:00 2001
From: chris <christiansteinle@arcor.de>
Date: Wed, 23 Feb 2022 04:55:26 +0100
Subject: [PATCH] Cleanup networking. Remove wireguard.

---
 networking/docker-compose.yaml | 38 +++++++---------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/networking/docker-compose.yaml b/networking/docker-compose.yaml
index 523b5e2..f13b006 100644
--- a/networking/docker-compose.yaml
+++ b/networking/docker-compose.yaml
@@ -7,21 +7,18 @@ volumes:
     name: dnsmasq
   samba-config:
     name: samba-config
-  wireguard:
-    name: wireguard
 
 
 networks:
-  proxy:
-    external: true
-  internal:
-    external: true
+  networking:
+    name: networking
+    external: false
   home:
     external: false
     driver: macvlan
     enable_ipv6: true
     driver_opts:
-      parent: enp2s0
+      parent: enp3s0
     ipam:
       config:
         - subnet: 192.168.178.0/24
@@ -39,6 +36,7 @@ services:
     cap_add:
       - NET_ADMIN
     container_name: pihole
+    hostname: pihole
     environment:
       ServerIP: 192.168.178.2
       ServerIPv6: fd00::2
@@ -81,6 +79,9 @@ services:
   samba:
     image: gists/samba-server
     container_name: samba
+    hostname: samba
+    networks:
+      - networking
     ports:
       - "137:137/udp"
       - "138:138/udp"
@@ -94,26 +95,3 @@ services:
       - samba-config:/etc/samba
       - /media/backup:/mnt
 
-  wireguard:
-    image: linuxserver/wireguard
-    container_name: wireguard
-    cap_add:
-      - NET_ADMIN
-      - SYS_MODULE
-    environment:
-      PUID: 1000
-      GUID: 1000
-      TZ: Europe/Berlin
-      SERVERURL: wireguard.lan
-      SERVERPORT: 51820
-      PEERS: chrisphone, connyphone
-      PEERDNS: auto
-      SERVER_ALLOWEDIPS_PEER_chrisphone: 192.168.178.0/24
-    volumes:
-      - /lib/modules:/lib/modules
-      - wireguard:/config
-    ports:
-      - "51820:51820/udp"
-    sysctls:
-      net.ipv4.conf.all.src_valid_mark: 1
-    restart: unless-stopped