X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fsoftware.rb;h=5c60dd4eb41c6ea7c6fc826dcf490af99a03c7ca;hb=4d96b30960a5287d55f2df86eb366945efc10c7b;hp=598d7a194d5ef89a087a0d2c654dbe7eb310b8fc;hpb=b9741e7d54f0069cd64cd80059ec7959acb3ce8b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb
index 598d7a194..5c60dd4eb 100644
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -1,46 +1,82 @@
 Facter.add("apache2") do
 	setcode do
-		FileTest.exist?("/usr/sbin/apache2")
+		if FileTest.exist?("/usr/sbin/apache2")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("clamd") do
 	setcode do
-		FileTest.exist?("/usr/sbin/clamd")
+		if FileTest.exist?("/usr/sbin/clamd")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("exim4") do
 	setcode do
-		FileTest.exist?("/usr/sbin/exim4")
+		if FileTest.exist?("/usr/sbin/exim4")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("postfix") do
 	setcode do
-		FileTest.exist?("/usr/sbin/postfix")
+		if FileTest.exist?("/usr/sbin/postfix")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("postgres81") do
 	setcode do
-		FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres")
+		if FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("postgres83") do
 	setcode do
-		FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
+		if FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("postgres84") do
 	setcode do
-		FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres")
+		if FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("postgres90") do
 	setcode do
-		FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres")
+		if FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("postgrey") do
 	setcode do
-		FileTest.exist?("/usr/sbin/postgrey")
+		if FileTest.exist?("/usr/sbin/postgrey")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("greylistd") do
@@ -50,31 +86,53 @@ Facter.add("greylistd") do
 end
 Facter.add("policydweight") do
 	setcode do
-		FileTest.exist?("/usr/sbin/policyd-weight")
+		if FileTest.exist?("/usr/sbin/policyd-weight")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("vsftpd") do
 	setcode do
-		FileTest.exist?("/usr/sbin/vsftpd")
+		if FileTest.exist?("/usr/sbin/vsftpd")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("spamd") do
 	setcode do
-		FileTest.exist?("/usr/sbin/spamd")
+		if FileTest.exist?("/usr/sbin/spamd")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("php5") do
-	setcode do
-		FileTest.exist?("/usr/lib/apache2/modules/libphp5.so") or
+	php =   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")
+	setcode do
+		if php
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("php5suhosin") do
-	setcode do
-		FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or
+	suhosin=FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or
 		FileTest.exist?("/usr/lib/php5/20060613+lfs/suhosin.so")
+	setcode do
+		if suhosin
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("syslogversion") do
@@ -84,12 +142,21 @@ Facter.add("syslogversion") do
 end
 Facter.add("rsyncd") do
 	setcode do
-		FileTest.exist?("/etc/rsyncd.conf")
+		if FileTest.exist?("/etc/rsyncd.conf")
+			true
+		else
+			''
+		end
 	end
 end
 Facter.add("unbound") do
-	setcode do
-		FileTest.exist?("/usr/sbin/unbound") and
+	unbound=FileTest.exist?("/usr/sbin/unbound") and
 		FileTest.exist?("/var/lib/unbound/root.key")
+	setcode do
+		if unbound
+			true
+		else
+			''
+		end
 	end
 end