Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / roles / manifests / security_master.pp

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index a7f8516..365f3b0 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -5,11 +5,6 @@ class roles::security_master {
                tlsaport => [443, 1873],
        }
 
-       vsftpd::site { 'security':
-               ensure  => absent,
-               root    => '/nonexistent',
-       }
-
        rsync::site { 'security_master':
                source      => 'puppet:///modules/roles/security_master/rsyncd.conf',
                # Needs to be at least twice the number of direct mirrors (currently 15) plus some spare