From 9fbc074f1c28b2459902de1b2b48530ce044e8bb Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Wed, 5 Jul 2023 20:30:42 +0200
Subject: [PATCH] home.server debian-12

---
 bundles/crystal/metadata.py    | 4 +++-
 bundles/influxdb2/metadata.py  | 2 +-
 bundles/nginx/files/nginx.conf | 2 +-
 bundles/nginx/items.py         | 6 ++++++
 bundles/nginx/metadata.py      | 3 +++
 nodes/home.server.py           | 9 +++++++--
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/bundles/crystal/metadata.py b/bundles/crystal/metadata.py
index 48c3eb9..5bb1b83 100644
--- a/bundles/crystal/metadata.py
+++ b/bundles/crystal/metadata.py
@@ -1,10 +1,12 @@
+debian_version = min([node.os_version, (11,)])[0] # FIXME
+
 defaults = {
     'apt': {
         'packages': {
             'crystal': {},
         },
         'sources': {
-            'deb https://download.opensuse.org/repositories/devel:/languages:/crystal/Debian_{version}/ /',
+            f'deb https://download.opensuse.org/repositories/devel:/languages:/crystal/Debian_{debian_version}/ /',
         },
     },
 }
diff --git a/bundles/influxdb2/metadata.py b/bundles/influxdb2/metadata.py
index 98dc0d3..c23b137 100644
--- a/bundles/influxdb2/metadata.py
+++ b/bundles/influxdb2/metadata.py
@@ -7,7 +7,7 @@ defaults = {
             'influxdb2-cli': {},
         },
         'sources': {
-            'deb https://repos.influxdata.com/debian {codename} stable',
+            'deb https://repos.influxdata.com/debian stable main'
         },
     },
     'nftables': {
diff --git a/bundles/nginx/files/nginx.conf b/bundles/nginx/files/nginx.conf
index 865f0ce..f689378 100644
--- a/bundles/nginx/files/nginx.conf
+++ b/bundles/nginx/files/nginx.conf
@@ -2,7 +2,7 @@ pid /var/run/nginx.pid;
 user www-data;
 worker_processes 10;
 
-include /etc/nginx/modules-enabled/*;
+include /etc/nginx/modules/*;
 include /etc/nginx/conf.d/*;
 
 events {
diff --git a/bundles/nginx/items.py b/bundles/nginx/items.py
index 60b9582..a70caf1 100644
--- a/bundles/nginx/items.py
+++ b/bundles/nginx/items.py
@@ -9,6 +9,12 @@ directories = {
             'svc_systemd:nginx:restart',
         },
     },
+    '/etc/nginx/modules': {
+        'purge': True,
+        'triggers': {
+            'svc_systemd:nginx:restart',
+        },
+    },
     '/etc/nginx/conf.d': {
         'purge': True,
         'triggers': {
diff --git a/bundles/nginx/metadata.py b/bundles/nginx/metadata.py
index 6d5835e..7c0c925 100644
--- a/bundles/nginx/metadata.py
+++ b/bundles/nginx/metadata.py
@@ -5,6 +5,9 @@ defaults = {
     'apt': {
         'packages': {
             'nginx': {},
+            'apache2': {
+                'installed': False,
+            },
         },
     },
     'nftables': {
diff --git a/nodes/home.server.py b/nodes/home.server.py
index 1c751a0..a012c92 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -3,7 +3,7 @@
     'groups': [
         'autologin',
         'backup',
-        'debian-11',
+        'debian-12',
         'home',
         'nextcloud',
         'monitored',
@@ -46,6 +46,11 @@
                 'gateway4': '10.0.0.1',
             },
         },
+        'apt': {
+            'packages': {
+                'firmware-realtek': {},
+            },
+        },
         'build-server': {
             'hostname': 'build.sublimity.de',
             'architectures': {
@@ -106,7 +111,7 @@
         },
         'nextcloud': {
             'hostname': 'cloud.sublimity.de',
-            'version': '25.0.8',
+            'version': '27.0.0',
             'config': {
                 'instanceid': 'oci6dw1woodz',
                 'secret': '!decrypt:encrypt$gAAAAABj96CFynVtEgsje7173zjQAcY7xQG3uyf5cxE-sJAvhyPh_KUykTKdwnExc8NTDJ8RIGUmVfgC6or5crnYaggARPIEg5-Cb0xVdEPPZ3oZ01ImLmynLu3qXT9O8kVM-H21--OKeztMRn7bySsbXdWEGtETFQ==',