wip

bundles/apt/items.py

@@ -1,3 +1,21 @@
+from glob import glob
+from os.path import join, basename
+
+directories = {
+    '/etc/apt/sources.list.d': {
+        'purge': True,
+        'triggers': {
+            'action:apt_update',
+        },
+    },
+} 
+
+files = {
+    '/etc/apt/sources.list': {
+        'content': '# managed'
+    },
+}
+
 actions = {
     'apt_update': {
         'command': 'apt-get update',
@@ -9,5 +27,27 @@ actions = {
     },
 }
 
+for name, content in node.metadata.get('apt/sources').items():
+    files[f'/etc/apt/sources.list.d/{name}.list'] = {
+        'content': content.format(
+            release=node.metadata.get('os_release')
+        ),
+        'triggers': {
+            'action:apt_update',
+        },
+    }
+    
+    matches = glob(join(repo.path, 'data', 'apt', 'keys', f'{name}.*'))
+    if matches:
+        assert len(matches) == 1
+        files[f'/etc/apt/trusted.gpg.d/{basename(matches[0])}'] = {
+            'source': matches[0],
+            'content_type': 'binary',
+            'triggers': {
+                'action:apt_update',
+            },
+        }
+
+
 for package, options in node.metadata.get('apt/packages', {}).items():
     pkg_apt[package] = options

bundles/apt/metadata.py

@@ -0,0 +1,6 @@
+defaults = {
+    'apt': {
+        'packages': {},
+        'sources': {},
+    },
+}

bundles/bind/files/zonefile

@@ -0,0 +1,12 @@
+$TTL 600
+@   IN  SOA     ns.sublimity.de. admin.sublimity.de. (
+        2020080302  ;Serial
+        1200        ;Refresh
+        600         ;Retry
+        1209600     ;Expire
+        600         ;Negative response caching TTL
+)
+
+% for record in records:
+${record[0].ljust(max_name)} IN ${record[1].ljust(max_type)} ${record[2]}
+% endfor

bundles/bind/items.py

@@ -0,0 +1,8 @@
+# for zone, records in node.metadata.get('bind/zones').items():
+#     files[f'/var/lib/bind/{zone}'] = {
+#         'source': 'zonefile',
+#         'content_type': 'mako',
+#         'context': {
+#             'records': records,
+#         }
+#     }

bundles/bind/metadata.py

@@ -1,4 +1,9 @@
 defaults = {
+    'apt': {
+        'packages': {
+            'bind9': {},
+        },
+    },
     'bind': {
         'zones': {},
     },
@@ -12,7 +17,6 @@ def collect_records(metadata):
     zones = metadata.get('bind/zones')
     
     for other_node in repo.nodes:
-        print(other_node.name)
         for fqdn, records in other_node.metadata.get('dns').items():
             matching_zones = sorted(
                 filter(

bundles/dovecot/metadata.py

@@ -24,5 +24,4 @@ defaults = {
             'dbuser': 'mailserver',
         },
     },
-
 }

bundles/gcloud/metadata.py

@@ -0,0 +1,12 @@
+defaults = {
+    'apt': {
+        'packages': {
+            'apt-transport-https': {},
+            'ca-certificates': {},
+            'gnupg': {},
+        },
+        'sources': {
+            'gcloud': 'deb https://packages.cloud.google.com/apt cloud-sdk main',
+        },
+    },
+}

groups/os/debian-10.py

@@ -9,6 +9,7 @@
         'postgresql': {
             'version': '11',
         },
+        'os_release': 'buster',
     }, 
     'os_version': (10,),
 }

groups/os/debian.py

@@ -5,6 +5,18 @@
     'bundles': [
         'apt',
     ],
+    'metadata': {
+        'apt': {
+            'sources': {
+                'debian': '\n'.join([
+                    'deb http://deb.debian.org/debian {release} main non-free contrib',
+                    'deb http://deb.debian.org/debian {release}-updates main contrib non-free',
+                    'deb http://security.debian.org/debian-security {release}/updates main contrib non-free',
+                    'deb http://deb.debian.org/debian {release}-backports main contrib non-free',
+                ]),
+            },
+        },
+    },
     'os': 'debian',
     'pip_command': 'pip3',
 }

nodes/htz.mails.py

@@ -8,6 +8,7 @@
         'dnsserver',
     ],
     'bundles': [
+        'gcloud',
         'wireguard',
         'zfs',
     ],