all are moved over

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 11bf95821f625f6a06c6c624a890d3bfd2e261e6..3cb7b30ba6951ce9e02669782c64bec049d69be8 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -108,8 +108,4 @@ node default {
        if $::spamd {
                munin::check { 'spamassassin': }
        }
        if $::spamd {
                munin::check { 'spamassassin': }
        }

-
-       if $::hostname in [chopin] {
-               include vsftpd
-       }

 }
 }

diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb
index 5c60dd4eb41c6ea7c6fc826dcf490af99a03c7ca..2bcc0a63c2e65bdf38899122569eab11c477d0cc 100644 (file)
--- a/modules/debian-org/lib/facter/software.rb
+++ b/modules/debian-org/lib/facter/software.rb
@@ -93,15 +93,6 @@ Facter.add("policydweight") do
                end
        end
 end
                end
        end
 end

-Facter.add("vsftpd") do
-       setcode do
-               if FileTest.exist?("/usr/sbin/vsftpd")
-                       true
-               else
-                       ''
-               end
-       end
-end

 Facter.add("spamd") do
        setcode do
                if FileTest.exist?("/usr/sbin/spamd")
 Facter.add("spamd") do
        setcode do
                if FileTest.exist?("/usr/sbin/spamd")