From b52d91b8fcabf0c6b1cd648cf996b7468be60969 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 5 Oct 2014 12:36:29 +0200 Subject: get auto purging working again That purging resources work correctly, the config files must be at the location that the nagios providers have internally, which is at /etc/nagios/.cfg To ease the config file we used the cfg_dir option so far, which we can't anymore and hence this change requires adoption of your site modules. But auto-purging resources will then finally work. --- files/configs/CentOS/nagios.cfg | 18 +++++++++++++++--- files/configs/Debian/nagios.cfg | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 4 deletions(-) (limited to 'files/configs') diff --git a/files/configs/CentOS/nagios.cfg b/files/configs/CentOS/nagios.cfg index 1354bf8..fc6a391 100644 --- a/files/configs/CentOS/nagios.cfg +++ b/files/configs/CentOS/nagios.cfg @@ -31,9 +31,21 @@ log_file=/var/log/nagios/nagios.log # separate from host and contact definitions... # Puppet-managed configuration files -cfg_dir=/etc/nagios/conf.d - - +cfg_file=/etc/nagios/nagios_command.cfg +cfg_file=/etc/nagios/nagios_contact.cfg +cfg_file=/etc/nagios/nagios_contactgroup.cfg +cfg_file=/etc/nagios/nagios_host.cfg +cfg_file=/etc/nagios/nagios_hostdependency.cfg +cfg_file=/etc/nagios/nagios_hostescalation.cfg +cfg_file=/etc/nagios/nagios_hostextinfo.cfg +cfg_file=/etc/nagios/nagios_hostgroup.cfg +cfg_file=/etc/nagios/nagios_hostgroupescalation.cfg +cfg_file=/etc/nagios/nagios_service.cfg +cfg_file=/etc/nagios/nagios_servicedependency.cfg +cfg_file=/etc/nagios/nagios_serviceescalation.cfg +cfg_file=/etc/nagios/nagios_serviceextinfo.cfg +cfg_file=/etc/nagios/nagios_servicegroup.cfg +cfg_file=/etc/nagios/nagios_timeperiod.cfg # OBJECT CACHE FILE # This option determines where object definitions are cached when diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg index 8eae393..dca295c 100644 --- a/files/configs/Debian/nagios.cfg +++ b/files/configs/Debian/nagios.cfg @@ -23,7 +23,21 @@ log_file=/var/log/nagios3/nagios.log cfg_file=/etc/nagios3/commands.cfg # Puppet-managed configuration files -cfg_dir=/etc/nagios3/conf.d +cfg_file=/etc/nagios3/nagios_command.cfg +cfg_file=/etc/nagios3/nagios_contact.cfg +cfg_file=/etc/nagios3/nagios_contactgroup.cfg +cfg_file=/etc/nagios3/nagios_host.cfg +cfg_file=/etc/nagios3/nagios_hostdependency.cfg +cfg_file=/etc/nagios3/nagios_hostescalation.cfg +cfg_file=/etc/nagios3/nagios_hostextinfo.cfg +cfg_file=/etc/nagios3/nagios_hostgroup.cfg +cfg_file=/etc/nagios3/nagios_hostgroupescalation.cfg +cfg_file=/etc/nagios3/nagios_service.cfg +cfg_file=/etc/nagios3/nagios_servicedependency.cfg +cfg_file=/etc/nagios3/nagios_serviceescalation.cfg +cfg_file=/etc/nagios3/nagios_serviceextinfo.cfg +cfg_file=/etc/nagios3/nagios_servicegroup.cfg +cfg_file=/etc/nagios3/nagios_timeperiod.cfg # Debian also defaults to using the check commands defined by the debian # nagios-plugins package -- cgit v1.2.3 From 0941bc8c201bccaffaf40e51e04239fcc9fc0c7c Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 5 Oct 2014 13:54:39 +0200 Subject: add the default nagios templates file as well --- files/configs/CentOS/nagios.cfg | 1 + files/configs/Debian/nagios.cfg | 1 + 2 files changed, 2 insertions(+) (limited to 'files/configs') diff --git a/files/configs/CentOS/nagios.cfg b/files/configs/CentOS/nagios.cfg index fc6a391..b88e3db 100644 --- a/files/configs/CentOS/nagios.cfg +++ b/files/configs/CentOS/nagios.cfg @@ -31,6 +31,7 @@ log_file=/var/log/nagios/nagios.log # separate from host and contact definitions... # Puppet-managed configuration files +cfg_file=/etc/nagios/nagios_templates.cfg cfg_file=/etc/nagios/nagios_command.cfg cfg_file=/etc/nagios/nagios_contact.cfg cfg_file=/etc/nagios/nagios_contactgroup.cfg diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg index dca295c..ac02f4f 100644 --- a/files/configs/Debian/nagios.cfg +++ b/files/configs/Debian/nagios.cfg @@ -23,6 +23,7 @@ log_file=/var/log/nagios3/nagios.log cfg_file=/etc/nagios3/commands.cfg # Puppet-managed configuration files +cfg_file=/etc/nagios3/nagios_templates.cfg cfg_file=/etc/nagios3/nagios_command.cfg cfg_file=/etc/nagios3/nagios_contact.cfg cfg_file=/etc/nagios3/nagios_contactgroup.cfg -- cgit v1.2.3 From 7cb5f0625c929ccbc6029b6bb12f97f7f2bfe70a Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Thu, 8 Oct 2015 14:51:58 -0700 Subject: update the apache2.conf file updating to the debian 3.5.1.dfsg-2+b1 version of the file. mostly whitespace changes, one 2.2 vs 2.4 change and a change for docs. --- files/configs/apache2.conf | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'files/configs') diff --git a/files/configs/apache2.conf b/files/configs/apache2.conf index 14bb38b..f0f8b2f 100644 --- a/files/configs/apache2.conf +++ b/files/configs/apache2.conf @@ -1,8 +1,8 @@ # apache configuration for nagios 3.x # note to users of nagios 1.x and 2.x: -# throughout this file are commented out sections which preserve -# backwards compatibility with bookmarks/config for older nagios versios. -# simply look for lines following "nagios 1.x:" and "nagios 2.x" comments. +# throughout this file are commented out sections which preserve +# backwards compatibility with bookmarks/config for older nagios versios. +# simply look for lines following "nagios 1.x:" and "nagios 2.x" comments. ScriptAlias /cgi-bin/nagios3 /usr/lib/cgi-bin/nagios3 ScriptAlias /nagios3/cgi-bin /usr/lib/cgi-bin/nagios3 @@ -28,22 +28,34 @@ Alias /nagios3 /usr/share/nagios3/htdocs #Alias /nagios /usr/share/nagios3/htdocs - Options FollowSymLinks + Options FollowSymLinks - DirectoryIndex index.php index.html + DirectoryIndex index.php index.html - AllowOverride AuthConfig - Order Allow,Deny - Allow From All + AllowOverride AuthConfig - AuthName "Nagios Access" - AuthType Basic - AuthUserFile /etc/nagios3/htpasswd.users - # nagios 1.x: - #AuthUserFile /etc/nagios/htpasswd.users - require valid-user + + + Order Allow,Deny + Allow From All + + + = 2.3> + Require all denied + + + AuthName "Nagios Access" + AuthType Basic + AuthUserFile /etc/nagios3/htpasswd.users + # nagios 1.x: + #AuthUserFile /etc/nagios/htpasswd.users + require valid-user + + Options +ExecCGI + + # Enable this ScriptAlias if you want to enable the grouplist patch. # See http://apan.sourceforge.net/download.html for more info # It allows you to see a clickable list of all hostgroups in the -- cgit v1.2.3