Merge branch 'salsa' into fordsa

diff --git a/modules/exim/files/common/exim_surbl.pl b/modules/exim/files/common/exim_surbl.pl
index 4c65b77..d2d0825 100644 (file)
--- a/modules/exim/files/common/exim_surbl.pl
+++ b/modules/exim/files/common/exim_surbl.pl
@@ -2,7 +2,7 @@
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 
--#
+#
 # Copyright (c) 2006-2012 Erik Mugele.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 9c147bf..49ca251 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -128,7 +128,7 @@ localpartlist local_only_users = lsearch;/etc/exim4/localusers
 
 localpartlist postmasterish = postmaster : abuse : hostmaster
 
-hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts ; 89.16.166.49 ; 2001:41b8:202:deb:bab5:0:52c3:4b4c
+hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts
 
 hostlist reservedaddrs = 0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/24 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5
 

diff --git a/modules/roles/manifests/puppetmaster.pp b/modules/roles/manifests/puppetmaster.pp
index af3855d..100565c 100644 (file)
--- a/modules/roles/manifests/puppetmaster.pp
+++ b/modules/roles/manifests/puppetmaster.pp
@@ -11,4 +11,22 @@ class roles::puppetmaster {
     target_user => 'puppet',
     collect_tag => 'puppetmaster',
   }
+
+  # we have installed a newer libtrapperkeeper-webserver-jetty9-clojure,
+  # cf. Debian#924005, Debian#930562
+  if versioncmp(Timestamp().strftime('%F'), '2019-12-01') <= 0 {
+    $ensure = versioncmp($::operatingsystemrelease, '10.1') <= 0 ? {
+      true    => 'present',
+      default => 'absent',
+    }
+    file { '/etc/nagios/obsolete-packages-ignore.d/libtrapperkeeper-webserver-jetty9-clojure':
+      ensure  => $ensure,
+      content => "libtrapperkeeper-webserver-jetty9-clojure\n",
+    }
+  } elsif versioncmp(Timestamp().strftime('%F'), '2020-02-01') <= 0 {
+    notify {'Temporary ignore rule expired, package should be in the archive':
+      loglevel => warning, }
+  } else {
+    fail('Clean up roles::puppetmaster')
+  }
 }