From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 2 Feb 2018 10:56:10 +0000 (+0100)
Subject: Get rid of obsolete vsftpd::site→absent resources
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=48efe7cbd91806d7b6316c9acade0cc2d97ac155;p=mirror%2Fdsa-puppet.git

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 a7f851611..365f3b092 100644
--- 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 d56202496..9bb613907 100644
--- 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 120879536..3963136da 100644
--- 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,
-	}
 }