X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fsoftware.rb;h=598d7a194d5ef89a087a0d2c654dbe7eb310b8fc;hb=3817334616fc4370c954be504023014709fe38da;hp=3a0fefcd0064f52200e669573e0c5ec2df2d981d;hpb=3d6710d74726d9920a34edeafd31e06b60b645b0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb
index 3a0fefcd0..598d7a194 100644
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -28,6 +28,16 @@ Facter.add("postgres83") do
 		FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
 	end
 end
+Facter.add("postgres84") do
+	setcode do
+		FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres")
+	end
+end
+Facter.add("postgres90") do
+	setcode do
+		FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres")
+	end
+end
 Facter.add("postgrey") do
 	setcode do
 		FileTest.exist?("/usr/sbin/postgrey")
@@ -69,7 +79,7 @@ Facter.add("php5suhosin") do
 end
 Facter.add("syslogversion") do
 	setcode do
-		%x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1}.chomp
+		%x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1-3}.chomp
 	end
 end
 Facter.add("rsyncd") do
@@ -77,3 +87,9 @@ Facter.add("rsyncd") do
 		FileTest.exist?("/etc/rsyncd.conf")
 	end
 end
+Facter.add("unbound") do
+	setcode do
+		FileTest.exist?("/usr/sbin/unbound") and
+		FileTest.exist?("/var/lib/unbound/root.key")
+	end
+end