more work on bringing uptodate with bullseye release

manifests/chroot.pp

@@ -12,9 +12,10 @@
 
 define su_debuild::chroot(
   Enum['present', 'absent']
-                   $ensure       = undef,
-  Optional[String] $distribution = undef,
-  String           $debian_type  = undef,
+                   $ensure            = undef,
+  Optional[String] $distribution      = undef,
+  String           $debian_type       = undef,
+  Boolean          $include_backports = true,
 ) {
 
   $distribution_real = $distribution ? {
@@ -27,13 +28,6 @@ define su_debuild::chroot(
     $config  = "/etc/pbuilder/${name}-no-stanford-keyring"
     $options = "--distribution ${distribution_real} --configfile ${config}"
 
-    # Do we include the backports distribution? Yes, but only for the
-    # more recent releases.
-    if ($distribution_real =~ /buster|stretch/) {
-      $include_backports = true
-    } else {
-      $include_backports = false
-    }
     # We need two versions of each pbuilder configuration file: one
     # with stanford-keyring and one without.
     su_debuild::pbuilder_conf { "${distribution_real}-with-stanford-keyring":

manifests/chroots.pp

@@ -22,6 +22,7 @@ class su_debuild::chroots (
     # Define the environments we know about.
     $code_to_debian_type = {
       'sid'      =>  'debian',
+      'bookworm' =>  'debian',
       'bullseye' =>  'debian',
       'buster'   =>  'debian',
       'stretch'  =>  'debian',

manifests/init.pp

@@ -85,15 +85,12 @@ class su_debuild (
         'maven2':      ensure => installed;
       }
     }
-    'stretch','buster': {
+    default: {
       package {
         'apache2-dev': ensure => installed;
         'maven':       ensure => installed;
       }
     }
-    default: {
-      crit("unknown distribution ${::lsbdistcodename}")
-    }
   }
 
   ## Install ubuntu-archive-keyring
@@ -108,14 +105,11 @@ class su_debuild (
         'linux-headers-3.16.0-4-all': ensure => installed;
       }
     }
-    'stretch','buster': {
+    default: {
       package {
         'linux-headers-amd64': ensure => installed;
       }
     }
-    default: {
-      crit("unknown distribution ${::lsbdistcodename}")
-    }
   }
 
   # Configuration and cache directory for Maven.