Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / debian_org / lib / facter / software.rb

diff --git a/modules/debian_org/lib/facter/software.rb b/modules/debian_org/lib/facter/software.rb
index 595d44a..d03fec1 100644 (file)
--- 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")
@@ -177,3 +167,8 @@ Facter.add("update_grub") do
                FileTest.exist?("/usr/sbin/update-grub")
        end
 end
+Facter.add("haproxy") do
+       setcode do
+               FileTest.exist?("/usr/sbin/haproxy")
+       end
+end