X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpuppetmaster.pp;h=100565c2d75dfb3a32ffc34f04f20a919b0e3a60;hb=e9e6c1abe830ad5d653c9afd237f437fb07ee3ed;hp=9886652ec214b85908bd54012752864ca631b09b;hpb=43f016d839e1a4ffa48052e8bc1524f712a6dd84;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/puppetmaster.pp b/modules/roles/manifests/puppetmaster.pp index 9886652ec..100565c2d 100644 --- a/modules/roles/manifests/puppetmaster.pp +++ b/modules/roles/manifests/puppetmaster.pp @@ -12,15 +12,16 @@ class roles::puppetmaster { collect_tag => 'puppetmaster', } - # we have installed a newer trapperkeeper-webserver-jetty9-clojure, + # 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/trapperkeeper-webserver-jetty9-clojure': - content => "trapperkeeper-webserver-jetty9-clojure\n", + 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':