From 7570b9135b254e8797a17b540b1c6e69894421ed Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sat, 19 Jun 2021 01:27:43 +0200
Subject: [PATCH] wip

---
 bundles/apt/items.py        |  40 ++++++++++++++++++++++++++++++++++++
 bundles/apt/metadata.py     |   6 ++++++
 bundles/dovecot/metadata.py |   1 -
 bundles/gcloud/items.py     |   0
 bundles/gcloud/metadata.py  |  12 +++++++++++
 data/apt/keys/gcloud.gpg    | Bin 0 -> 2537 bytes
 groups/os/debian-10.py      |   1 +
 groups/os/debian.py         |  12 +++++++++++
 nodes/htz.mails.py          |   1 +
 9 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 bundles/apt/metadata.py
 create mode 100644 bundles/gcloud/items.py
 create mode 100644 bundles/gcloud/metadata.py
 create mode 100644 data/apt/keys/gcloud.gpg

diff --git a/bundles/apt/items.py b/bundles/apt/items.py
index df661a4..1d19c32 100644
--- a/bundles/apt/items.py
+++ b/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
diff --git a/bundles/apt/metadata.py b/bundles/apt/metadata.py
new file mode 100644
index 0000000..9919741
--- /dev/null
+++ b/bundles/apt/metadata.py
@@ -0,0 +1,6 @@
+defaults = {
+    'apt': {
+        'packages': {},
+        'sources': {},
+    },
+}
diff --git a/bundles/dovecot/metadata.py b/bundles/dovecot/metadata.py
index 44be492..fb75bf5 100644
--- a/bundles/dovecot/metadata.py
+++ b/bundles/dovecot/metadata.py
@@ -24,5 +24,4 @@ defaults = {
             'dbuser': 'mailserver',
         },
     },
-
 }
diff --git a/bundles/gcloud/items.py b/bundles/gcloud/items.py
new file mode 100644
index 0000000..e69de29
diff --git a/bundles/gcloud/metadata.py b/bundles/gcloud/metadata.py
new file mode 100644
index 0000000..80a08a2
--- /dev/null
+++ b/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',
+        },
+    },
+}
diff --git a/data/apt/keys/gcloud.gpg b/data/apt/keys/gcloud.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..3f0b5a850ba73c4b6d7fe5b206030ee9d0b4da46
GIT binary patch
literal 2537
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

literal 0
HcmV?d00001

diff --git a/groups/os/debian-10.py b/groups/os/debian-10.py
index 13421f1..558816e 100644
--- a/groups/os/debian-10.py
+++ b/groups/os/debian-10.py
@@ -9,6 +9,7 @@
         'postgresql': {
             'version': '11',
         },
+        'os_release': 'buster',
     }, 
     'os_version': (10,),
 }
diff --git a/groups/os/debian.py b/groups/os/debian.py
index e1eb4d9..70aab0c 100644
--- a/groups/os/debian.py
+++ b/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',
 }
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index ddb2492..8bd417f 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -8,6 +8,7 @@
         'dnsserver',
     ],
     'bundles': [
+        'gcloud',
         'wireguard',
         'zfs',
     ],