X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fsoftware.rb;h=e622d35d1fc6d5d87c01543fc266fdde9ad2531e;hb=9a43f3b1435fcf021179ec30fab2e85e215db555;hp=2f2f1faadba6d7ae24d52256eed528baa902334b;hpb=e8ca37b8bf894ea44f0a98f56e5a082129feec25;p=mirror%2Fdsa-puppet.git

diff --git a/facts/software.rb b/facts/software.rb
index 2f2f1faad..e622d35d1 100644
--- a/facts/software.rb
+++ b/facts/software.rb
@@ -56,8 +56,19 @@ end
 Facter.add("php5") do
 	setcode do
 		FileTest.exist?("/usr/lib/apache2/modules/libphp5.so") or
-                FileTest.exist?("/usr/bin/php5") or
-                FileTest.exist?("/usr/bin/php5-cgi") or
-                FileTest.exist?("/usr/lib/cgi-bin/php5")
+		FileTest.exist?("/usr/bin/php5") or
+		FileTest.exist?("/usr/bin/php5-cgi") or
+		FileTest.exist?("/usr/lib/cgi-bin/php5")
+	end
+end
+Facter.add("php5suhosin") do
+	setcode do
+		FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or
+		FileTest.exist?("/usr/lib/php5/20060613+lfs/suhosin.so")
+	end
+end
+Facter.add("syslogversion") do
+	setcode do
+		%x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1}.chomp
 	end
 end