Merge remote-tracking branch 'shared/master' into leap_master

Conflicts:
	manifests/defaults/commands.pp

2 files changed, 16 insertions, 13 deletions

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]
         </IfModule>
+        DirectoryIndex index.php
 </Directory>
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|