all are moved over

[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 b9d3e476517437016ea141c725267754eb09d9cd..2bcc0a63c2e65bdf38899122569eab11c477d0cc 100644 (file)
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -1,36 +1,82 @@
 Facter.add("apache2") do
        setcode do
-               FileTest.exist?("/usr/sbin/apache2")
+               if FileTest.exist?("/usr/sbin/apache2")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("clamd") do
        setcode do
-               FileTest.exist?("/usr/sbin/clamd")
+               if FileTest.exist?("/usr/sbin/clamd")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("exim4") do
        setcode do
-               FileTest.exist?("/usr/sbin/exim4")
+               if FileTest.exist?("/usr/sbin/exim4")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("postfix") do
        setcode do
-               FileTest.exist?("/usr/sbin/postfix")
+               if FileTest.exist?("/usr/sbin/postfix")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("postgres81") do
        setcode do
-               FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres")
+               if FileTest.exist?("/usr/lib/postgresql/8.1/bin/postgres")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("postgres83") do
        setcode do
-               FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
+               if FileTest.exist?("/usr/lib/postgresql/8.3/bin/postgres")
+                       true
+               else
+                       ''
+               end
+       end
+end
+Facter.add("postgres84") do
+       setcode do
+               if FileTest.exist?("/usr/lib/postgresql/8.4/bin/postgres")
+                       true
+               else
+                       ''
+               end
+       end
+end
+Facter.add("postgres90") do
+       setcode do
+               if FileTest.exist?("/usr/lib/postgresql/9.0/bin/postgres")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("postgrey") do
        setcode do
-               FileTest.exist?("/usr/sbin/postgrey")
+               if FileTest.exist?("/usr/sbin/postgrey")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("greylistd") do
@@ -40,58 +86,68 @@ Facter.add("greylistd") do
 end
 Facter.add("policydweight") do
        setcode do
-               FileTest.exist?("/usr/sbin/policyd-weight")
-       end
-end
-Facter.add("vsftpd") do
-       setcode do
-               FileTest.exist?("/usr/sbin/vsftpd")
+               if FileTest.exist?("/usr/sbin/policyd-weight")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("spamd") do
        setcode do
-               FileTest.exist?("/usr/sbin/spamd")
+               if FileTest.exist?("/usr/sbin/spamd")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("php5") do
-       setcode do
-               FileTest.exist?("/usr/lib/apache2/modules/libphp5.so") or
+       php =   FileTest.exist?("/usr/lib/apache2/modules/libphp5.so") or
                FileTest.exist?("/usr/bin/php5") or
                FileTest.exist?("/usr/bin/php5-cgi") or
                FileTest.exist?("/usr/lib/cgi-bin/php5")
+       setcode do
+               if php
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("php5suhosin") do
-       setcode do
-               FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or
+       suhosin=FileTest.exist?("/usr/lib/php5/20060613/suhosin.so") or
                FileTest.exist?("/usr/lib/php5/20060613+lfs/suhosin.so")
+       setcode do
+               if suhosin
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("syslogversion") do
        setcode do
-               %x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1}.chomp
+               %x{dpkg-query -W -f='${Version}\n' syslog-ng | cut -b1-3}.chomp
        end
 end
 Facter.add("rsyncd") do
        setcode do
-               FileTest.exist?("/etc/rsyncd.conf")
+               if FileTest.exist?("/etc/rsyncd.conf")
+                       true
+               else
+                       ''
+               end
        end
 end
 Facter.add("unbound") do
-       setcode do
-               FileTest.exist?("/usr/sbin/unbound") and
+       unbound=FileTest.exist?("/usr/sbin/unbound") and
                FileTest.exist?("/var/lib/unbound/root.key")
-       end
-end
-Facter.add("release") do
        setcode do
-               r = %x{lsb_release --short --codename}.chomp
-               if r == "n/a"
-                       r = %x{lsb_release --short --release}.chomp
-                       if r != "testing/unstable"
-                               r = 'unknown'
-                       end
+               if unbound
+                       true
+               else
+                       ''
                end
-               r
        end
 end