X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fsoftware.rb;h=ba4c1be38933a0216111956aedc72c861e4e517c;hb=c84cfe794ac75a4180dc551cf57c876e257a907c;hp=2bcc0a63c2e65bdf38899122569eab11c477d0cc;hpb=5f554fd0f2eb0e958496e02de77143734453018b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb
index 2bcc0a63c..ba4c1be38 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
-	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")
+Facter.add("postgres") do
+	setcode do
+		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
 			''
@@ -103,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
@@ -116,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
@@ -131,20 +110,35 @@ 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
+			''
+		end
+	end
+end
+Facter.add("systemd") do
+	setcode do
+		init = '/sbin/init'
+		if File.symlink?(init) and File.readlink(init) == "/lib/systemd/systemd"
 			true
 		else
 			''