From c9297d2b37c7892cad0434ad493e0e8363dbe338 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Fri, 25 Jun 2021 02:01:52 +0200
Subject: [PATCH] wip

---
 bundles/wireguard/metadata.py    |  2 ++
 groups/applications/nextcloud.py |  6 ++++++
 nodes/home.server.py             |  6 +++---
 nodes/htz.mails.py               | 10 ++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 groups/applications/nextcloud.py

diff --git a/bundles/wireguard/metadata.py b/bundles/wireguard/metadata.py
index 73ca5e1..bf1efb5 100644
--- a/bundles/wireguard/metadata.py
+++ b/bundles/wireguard/metadata.py
@@ -36,6 +36,8 @@ def systemd_networkd_networks(metadata):
                     },
                     'Network': {
                         'DHCP': 'no',
+                        'IPForward': 'yes',
+                        'IPMasquerade': 'yes',
                         'IPv6AcceptRA': 'no',
                     },
                 },
diff --git a/groups/applications/nextcloud.py b/groups/applications/nextcloud.py
new file mode 100644
index 0000000..626a331
--- /dev/null
+++ b/groups/applications/nextcloud.py
@@ -0,0 +1,6 @@
+{
+    'bundles': [
+        'nextcloud',
+        'php',
+    ],
+}
diff --git a/nodes/home.server.py b/nodes/home.server.py
index bd04204..206e471 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -1,12 +1,12 @@
 {
     'hostname': '10.0.0.2',
     'groups': [
-        'debian-10',
         'archive',
+        'debian-10',
+#        'nextcloud',
     ],
     'bundles': [
         'gitea',
-        'nextcloud',
         'postgresql',
         'wireguard',
     ],
@@ -27,6 +27,6 @@
             'peers': {
                 'htz.mails': {},
             },
-        }, 
+        },
     },
 }
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 82b760e..745aa2f 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -88,6 +88,16 @@
                 'home.server': {},
             },
         },
+        'systemd-networkd': {
+            'networks': {
+                'wg0': {
+                    'Route#10.0.0.0/24': {
+                        'Gateway': '172.19.136.2',
+                        'Destination': '10.0.0.0/24',
+                    },
+                },
+            },
+        },
         'zfs': {
             'pools': {
                 'tank': {