#4612 - Enable External Commands in Nagios

modules/nagios/manifests/server.pp

 class nagios::server(
+    $directory = hiera('nagios::server::directory', '/var/lib/nagios3'),

[mathias, 2017/10/25 16:53:42]

This technique is not necessary any more, we've been using it to emulate Puppet
3 behavior in Puppet 2. Today you can assign the default values directly, and
Puppet will worry about the Hiera lookup.

[f.nicolaisen, 2017/10/26 07:45:04]

Noted for next time!

     $domain,
     $certificate,
     $private_key,
     $is_default=false,
     $htpasswd_source,
     $admins,
     $zone,
     $contacts = hiera('nagios::server::contacts', {}),
     $contactgroups = hiera('nagios::server::contactgroups', {}),
     $commands = hiera('nagios::server::commands', {}),
@@ skipping 32 matching lines @@
   }
 
   spawn_fcgi::php_pool {'global':
     ensure => present,
     socket => '/tmp/php-fastcgi.sock',
     children => '3',
     require => Package['php5-cgi']
   }
 
   # See http://hub.eyeo.com/issues/4612#note-2
-  if $::operatingsystem == 'Debian' {
-    exec {'override-nagios-dpkg-stats':
-      command => 'dpkg-statoverride --update --add nagios www-data 2710 /var/lib/nagios3/rw && dpkg-statoverride --update --add nagios nagios 751 /var/lib/nagios3',

[mathias, 2017/10/25 10:31:47]

Please use shellquote() to aggregate the $command and $unless parameter values.
You should also be able to DRY (NRY?) by only exchanging the 2nd item / 1st
option value, e.g. "--update" and "--list".

[f.nicolaisen, 2017/10/25 14:36:09]

Acknowledged.

-      unless => 'dpkg-statoverride --list nagios www-data 2710 /var/lib/nagios3/rw && dpkg-statoverride --list nagios nagios 751 /var/lib/nagios3',
+  if $::osfamily == 'Debian' {
+
+    $dpkg_statoverride = 'dpkg-statoverride'
+    $dpkg_options = shellquote(['nagios', 'nagios', '751', "$directory"])
+    $dpkg_options_rw = shellquote(['nagios', 'www-data', '2710', "$directory/rw"])
+
+    exec {"$directory":
+      command => "$dpkg_statoverride --update --add $dpkg_options",
+      unless => "$dpkg_statoverride --list $dpkg_options",
+      path => ["/usr/bin/", "/bin/"],
+      user => root,
+      notify => Service['nagios3'],
+      require => Package['nagios3'],
+    }
+
+    exec {"$directory/rw":
+      command => "$dpkg_statoverride --update --add $dpkg_options_rw",
+      unless => "$dpkg_statoverride --list $dpkg_options_rw",
       path => ["/usr/bin/", "/bin/"],
       user => root,
       notify => Service['nagios3'],
       require => Package['nagios3'],
     }
   }
 
   service {'nagios3':
     ensure => running,
     enable => true,
-    require => [
-      Package['nagios3'],
-      Package['pnp4nagios'],
-    ],

[f.nicolaisen, 2017/10/25 10:01:12]

Hm, I accidentally included this change. I was working earlier with a version
that required the Exec above, but figured that the notify is sufficient.

[f.nicolaisen, 2017/10/25 14:36:09]

Acknowledged.

+    require => [Package['nagios3'], Package['pnp4nagios']]
   }
 
   service {'apache2':
     ensure => stopped,
     enable => false,
     require => Package['nagios3'],
     before => Service['nagios3']
   }
 
   file {'/etc/nagios3/htpasswd.users':
@@ skipping 94 matching lines @@
     notify => Service['nagios3']
   }
 
   create_resources(nagios_contact, $contacts)
   create_resources(nagios_contactgroup, $contactgroups)
   create_resources(nagios_command, $commands)
   create_resources(nagios_service, $services)
   create_resources(nagios_host, $hosts)
   create_resources(nagios_hostgroup, $hostgroups)
 }