Merge branch 'testing'

manifests/dehydrated/client_define.pp

@@ -52,10 +52,11 @@
       minute  => fqdn_rand(60),
     }
   } else {
+    $minute_random = String(fqdn_rand(60))
     ensure_resource('sunet::scriptherder::cronjob',  "dehydrated_fetch_${server}", {
       cmd    => "sh -c 'ssh -Ti \$HOME/.ssh/id_${_ssh_id} root@${server} | /bin/tar xvf - -C /etc/dehydrated/certs && /usr/bin/le-ssl-compat.sh'",
       user   => $user,
-      minute => '*/20',
+      minute => $minute_random,
       ok_criteria   => ['exit_status=0', 'max_age=2h'],
       warn_criteria => ['exit_status=0', 'max_age=96h'],
     })

manifests/naemon_monitor.pp

@@ -30,6 +30,8 @@
   Optional[Boolean] $receive_otel = false,
   String $otel_retention = '2232h',
 ) {
+  include sunet::systemd_reload
+
   $naemon_container = $::facts['dockerhost2'] ? {
     'yes' => 'naemon_monitor-naemon-1',
     default => 'naemon_monitor_naemon_1',
@@ -105,6 +107,7 @@
     ensure  => file,
     content => template('sunet/naemon_monitor/service-override.conf.erb'),
     require => File['/etc/systemd/system/sunet-naemon_monitor.service.d/'],
+    notify  => Class['sunet::systemd_reload'],
   }
 
   sunet::docker_compose { 'naemon_monitor':
@@ -116,13 +119,12 @@
     require          => File['/etc/systemd/system/sunet-naemon_monitor.service.d/override.conf'],
   }
 
+
+  # This section can be removed when the class is run on all machines
   file { '/opt/naemon_monitor/stop-monitor.sh':
-    ensure  => file,
-    content => template('sunet/naemon_monitor/stop-monitor.sh.erb'),
-    mode    => '0644',
-    group   => 'root',
-    owner   => 'root',
+    ensure  => absent,
   }
+  #
 
   file { '/etc/logrotate.d/naemon_monitor':
     ensure  => file,

templates/naemon_monitor/service-override.conf.erb

@@ -1,6 +1,4 @@
 [Service]
-# Empty ExecStop from the main service file
-ExecStop=
-# Make sure that naemon has time to write down retention.dat
-ExecStop=/opt/naemon_monitor/stop-monitor.sh
-ExecReload=/usr/bin/docker exec <%= @naemon_container %> bash -c 'pkill -o naemon --signal HUP'
+# livestatus.so can't handle HUP with a TCP listner
+# https://github.com/naemon/naemon-livestatus/issues/117
+ExecReload=/usr/bin/docker restart <%= @naemon_container %>