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/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',
     ],