summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp11
1 files changed, 9 insertions, 2 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index fe3ab542..7c17fe82 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -1,7 +1,7 @@
-class site_nagios::server {
+class site_nagios::server inherits nagios::base {
$nagios_hiera=hiera('nagios')
- $nagiosadmin_pw = $nagios_hiera['nagiosadmin_pw']
+ $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw'])
$hosts = $nagios_hiera['hosts']
include nagios::defaults
@@ -13,6 +13,13 @@ class site_nagios::server {
#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',