Get rid of obsolete vsftpd::site→absent resources

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

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index d562024..9bb6139 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -47,11 +47,6 @@ class roles::security_mirror {
                health_url    => 'http://security.backend.mirrors.debian.org/_health',
         }
 
-       vsftpd::site { 'security':
-               ensure => absent,
-               root   => '/nonexistent',
-       }
-
        rsync::site { 'security':
                source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
                max_clients => 100,

diff --git a/modules/roles/manifests/security_upload.pp b/modules/roles/manifests/security_upload.pp
index 1208795..3963136 100644 (file)
--- a/modules/roles/manifests/security_upload.pp
+++ b/modules/roles/manifests/security_upload.pp
@@ -22,8 +22,4 @@ class roles::security_upload {
                chown_user => dak-unpriv,
                root       => '/srv/security.upload.debian.org/ftp',
        }
-       vsftpd::site { 'ftp-upload':
-               root   => irrelevant,
-               ensure => absent,
-       }
 }