fix munin 1

[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 533c779..0045a9e 100644 (file)
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -7,63 +7,52 @@ Facter.add("apache2") do
                end
        end
 end
-Facter.add("clamd") do
-       setcode do
-               if FileTest.exist?("/usr/sbin/clamd")
-                       true
-               else
-                       ''
-               end
-       end
-end
-Facter.add("exim4") do
-       setcode do
-               if FileTest.exist?("/usr/sbin/exim4")
-                       true
-               else
-                       ''
-               end
-       end
-end
-Facter.add("postfix") do
+Facter.add("apache2deb9") do
        setcode do
-               if FileTest.exist?("/usr/sbin/postfix")
+               # 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("postgres81") do
+Facter.add("clamd") do
        setcode do
-               if FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres")
+               if FileTest.exist?("/usr/sbin/clamd")
                        true
                else
                        ''
                end
        end
 end
-Facter.add("postgres83") do
+Facter.add("exim4") do
        setcode do
-               if FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
+               if FileTest.exist?("/usr/sbin/exim4")
                        true
                else
                        ''
                end
        end
 end
-Facter.add("postgres84") do
+Facter.add("postfix") do
        setcode do
-               if FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres")
+               if FileTest.exist?("/usr/sbin/postfix")
                        true
                else
                        ''
                end
        end
 end
-Facter.add("postgres90") do
+Facter.add("postgres") do
        setcode do
-               if FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres")
+               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"))
+               if pg
                        true
                else
                        ''
@@ -147,3 +136,27 @@ Facter.add("munin_async") do
                FileTest.exist?("/usr/share/munin/munin-async")
        end
 end
+Facter.add("samhain") do
+       setcode do
+               if FileTest.exist?("/usr/sbin/samhain")
+                       true
+               else
+                       ''
+               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