3 files changed, 27 insertions, 2 deletions
diff --git a/manifests/firma.pp b/manifests/firma.pp
index 2f9bbe9..d03e770 100644
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -34,6 +34,7 @@ class mail::firma(
     revision => 'df18d0c7060007aaa757ea749bcbb66814d1f4ce',
     owner    => 'firma',
     group    => 'firma',
+    user     => 'firma',
     require  => [ User['firma'], Group['firma'] ],
   }
 
diff --git a/manifests/spamassassin.pp b/manifests/spamassassin.pp
index ea03567..6b56961 100644
--- a/manifests/spamassassin.pp
+++ b/manifests/spamassassin.pp
@@ -9,7 +9,20 @@ class mail::spamassassin {
   }
 
   service { 'spamassassin':
-    ensure  => running,
+    name    => $::lsbdistcodename ? {
+      'bookworm' => 'spamassassin-maintenance',
+      'bullseye' => 'spamassassin',
+      'buster'   => 'spamassassin',
+      'stretch'  => 'spamassassin',
+      default => 'spamassassin-maintenance',
+    },
+    ensure => $::lsbdistcodename ? {
+      'bookworm' => undef,
+      'bullseye' => running,
+      'buster'   => running,
+      'stretch'  => running,
+      default => undef,
+    },
     enable  => true,
     pattern => "spamd",
     require => File['/etc/default/spamassassin'],
diff --git a/manifests/virtual/packages.pp b/manifests/virtual/packages.pp
index 4dc173c..1c36548 100644
--- a/manifests/virtual/packages.pp
+++ b/manifests/virtual/packages.pp
@@ -5,7 +5,18 @@ class mail::virtual::packages {
     ensure => absent,
   }
 
-  package { [ 'libpam-mysql', 'libgsasl7' ]:
+  package { [ 'libpam-mysql', ]:
+    ensure => installed,
+  }
+
+  package { [ 'libgsasl', ]:
+    name => $::lsbdistcodename ? {
+      'bookworm' => 'libgsasl18',
+      'bullseye' => 'libgsasl7',
+      'buster'   => 'libgsasl7',
+      'stretch'  => 'libgsasl7',
+      default    => 'libgsasl',
+    },
     ensure => installed,
   }