wip

bundles/yourls/items.py

@@ -4,6 +4,13 @@ directories = {
         'group': 'www-data',
         'mode': '0755',
     },
+
+    # FIXME:
+    '/var/www/certbot': {
+        'owner': 'www-data',
+        'group': 'www-data',
+        'mode': '0755',
+    }
 }
 
 git_deploy = {
@@ -38,11 +45,4 @@ files = {
             'svc_systemd:nginx:restart',
         ],
     },
-
-    # FIXME:
-    '/var/www/certbot': {
-        'owner': 'www-data',
-        'group': 'www-data',
-        'mode': '0755',
-    }
 }

nodes/htz.mails.py

@@ -9,7 +9,6 @@
         'webserver',
         'dnsserver',
         'wordpress',
-        #'left4dead2',
     ],
     'bundles': [
         'bind-acme',
@@ -17,7 +16,6 @@
         'download-server',
         'islamicstate.eu',
         #'nginx-rtmps',
-        #'steam',
         'wireguard',
         'zfs',
     ],
@@ -54,6 +52,7 @@
                 'left4.me',
                 'elimu-kwanza.de',
                 'cronekorkn.de',
+                'direkt.oranienschule.de',
                 'foerderkreis.oranienschule-wiesbaden-wiki.de',
             },
         },
@@ -86,34 +85,6 @@
                 'domain': 'elimu-kwanza.de',
             },
         },
-        'left4dead2': {
-            'servers': {
-                'standard': {
-                    'port': 27020,
-                },
-                # 'standard-2': {
-                #     'port': 27021,
-                #     'workshop': {
-                #         #2256379828, # bhop detect
-                #     },
-                # },
-            },
-            'admins': {
-                'STEAM_1:0:12376499', # CroneKorkN ☮️UKRAINE❤
-                'STEAM_1:1:169960486', # *RED*
-                'STEAM_1:1:112940736', # Ðark-AnGeℓ❤
-                'STEAM_1:1:34263261', # Alekc
-                'STEAM_1:0:583132949', # Cat
-                'STEAM_1:0:610180592', # SonovaBeach
-                'STEAM_1:1:157619181', # Null
-            },
-            'workshop': {
-                214630948,
-                1229957234,
-                698857882,
-            },
-            'steamgroups': {'103582791467869287'},
-        },
         'letsencrypt': {
             'domains': {
                 'ckn.li': {},
@@ -224,6 +195,11 @@
                         '10.0.227.0/24',
                     ],
                 },
+                'mseibert.yourls': {
+                    'allowed_ips': [
+                        '10.0.228.0/24',
+                    ],
+                },
             },
             'clients': {
                 'macbook': {

nodes/mseibert.freescout.py

@@ -46,7 +46,6 @@
                         '10.0.2.0/24',
                         '10.0.9.0/24',
                         '10.0.10.0/24',
-                        '10.0.10.0/24',
                     ],
                 },
             },

nodes/mseibert.yourls.py

@@ -4,13 +4,13 @@
 {
     'hostname': '168.119.250.114',
     'groups': [
-        #'backup',
+        'backup',
         'debian-12',
-        #'monitored',
+        'monitored',
         'webserver',
     ],
     'bundles': [
-        #'wireguard',
+        'wireguard',
         'mariadb',
         'php',
         'yourls',
@@ -21,7 +21,7 @@
         'network': {
             'internal': {
                 'interface': 'ens10',
-                'ipv4': '10.0.227.4/24',
+                'ipv4': '10.0.228.2/24',
             },
             'external': {
                 'interface': 'eth0',
@@ -40,13 +40,26 @@
             },
         },
         # FIXME:
-        'overwrite_nameservers': [
+        # 'overwrite_nameservers': [
-            '8.8.8.8',
+        #     '8.8.8.8',
-        ],
+        # ],
         'vm': {
             'cores': 2,
             'ram': 4096,
         },
+        'wireguard': {
+            'my_ip': '172.30.0.239/32',
+            's2s': {
+                'htz.mails': {
+                    'allowed_ips': [
+                        '10.0.0.0/24',
+                        '10.0.2.0/24',
+                        '10.0.9.0/24',
+                        '10.0.10.0/24',
+                    ],
+                },
+            },
+        },
         'zfs': {
             'pools': {
                 'tank': {