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

diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb
index ca21dc031..0045a9ef0 100644
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -8,14 +8,14 @@ Facter.add("apache2") do
 	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
+	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
@@ -155,3 +155,8 @@ Facter.add("systemd") do
 		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