move travelynx.franzi.business to rx300

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'] = {

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  CNAME   rx300.kunbox.net.
-travelynx       IN  AAAA    2a01:4f8:10b:2a5f::2
-
 unicornsden     IN  CNAME   rx300.kunbox.net.
 
 vliedel.random  IN  A       94.130.52.224

nodes/htz/ex42-1048908.py

@@ -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': {
+#        'miniflux': {
-            'domain': 'rss.kunsmann.eu',
+#            'domain': 'rss.kunsmann.eu',
-        },
+#        },
         'mx-puppet-discord': {
             'homeserver': {
                 'domain': 'franzi.business',
@@ -328,14 +328,14 @@ nodes['htz.ex42-1048908'] = {
                         },
                     },
                 },
-                'travelynx.franzi.business': {
+#                'travelynx.franzi.business': {
-                    'proxy': {
+#                    'proxy': {
-                        '/': {
+#                        '/': {
-                            'target': 'http://127.0.0.1:22020',
+#                            'target': 'http://127.0.0.1:22020',
-                        },
+#                        },
-                    },
+#                    },
-                    'extras': True,
+#                    'extras': True,
-                },
+#                },
 #                'unicornsden': {
 #                    'domain': 'unicornsden.franzi.business',
 #                    'webroot_config': {
@@ -451,10 +451,10 @@ nodes['htz.ex42-1048908'] = {
                 'maxuse': '2G',
             },
         },
-        'travelynx': {
+#        'travelynx': {
-            'version': '1.20.1',
+#            'version': '1.20.1',
-            'mail_from': 'travelynx@franzi.business',
+#            'mail_from': 'travelynx@franzi.business',
-        },
+#        },
         'users': {
             'kunsi': {
                 'groups': [

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': {