all are moved over

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 11bf958..3cb7b30 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -108,8 +108,4 @@ node default {
        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 5c60dd4..2bcc0a6 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
-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")