bundles/backup/metadata.py

@@ -7,7 +7,7 @@ defaults = {
     },
     'backup': {
         'server': None,
-        'paths': {},
+        'paths': [],
     },
     'systemd-timers': {
         f'backup': {

bundles/java/metadata.py

@@ -1,16 +0,0 @@
-assert node.os == 'debian'
-
-if node.os_version == (10,):
-    version = 11
-elif node.os_version == (11,):
-    version = 17
-else:
-    raise Exception('java bundle doesnt support this os and version')
-
-defaults = {
-    'apt': {
-        'packages': {
-            f'openjdk-{version}-jre': {},
-        }
-    }
-}

bundles/minecraft/items.py

@@ -1,31 +0,0 @@
-users = {
-    'minecraft': {},
-}
-
-directories = {
-    '/opt/minecraft': {
-        'owner': 'minecraft',
-    },
-}
-
-downloads = {
-    '/opt/minecraft/server.jar': {
-        'url': node.metadata.get('minecraft/download'),
-        'sha256': node.metadata.get('minecraft/sha256'),
-    }
-}
-
-files = {
-    '/opt/minecraft/eula.txt': {
-        'content': 'eula=true',
-    }
-}
-
-svc_systemd = {
-    'minecraft': {
-        'needs': {
-            'file:/opt/minecraft/eula.txt',
-            'download:/opt/minecraft/server.jar',
-        },
-    },
-}

bundles/minecraft/metadata.py

@@ -1,20 +0,0 @@
-assert node.has_bundle('java')
-
-defaults = {
-    'systemd': {
-        'units': {
-            'minecraft.service': {
-                'Unit': {
-                    'Description': 'minecraft',
-                    'After': 'network.target',
-                },
-                'Service': {
-                    'User': 'minecraft',
-                    'WorkingDirectory': '/opt/minecraft',
-                    'ExecStart': '/usr/bin/java -Xms1024M -Xmx2560M -jar /opt/minecraft/server.jar nogui',
-                    'Restart': 'always',
-                },
-            },
-        },
-    },
-}

bundles/nextcloud/metadata.py

@@ -32,9 +32,9 @@ defaults = {
         },
     },
     'backup': {
-        'paths': {
+        'paths': [
             '/etc/nextcloud/config.php',
-        },
+        ],
     },
     'nextcloud': {
         'admin_user': 'admin',

bundles/postfix/metadata.py

@@ -6,9 +6,9 @@ defaults = {
         }
     },
     'backup': {
-        'paths': {
+        'paths': [
             '/var/vmail',
-        },
+        ],
     },
     'letsencrypt': {
         'reload_after': {

bundles/postgresql/metadata.py

@@ -7,9 +7,9 @@ defaults = {
         },
     },
     'backup': {
-        'paths': {
+        'paths': [
             '/var/lib/postgresql',
-        },
+        ],
     },
     'postgresql': {
         'roles': {
@@ -20,7 +20,7 @@ defaults = {
         },
         'databases': {},
     },
-    'grafana_rows': {},
+    'grafana_rows': [],
 }
 
 if node.has_bundle('zfs'):

bundles/telegraf/metadata.py

@@ -50,12 +50,12 @@ defaults = {
             },
         },
     },
-    'grafana_rows': {
+    'grafana_rows': [
         'cpu',
         'mem',
         'disk_io',
         'net_io',
-    },
+    ],
 }
 
 

bundles/zfs/metadata.py

@@ -103,10 +103,10 @@ def dataset_defaults(metadata):
 def backup(metadata):
     return {
         'backup': {
-            'paths': {
+            'paths': [
                 options['mountpoint']
                     for options in metadata.get('zfs/datasets').values()
                     if options.get('backup', True)
-            },
+            ],
         },
     }

nodes/htz.games.py

@@ -1,33 +1,14 @@
 {
-    'hostname': '159.69.93.165',
+    'dummy': True,
     'groups': [
         'backup',
-        'debian-11',
+        'debian-10',
     ],
     'bundles': [
-#        'steam',
+        'steam',
-#        'l4d2',
+        'l4d2',
-        'java',
-        'minecraft',
     ],
     'metadata': {
         'id': '353bb086-f3ce-4f36-8533-e91786c91ed9',
-        'network': {
-            'internal': {
-                'interface': 'ens10',
-                'ipv4': '10.0.10.3/24',
-            },
-            'external': {
-                'interface': 'eth0',
-                'ipv4': '159.69.93.165/32',
-                'ipv6': '2a01:4f8:c2c:867::2/64',
-                'gateway4': '172.31.1.1',
-                'gateway6': 'fe80::1',
-            }
-        },
-        'minecraft': {
-            'download': 'https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar',
-            'sha256': 'e8c211b41317a9f5a780c98a89592ecb72eb39a6e475d4ac9657e5bc9ffaf55f',
-        },
     },
 }