X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Flib%2Ffacter%2Fsoftware.rb;h=58318fe48de1feec4b1bb53af06e5f17a76516bd;hb=9e1f74ad62a130347719115d4248d0dc1170d0c2;hp=5c079129b6354f29e7c308626e763fead2fce680;hpb=249b713a08d35bffb1cd52739be6f5808baa5a5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/lib/facter/software.rb b/modules/debian_org/lib/facter/software.rb
index 5c079129b..58318fe48 100644
--- a/modules/debian_org/lib/facter/software.rb
+++ b/modules/debian_org/lib/facter/software.rb
@@ -46,12 +46,9 @@ Facter.add("postfix") do
 end
 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"))
+		pg = (FileTest.exist?("/usr/lib/postgresql/9.1/bin/postgres") or
+		FileTest.exist?("/usr/lib/postgresql/9.4/bin/postgres") or
+		FileTest.exist?("/usr/lib/postgresql/9.6/bin/postgres"))
 		if pg
 			true
 		else
@@ -157,6 +154,11 @@ Facter.add("systemd") do
 end
 Facter.add("tor_ge_0_2_9") do
 	setcode do
-		system(%{dpkg -l tor >/dev/null 2>&1 && dpkg --compare-versions $(dpkg-query -W -f='${Version}' tor) ge 0.2.9})
+		system(%{test -n "$(dpkg-query -W -f='${Version}' tor 2>/dev/null)" && dpkg --compare-versions "$(dpkg-query -W -f='${Version}' tor)" ge 0.2.9})
+	end
+end
+Facter.add("haveged") do
+	setcode do
+		FileTest.exist?("/usr/sbin/haveged")
 	end
 end