X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpuppetmaster.pp;h=100565c2d75dfb3a32ffc34f04f20a919b0e3a60;hb=6f0519ea008323e67f933fd1168c6c906f2c289d;hp=258fd43ab90a543ea31093990c9e1dcd83718237;hpb=3d94d3afb33844aa66dcb3c6e6f48711f7e865e9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/puppetmaster.pp b/modules/roles/manifests/puppetmaster.pp
index 258fd43ab..100565c2d 100644
--- a/modules/roles/manifests/puppetmaster.pp
+++ b/modules/roles/manifests/puppetmaster.pp
@@ -6,4 +6,27 @@ class roles::puppetmaster {
     target_user => 'dsa',
     collect_tag => 'puppetmaster',
   }
+
+  ssh::authorized_key_collect { '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')
+  }
 }