From 72f560809b52bbffd4153b0b5ebe8ed97cce7407 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Wed, 22 Jun 2022 22:31:39 +0200
Subject: [PATCH] reinstall home server and backups and many fixes

---
 .envrc                                |  1 +
 bundles/gitea/items.py                |  4 ----
 bundles/gitea/metadata.py             | 14 ++++++++++++++
 bundles/influxdb2/metadata.py         |  1 +
 bundles/nextcloud/metadata.py         |  1 +
 bundles/steam-chat-logger/metadata.py |  5 +++++
 bundles/wol-waker/metadata.py         |  8 ++++++++
 nodes/home.backups.py                 |  4 ++--
 nodes/home.server.py                  | 20 ++++++++++++++++----
 9 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/.envrc b/.envrc
index 5bfad33..c5b40eb 100644
--- a/.envrc
+++ b/.envrc
@@ -3,6 +3,7 @@
 python3 -m venv .venv
 source ./.venv/bin/activate
 PATH_add .venv/bin
+PATH_add bin
 python3 -m pip install --upgrade pip
 
 rm -rf .cache/bw/git_deploy
diff --git a/bundles/gitea/items.py b/bundles/gitea/items.py
index 332e802..df48f01 100644
--- a/bundles/gitea/items.py
+++ b/bundles/gitea/items.py
@@ -11,10 +11,6 @@ downloads['/usr/local/bin/gitea'] = {
     },
 }
 
-users['git'] = {
-    'home': '/home/git',
-}
-
 directories['/var/lib/gitea'] = {
     'owner': 'git',
     'mode': '0700',
diff --git a/bundles/gitea/metadata.py b/bundles/gitea/metadata.py
index 05e415d..fe4bf08 100644
--- a/bundles/gitea/metadata.py
+++ b/bundles/gitea/metadata.py
@@ -1,6 +1,15 @@
 database_password = repo.vault.password_for(f'{node.name} postgresql gitea')
 
 defaults = {
+    'apt': {
+        'packages': {
+            'git': {
+                'needed_by': {
+                    'svc_systemd:gitea',
+                }
+            },
+        },
+    },
     'gitea': {
         'database': {
             'host': 'localhost',
@@ -52,6 +61,11 @@ defaults = {
             },
         },
     },
+    'users': {
+        'git': {
+            'home': '/home/git',
+        },
+    },
     'zfs': {
         'datasets': {
             'tank/gitea': {
diff --git a/bundles/influxdb2/metadata.py b/bundles/influxdb2/metadata.py
index 467f8d1..d2fcff7 100644
--- a/bundles/influxdb2/metadata.py
+++ b/bundles/influxdb2/metadata.py
@@ -4,6 +4,7 @@ defaults = {
     'apt': {
         'packages': {
             'influxdb2': {},
+            'influxdb2-cli': {},
         },
         'sources': {
             'deb https://repos.influxdata.com/debian {release} stable',
diff --git a/bundles/nextcloud/metadata.py b/bundles/nextcloud/metadata.py
index b7a021e..f4b652e 100644
--- a/bundles/nextcloud/metadata.py
+++ b/bundles/nextcloud/metadata.py
@@ -5,6 +5,7 @@ defaults = {
     'apt': {
         'packages': {
             'php': {},
+            'php-redis': {},
             'php-fpm': {},
             'php-curl': {},
             'php-gd': {},
diff --git a/bundles/steam-chat-logger/metadata.py b/bundles/steam-chat-logger/metadata.py
index fac0a99..f577691 100644
--- a/bundles/steam-chat-logger/metadata.py
+++ b/bundles/steam-chat-logger/metadata.py
@@ -1,4 +1,9 @@
 defaults = {
+    'apt': {
+        'packages': {
+            'python3-pip': {},
+        },
+    },
     'postgresql': {
         'roles': {
             'steam_chat_logger': {
diff --git a/bundles/wol-waker/metadata.py b/bundles/wol-waker/metadata.py
index 1c91b64..7624612 100644
--- a/bundles/wol-waker/metadata.py
+++ b/bundles/wol-waker/metadata.py
@@ -1,3 +1,11 @@
+defaults = {
+    'apt': {
+        'packages': {
+            'wakeonlan': {},
+        },
+    },
+}
+
 @metadata_reactor.provides(
     'users/wol',
 )
diff --git a/nodes/home.backups.py b/nodes/home.backups.py
index 8f79a35..36ca582 100644
--- a/nodes/home.backups.py
+++ b/nodes/home.backups.py
@@ -17,10 +17,10 @@
         'id': '9cf52515-63a1-4659-a8ec-6c3c881727e5',
         'network': {
             'internal': {
-                'interface': 'enp1s0',
+                'interface': 'enp0s31f6',
                 'ipv4': '10.0.0.5/24',
                 'gateway4': '10.0.0.1',
-                'mac': 'd8:cb:8a:e7:be:c6',
+                'mac': '4c:cc:6a:d5:96:f8',
             },
         },
         'backup-server': {
diff --git a/nodes/home.server.py b/nodes/home.server.py
index 3934156..ccc59f3 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -16,11 +16,10 @@
         'build-agent',
         'crystal',
         'gitea',
-        'gollum',
+#        'gollum',
         'grafana',
         'influxdb2',
         'mirror',
-        'mosquitto',
         'postgresql',
         'redis',
         'smartctl',
@@ -36,7 +35,7 @@
         'id': 'af96709e-b13f-4965-a588-ef2cd476437a',
         'network': {
             'internal': {
-                'interface': 'enp0s31f6',
+                'interface': 'enp42s0',
                 'ipv4': '10.0.0.2/24',
                 'gateway4': '10.0.0.1',
             },
@@ -121,7 +120,7 @@
         },
         'vm': {
             'cores': 2,
-            'ram':  16192,
+            'ram':  32384,
         },
         'wireguard': {
             'my_ip': '172.30.0.2/32',
@@ -136,6 +135,7 @@
             },
         },
         'zfs': {
+            'zfs_arc_max_percent': 75,
             'pools': {
                 'tank': {
                     'type': 'mirror',
@@ -144,6 +144,18 @@
                         '/dev/disk/by-partlabel/zfs-data-2',
                     ],
                 },
+                'ssd': {
+                    'type': 'mirror',
+                    'devices': [
+                        '/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00B00_S677NF0RA01551-part3',
+                        '/dev/disk/by-id/nvme-KINGSTON_SNVS500G_50026B7685A7B988-part1',
+                    ],
+                },
+                'cache': {
+                    'devices': [
+                        '/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00B00_S677NF0RA01551-part4',
+                    ],
+                },
             },
         },
     },