wip

bundles/apt/items.py

@@ -79,9 +79,7 @@ for host, sources in hosts.items():
 for package, options in node.metadata.get('apt/packages', {}).items():    
     pkg_apt[package] = options
 
-    if options.get('backports', None):
-        pkg_apt[package].pop('backports')
-
+    if pkg_apt[package].pop('backports', False):
         files[f'/etc/apt/preferences.d/{package}'] = {
             'content': '\n'.join([
                 f"Package: {package}",

bundles/wireguard/metadata.py

@@ -9,7 +9,7 @@ defaults = {
         'packages': {
             'linux-headers-amd64': {},
             'wireguard': {
-                'backports': True,
+                'backports': node.os_version < (11,),
                 'needs': [
                     'pkg_apt:linux-headers-amd64',
                 ],

bundles/zfs/metadata.py

@@ -15,21 +15,21 @@ defaults = {
                 },
             },
             'zfs-dkms': {
-                'backports': True,
+                'backports': node.os_version < (11,),
                 'needed_by': {
                     'pkg_apt:zfs-zed',
                     'pkg_apt:zfsutils-linux',
                 },
             },
             'zfs-zed': {
-                'backports': True,
+                'backports': node.os_version < (11,),
                 'needed_by': {
                     'zfs_dataset:',
                     'zfs_pool:',
                 },
             },
             'zfsutils-linux': {
-                'backports': True,
+                'backports': node.os_version < (11,),
                 'needed_by': {
                     'pkg_apt:zfs-zed',
                     'zfs_dataset:',

groups/os/debian-10.py

@@ -3,6 +3,11 @@
         'debian',
     ],
     'metadata': {
+        'apt': {
+            'sources': [
+                'deb http://security.debian.org/debian-security {release}/updates main contrib non-free',
+            ],
+        },
         'php': {
             'version': '7.3',
         },

groups/os/debian-11.py

@@ -0,0 +1,20 @@
+{
+    'supergroups': [
+        'debian',
+    ],
+    'metadata': {
+        'apt': {
+            'sources': [
+                'deb http://security.debian.org/ {release}-security main contrib non-free',
+            ],
+        },
+        'php': {
+            'version': '7.4',
+        },
+        'postgresql': {
+            'version': '13',
+        },
+        'os_release': 'bullseye',
+    }, 
+    'os_version': (11,),
+}

groups/os/debian.py

@@ -10,7 +10,6 @@
             'sources': [
                 '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',
             ],
             'packages': {