From: Julien Cristau <jcristau@debian.org>
Date: Fri, 1 Sep 2017 20:00:33 +0000 (+0200)
Subject: remove ftp_upload role from suchon
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0a15224bac570e602bdf9cafc9741d265000b25e;p=mirror%2Fdsa-puppet.git

remove ftp_upload role from suchon
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 0e72f93c6..050ee29e7 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -36,7 +36,6 @@ roles:
     - fasolo.debian.org
   ftp.upload.d.o:
     - coccia.debian.org
-    - suchon.debian.org
     - usper.debian.org
   api.ftp-master:
     - coccia.debian.org
diff --git a/modules/roles/manifests/security_upload.pp b/modules/roles/manifests/security_upload.pp
index 3963136da..282508161 100644
--- a/modules/roles/manifests/security_upload.pp
+++ b/modules/roles/manifests/security_upload.pp
@@ -22,4 +22,7 @@ class roles::security_upload {
 		chown_user => dak-unpriv,
 		root       => '/srv/security.upload.debian.org/ftp',
 	}
+	vsftpd::site { 'ftp-upload':
+		ensure => absent,
+	}
 }