Merge branch 'koumbit'

4 files changed, 3 insertions, 31 deletions

diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg
index 377da6b..8eae393 100644
--- a/files/configs/Debian/nagios.cfg
+++ b/files/configs/Debian/nagios.cfg
@@ -20,6 +20,7 @@ log_file=/var/log/nagios3/nagios.log
 # host groups, contacts, contact groups, services, etc.
 # You can split your object definitions across several config files
 # if you wish (as shown below), or keep them all in a single config file.
+cfg_file=/etc/nagios3/commands.cfg
 
 # Puppet-managed configuration files
 cfg_dir=/etc/nagios3/conf.d
diff --git a/files/configs/Debian/private/resource.cfg.amd64 b/files/configs/Debian/private/resource.cfg.amd64
new file mode 120000
index 0000000..4d5f0a3
--- /dev/null
+++ b/files/configs/Debian/private/resource.cfg.amd64
@@ -0,0 +1 @@
+resource.cfg.i386
\ No newline at end of file
diff --git a/files/configs/Debian/private/resource.cfg.x86_64 b/files/configs/Debian/private/resource.cfg.x86_64
index 3ed732b..4d5f0a3 100644..120000
--- a/files/configs/Debian/private/resource.cfg.x86_64
+++ b/files/configs/Debian/private/resource.cfg.x86_64
@@ -1,31 +1 @@
-###########################################################################
-#
-# RESOURCE.CFG - Resource File for Nagios 
-#
-# You can define $USERx$ macros in this file, which can in turn be used
-# in command definitions in your host config file(s).  $USERx$ macros are
-# useful for storing sensitive information such as usernames, passwords, 
-# etc.  They are also handy for specifying the path to plugins and 
-# event handlers - if you decide to move the plugins or event handlers to
-# a different directory in the future, you can just update one or two
-# $USERx$ macros, instead of modifying a lot of command definitions.
-#
-# The CGIs will not attempt to read the contents of resource files, so
-# you can set restrictive permissions (600 or 660) on them.
-#
-# Nagios supports up to 32 $USERx$ macros ($USER1$ through $USER32$)
-#
-# Resource files may also be used to store configuration directives for
-# external data sources like MySQL...
-#
-###########################################################################
-
-# Sets $USER1$ to be the path to the plugins
-$USER1$=/usr/lib/nagios/plugins
-
-# Sets $USER2$ to be the path to event handlers
-#$USER2$=/usr/lib/nagios/plugins/eventhandlers
-
-# Store some usernames and passwords (hidden from the CGIs)
-#$USER3$=someuser
-#$USER4$=somepassword
+resource.cfg.i386
\ No newline at end of file
diff --git a/files/htpasswd.users b/files/htpasswd.users
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/files/htpasswd.users