Merge remote-tracking branch 'origin/release/v0.2.0'0.2.0

1 files changed, 38 insertions, 0 deletions

diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
new file mode 100644
index 00000000..c98a8a1f
--- /dev/null
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -0,0 +1,38 @@
+class site_nagios::server inherits nagios::base {
+
+  # First, purge old nagios config (see #1467)
+  class { 'site_nagios::server::purge':
+    stage => initial
+  }
+
+  $nagios_hiera=hiera('nagios')
+  $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw'])
+  $hosts = $nagios_hiera['hosts']
+
+  include nagios::defaults
+  include nagios::base
+  #Class ['nagios'] -> Class ['nagios::defaults']
+  class {'nagios::apache':
+    allow_external_cmd => true,
+    stored_config      => false,
+    #before             => Class ['nagios::defaults']
+  }
+
+  File ['nagios_htpasswd'] {
+    source  => undef,
+    content => "nagiosadmin:$nagiosadmin_pw",
+    mode    => '0640',
+  }
+
+
+  # deploy serverside plugins
+  file { '/usr/lib/nagios/plugins/check_openvpn_server.pl':
+    source => 'puppet:///modules/nagios/plugins/check_openvpn_server.pl',
+    mode   => '0755',
+    owner  => 'nagios',
+    group  => 'nagios',
+  }
+
+  site_nagios::add_host {$hosts:}
+  include site_shorewall::monitor
+}