From 15027bf507360531d04e08b085baaef8f52babca Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 31 Jul 2013 15:12:57 -0400 Subject: Mirror modification to check_http_regex_url in commit b0a5c09 to debian/ubuntu commands. --- manifests/defaults/commands.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index bb19638..4af237e 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -18,7 +18,7 @@ class nagios::defaults::commands { check_https_url: command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$'; check_https_url_regex: - command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -e $ARG3$'; + command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -e $ARG4$'; check_mysql_db: command_line => '$USER1$/check_mysql -H $ARG1$ -P $ARG2$ -u $ARG3$ -p $ARG4$ -d $ARG5$'; check_ntp_time: -- cgit v1.2.3 From 3c04ed34ed2420733ace82d962d4bd0c90815f2b Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 31 Jul 2013 15:43:24 -0400 Subject: Correct erroneous previous commit --- manifests/defaults/commands.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp index 4af237e..cc8aa53 100644 --- a/manifests/defaults/commands.pp +++ b/manifests/defaults/commands.pp @@ -14,11 +14,11 @@ class nagios::defaults::commands { check_http_url: command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$'; check_http_url_regex: - command_line => '$USER1$/check_http -H $ARG1$ -u $ARG2$ -e $ARG3$'; + command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -e $ARG4$'; check_https_url: command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$'; check_https_url_regex: - command_line => '$USER1$/check_http -H $ARG1$ -p $ARG2$ -u $ARG3$ -e $ARG4$'; + command_line => '$USER1$/check_http --ssl -H $ARG1$ -u $ARG2$ -e $ARG3$'; check_mysql_db: command_line => '$USER1$/check_mysql -H $ARG1$ -P $ARG2$ -u $ARG3$ -p $ARG4$ -d $ARG5$'; check_ntp_time: -- cgit v1.2.3 From f87223c4cbd6445010b7189f06b043286c3b1958 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 20 Feb 2014 15:44:15 -0500 Subject: Fix source URL for apache config --- manifests/apache.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/apache.pp b/manifests/apache.pp index a90d0ee..b89ff5d 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -14,9 +14,9 @@ class nagios::apache( 'debian': { file { "${nagios::defaults::vars::int_cfgdir}/apache2.conf": ensure => present, - source => [ "puppet:///site_nagios/configs/${::fqdn}/apache2.conf", - "puppet:///site_nagios/configs/apache2.conf", - "puppet:///nagios/configs/apache2.conf"], + source => [ "puppet:///modules/site_nagios/configs/${::fqdn}/apache2.conf", + "puppet:///modules/site_nagios/configs/apache2.conf", + "puppet:///modules/nagios/configs/apache2.conf"], } apache::config::global { "nagios3.conf": -- cgit v1.2.3 From 92569fe8cf9770fde6a5e2bde79ad2f5978e0224 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 12 Feb 2015 15:02:40 -0500 Subject: Don't screw up ENV["PATH"] for other platforms --- lib/facter/mountpoints.rb | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/facter/mountpoints.rb b/lib/facter/mountpoints.rb index c51e6e6..da2f2a9 100644 --- a/lib/facter/mountpoints.rb +++ b/lib/facter/mountpoints.rb @@ -12,21 +12,23 @@ begin require 'filesystem' rescue Exception => e confine :kernel => :linux - ENV["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin" - fs_source = nil - if FileTest.exists?("/etc/mtab") - fs_source = "/etc/mtab" - elsif FileTest.exists?("/proc/mounts") - fs_source = "/proc/mounts" - end + setcode do + ENV["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin" + fs_source = nil + if FileTest.exists?("/etc/mtab") + fs_source = "/etc/mtab" + elsif FileTest.exists?("/proc/mounts") + fs_source = "/proc/mounts" + end - mounts = File.read(fs_source).split("\n") - mounts.each do |mount| - mount = mount.split(" ") - if ((not ignorefs.include?(mount[2])) && (mount[3] !~ /bind/) && (not devices.include?(mount[0])) && (not mountpoints.include?(mount[1]))) - mountpoints.push(mount[1]) + mounts = File.read(fs_source).split("\n") + mounts.each do |mount| + mount = mount.split(" ") + if ((not ignorefs.include?(mount[2])) && (mount[3] !~ /bind/) && (not devices.include?(mount[0])) && (not mountpoints.include?(mount[1]))) + mountpoints.push(mount[1]) + end + devices.push(mount[0]) if not devices.include?(mount[0]) end - devices.push(mount[0]) if not devices.include?(mount[0]) end else FileSystem.mounts.each do |m| -- cgit v1.2.3 From a34481e68e0810bc176360b820397a3da11ec514 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 7 Apr 2015 16:22:33 -0400 Subject: Add missing DirectoryIndex index.php to the pnp4nagios apache config snippet --- files/pnp4nagios/apache.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/files/pnp4nagios/apache.conf b/files/pnp4nagios/apache.conf index 8f66756..816bf05 100644 --- a/files/pnp4nagios/apache.conf +++ b/files/pnp4nagios/apache.conf @@ -27,4 +27,5 @@ Alias /pnp4nagios "/usr/share/pnp4nagios/html" # Rewrite all other URLs to index.php/URL RewriteRule .* index.php/$0 [PT,L] + DirectoryIndex index.php -- cgit v1.2.3