* fix: adapting to new buster default origins voxpupuli#145

ekohl · Aug 26, 2019 · 9c4f8c5 · 9c4f8c5
1 parent a5096e4
commit 9c4f8c5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -50,12 +50,23 @@
       case $xfacts['lsbdistcodename'] {
         'squeeze', 'wheezy': {
           $legacy_origin      = true
-          $origins             =  ['${distro_id} ${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
-                                  '${distro_id} ${distro_codename}-lts',] #lint:ignore:single_quote_string_with_variables
+          $origins            = [
+            '${distro_id} ${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
+            '${distro_id} ${distro_codename}-lts', #lint:ignore:single_quote_string_with_variables
+          ]
+        }
+        'buster': {
+          $legacy_origin      = false
+          $origins            = [
+            'origin=Debian,codename=${distro_codename},label=Debian', #lint:ignore:single_quote_string_with_variables
+            'origin=Debian,codename=${distro_codename},label=Debian-Security', #lint:ignore:single_quote_string_with_variables
+          ]
         }
         default: {
           $legacy_origin      = false
-          $origins            = ['origin=Debian,codename=${distro_codename},label=Debian-Security',] #lint:ignore:single_quote_string_with_variables
+          $origins            = [
+            'origin=Debian,codename=${distro_codename},label=Debian-Security', #lint:ignore:single_quote_string_with_variables
+          ]
         }
       }
     }

diff --git a/spec/classes/debian_spec.rb b/spec/classes/debian_spec.rb
@@ -150,6 +150,7 @@
               ).with_content(
                 # This section varies for different releases
                 /\Unattended-Upgrade::Origins-Pattern\ {\n
+                \t"origin=Debian,codename=\${distro_codename},label=Debian";\n
                 \t"origin=Debian,codename=\${distro_codename},label=Debian-Security";\n
                 };/x
               )