X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fsoftware.rb;h=0045a9ef0222781b86c79b8a993d354adea9611d;hb=4326b0a78553bfe9696c10f1a69e1316acd23802;hp=0843c256c3a94257a83671724b15e7a9733cb17e;hpb=c2a8153dfaca66f963fcc9f9b873a1c4bfeafb46;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb
index 0843c256c..0045a9ef0 100644
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -7,6 +7,16 @@ 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
+			''
+		end
+	end
+end
 Facter.add("clamd") do
 	setcode do
 		if FileTest.exist?("/usr/sbin/clamd")
@@ -135,3 +145,18 @@ Facter.add("samhain") do
 		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
+			''
+		end
+	end
+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})
+	end
+end