X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Flib%2Ffacter%2Fsoftware.rb;h=4863e05d87cc0943c8fcf56af4aa8a953543dec3;hb=549a587c21c0558160230268202b0f16d7551f9f;hp=47fa46a81429f60988f31368071db859416960e8;hpb=0808c559c2a168b04b2e4478d52281a477ef6a03;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/lib/facter/software.rb b/modules/debian_org/lib/facter/software.rb
index 47fa46a81..4863e05d8 100644
--- a/modules/debian_org/lib/facter/software.rb
+++ b/modules/debian_org/lib/facter/software.rb
@@ -7,16 +7,6 @@ Facter.add("apache2") do
 		end
 	end
 end
-Facter.add("apache2deb9") do
-	setcode do
-		# jessie (deb8) has 2.4.10-.., stretch (deb9) will have 2.4.23 or later.
-		if FileTest.exist?("/usr/sbin/apache2") and system("dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' apache2-bin) gt 2.4.15")
-			true
-		else
-			false
-		end
-	end
-end
 Facter.add("clamd") do
 	setcode do
 		if FileTest.exist?("/usr/sbin/clamd")
@@ -114,7 +104,7 @@ Facter.add("php5suhosin") do
 end
 Facter.add("syslogversion") do
 	setcode do
-		%x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1-3}.chomp
+		%x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -d. -f1-2}.chomp
 	end
 end
 Facter.add("unbound") do
@@ -154,6 +144,31 @@ 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
+Facter.add("bgpd") do
+	setcode do
+		FileTest.exist?("/usr/sbin/bgpd")
+	end
+end
+Facter.add("zebra") do
+	setcode do
+		FileTest.exist?("/usr/sbin/zebra")
+	end
+end
+Facter.add("update_grub") do
+	setcode do
+		FileTest.exist?("/usr/sbin/update-grub")
+	end
+end
+Facter.add("haproxy") do
+	setcode do
+		FileTest.exist?("/usr/sbin/haproxy")
 	end
 end