Drop apache2deb9 variable

[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 5c07912..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")
@@ -46,12 +36,9 @@ Facter.add("postfix") do
 end
 Facter.add("postgres") do
        setcode do
-               pg = (FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/9.1/bin/postgres") or
-               FileTest.exist?("/usr/lib/postgresql/9.2/bin/postgres"))
+               pg = (FileTest.exist?("/usr/lib/postgresql/9.1/bin/postgres") or
+               FileTest.exist?("/usr/lib/postgresql/9.4/bin/postgres") or
+               FileTest.exist?("/usr/lib/postgresql/9.6/bin/postgres"))
                if pg
                        true
                else
@@ -157,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