X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Flib%2Ffacter%2Fsoftware.rb;h=4863e05d87cc0943c8fcf56af4aa8a953543dec3;hb=f2d0feb7e716cb5156d57b6573608a5115a4dfce;hp=2a55c18fa5579be0d64e1bf891b6c2e9b4293425;hpb=04b3fb7717c4ec43638662adb76b13d54c36dd33;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/lib/facter/software.rb b/modules/debian_org/lib/facter/software.rb
index 2a55c18fa..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