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

diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb
index 5c60dd4eb..0843c256c 100644
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -34,36 +34,15 @@ Facter.add("postfix") do
 		end
 	end
 end
-Facter.add("postgres81") do
+Facter.add("postgres") do
 	setcode do
-		if FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres")
-			true
-		else
-			''
-		end
-	end
-end
-Facter.add("postgres83") do
-	setcode do
-		if FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
-			true
-		else
-			''
-		end
-	end
-end
-Facter.add("postgres84") do
-	setcode do
-		if FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres")
-			true
-		else
-			''
-		end
-	end
-end
-Facter.add("postgres90") do
-	setcode do
-		if FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres")
+		pg = (FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres") or
+		FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres") or
+		FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres") or
+		FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres") or
+		FileTest.exist?("/usr/lib/postgresql/9.1/bin/postgres") or
+		FileTest.exist?("/usr/lib/postgresql/9.2/bin/postgres"))
+		if pg
 			true
 		else
 			''
@@ -93,15 +72,6 @@ Facter.add("policydweight") do
 		end
 	end
 end
-Facter.add("vsftpd") do
-	setcode do
-		if FileTest.exist?("/usr/sbin/vsftpd")
-			true
-		else
-			''
-		end
-	end
-end
 Facter.add("spamd") do
 	setcode do
 		if FileTest.exist?("/usr/sbin/spamd")
@@ -112,10 +82,10 @@ Facter.add("spamd") do
 	end
 end
 Facter.add("php5") do
-	php =   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")
+		FileTest.exist?("/usr/lib/cgi-bin/php5"))
 	setcode do
 		if php
 			true
@@ -125,8 +95,8 @@ Facter.add("php5") do
 	end
 end
 Facter.add("php5suhosin") do
-	suhosin=FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or
-		FileTest.exist?("/usr/lib/php5/20060613+lfs/suhosin.so")
+	suhosin=(FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or
+		FileTest.exist?("/usr/lib/php5/20060613+lfs/suhosin.so"))
 	setcode do
 		if suhosin
 			true
@@ -140,20 +110,25 @@ Facter.add("syslogversion") do
 		%x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1-3}.chomp
 	end
 end
-Facter.add("rsyncd") do
+Facter.add("unbound") do
+	unbound=(FileTest.exist?("/usr/sbin/unbound") and
+		FileTest.exist?("/var/lib/unbound/root.key"))
 	setcode do
-		if FileTest.exist?("/etc/rsyncd.conf")
+		if unbound
 			true
 		else
 			''
 		end
 	end
 end
-Facter.add("unbound") do
-	unbound=FileTest.exist?("/usr/sbin/unbound") and
-		FileTest.exist?("/var/lib/unbound/root.key")
+Facter.add("munin_async") do
 	setcode do
-		if unbound
+		FileTest.exist?("/usr/share/munin/munin-async")
+	end
+end
+Facter.add("samhain") do
+	setcode do
+		if FileTest.exist?("/usr/sbin/samhain")
 			true
 		else
 			''