From 9c1b4f5dbea24668c3601bb9cf985de9aefd2918 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Fri, 2 Jul 2021 16:15:31 +0200
Subject: [PATCH] move travelynx.franzi.business to rx300

---
 bundles/postgresql/items.py                   |  4 +--
 .../travelynx}                                |  0
 .../powerdns/files/bind-zones/franzi.business |  4 +--
 .../files/imprint/{htz.ex42-1048908 => rx300} |  0
 nodes/htz/ex42-1048908.py                     | 34 +++++++++----------
 nodes/rx300.py                                | 15 ++++++++
 6 files changed, 34 insertions(+), 23 deletions(-)
 rename data/nginx/files/extras/{htz.ex42-1048908/travelynx.franzi.business => rx300/travelynx} (100%)
 rename data/travelynx/files/imprint/{htz.ex42-1048908 => rx300} (100%)

diff --git a/bundles/postgresql/items.py b/bundles/postgresql/items.py
index 32ec15b..5f21b42 100644
--- a/bundles/postgresql/items.py
+++ b/bundles/postgresql/items.py
@@ -5,11 +5,9 @@ pkg_apt = {
     'postgresql-client-common': {},
     'postgresql-{}'.format(postgresql_version): {},
     'postgresql-client-{}'.format(postgresql_version): {},
+    'postgresql-server-dev-{}'.format(postgresql_version): {}
 }
 
-if node.metadata.get('postgresql/install_dev', False):
-    pkg_apt['postgresql-server-dev-{}'.format(postgresql_version)] = {}
-
 if node.has_bundle('zfs'):
     for pkgname, pkgconfig in pkg_apt.items():
         pkg_apt[pkgname]['needs'] = {
diff --git a/data/nginx/files/extras/htz.ex42-1048908/travelynx.franzi.business b/data/nginx/files/extras/rx300/travelynx
similarity index 100%
rename from data/nginx/files/extras/htz.ex42-1048908/travelynx.franzi.business
rename to data/nginx/files/extras/rx300/travelynx
diff --git a/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business
index f518dee..3fadfdb 100644
--- a/data/powerdns/files/bind-zones/franzi.business
+++ b/data/powerdns/files/bind-zones/franzi.business
@@ -25,9 +25,7 @@ sewfile         IN  CNAME   sewfile.htz-cloud.kunbox.net.
 rss             IN  CNAME   rx300.kunbox.net.
 status          IN  CNAME   icinga2.ovh.kunbox.net.
 
-travelynx       IN  A       94.130.52.224
-travelynx       IN  AAAA    2a01:4f8:10b:2a5f::2
-
+travelynx       IN  CNAME   rx300.kunbox.net.
 unicornsden     IN  CNAME   rx300.kunbox.net.
 
 vliedel.random  IN  A       94.130.52.224
diff --git a/data/travelynx/files/imprint/htz.ex42-1048908 b/data/travelynx/files/imprint/rx300
similarity index 100%
rename from data/travelynx/files/imprint/htz.ex42-1048908
rename to data/travelynx/files/imprint/rx300
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index 7a6882a..e8d00a8 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -9,7 +9,7 @@ nodes['htz.ex42-1048908'] = {
         'matrix-synapse',
         'mautrix-telegram',
         'mautrix-whatsapp',
-        #'miniflux',
+#        'miniflux',
         'mx-puppet-discord',
         'nodejs',
         'oidentd',
@@ -21,7 +21,7 @@ nodes['htz.ex42-1048908'] = {
         'radicale',
         'unbound',
         'smartd',
-        'travelynx',
+#        'travelynx',
         'vmhost',
     },
     'groups': {
@@ -217,9 +217,9 @@ nodes['htz.ex42-1048908'] = {
                 "'@kunsi:franzi.business'": 100,
             },
         },
-        'miniflux': {
-            'domain': 'rss.kunsmann.eu',
-        },
+#        'miniflux': {
+#            'domain': 'rss.kunsmann.eu',
+#        },
         'mx-puppet-discord': {
             'homeserver': {
                 'domain': 'franzi.business',
@@ -328,14 +328,14 @@ nodes['htz.ex42-1048908'] = {
                         },
                     },
                 },
-                'travelynx.franzi.business': {
-                    'proxy': {
-                        '/': {
-                            'target': 'http://127.0.0.1:22020',
-                        },
-                    },
-                    'extras': True,
-                },
+#                'travelynx.franzi.business': {
+#                    'proxy': {
+#                        '/': {
+#                            'target': 'http://127.0.0.1:22020',
+#                        },
+#                    },
+#                    'extras': True,
+#                },
 #                'unicornsden': {
 #                    'domain': 'unicornsden.franzi.business',
 #                    'webroot_config': {
@@ -451,10 +451,10 @@ nodes['htz.ex42-1048908'] = {
                 'maxuse': '2G',
             },
         },
-        'travelynx': {
-            'version': '1.20.1',
-            'mail_from': 'travelynx@franzi.business',
-        },
+#        'travelynx': {
+#            'version': '1.20.1',
+#            'mail_from': 'travelynx@franzi.business',
+#        },
         'users': {
             'kunsi': {
                 'groups': [
diff --git a/nodes/rx300.py b/nodes/rx300.py
index 842dc71..429b267 100644
--- a/nodes/rx300.py
+++ b/nodes/rx300.py
@@ -11,6 +11,7 @@ nodes['rx300'] = {
         'miniflux',
         'postgresql',
         'smartd',
+        'travelynx',
         'vmhost',
         'zfs',
     },
@@ -62,6 +63,16 @@ nodes['rx300'] = {
                         'mode': '0755',
                     },
                 },
+                'travelynx': {
+                    'domain': 'travelynx.franzi.business',
+                    'ssl': '_.franzi.business',
+                    'proxy': {
+                        '/': {
+                            'target': 'http://127.0.0.1:22020',
+                        },
+                    },
+                    'extras': True,
+                },
             },
         },
         'postgresql': {
@@ -81,6 +92,10 @@ nodes['rx300'] = {
                 },
             },
         },
+        'travelynx': {
+            'version': '1.20.2',
+            'mail_from': 'travelynx@franzi.business',
+        },
         'users': {
             'kunsi': {
                 'groups': {