From 05d85da88ba1a535370935ef64ada618185f2bbd Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 16:58:30 +0200
Subject: [PATCH] ftp_upload -> hiera role

---
 hieradata/common.yaml                  |  3 ---
 hieradata/nodes/coccia.debian.org.yaml |  1 +
 hieradata/nodes/usper.debian.org.yaml  |  3 +++
 modules/roles/manifests/ftp_upload.pp  | 14 +++++++-------
 modules/roles/manifests/init.pp        |  3 ---
 5 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 hieradata/nodes/usper.debian.org.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 0fc62720f..2e4b0e610 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -45,9 +45,6 @@ roles:
     - denis.debian.org
   ftp_master:
     - fasolo.debian.org
-  ftp.upload.d.o:
-    - coccia.debian.org
-    - usper.debian.org
   git_master:
     - adayevskaya.debian.org
   historicalpackages:
diff --git a/hieradata/nodes/coccia.debian.org.yaml b/hieradata/nodes/coccia.debian.org.yaml
index fcfe9c360..dfa719bd1 100644
--- a/hieradata/nodes/coccia.debian.org.yaml
+++ b/hieradata/nodes/coccia.debian.org.yaml
@@ -1,4 +1,5 @@
 ---
 classes:
   - roles::api_ftp_master
+  - roles::ftp_upload
   - roles::static_source
diff --git a/hieradata/nodes/usper.debian.org.yaml b/hieradata/nodes/usper.debian.org.yaml
new file mode 100644
index 000000000..7d70f599f
--- /dev/null
+++ b/hieradata/nodes/usper.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::ftp_upload
diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 39e40d7c0..75bd56856 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,9 +1,9 @@
 class roles::ftp_upload {
-	vsftpd::site { 'ftp-upload':
-		banner     => 'ftp.upload.debian.org FTP server',
-		logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
-		writable   => true,
-		chown_user => dak-unpriv,
-		root       => '/srv/upload.debian.org/ftp',
-	}
+  vsftpd::site { 'ftp-upload':
+    banner     => 'ftp.upload.debian.org FTP server',
+    logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+    writable   => true,
+    chown_user => dak-unpriv,
+    root       => '/srv/upload.debian.org/ftp',
+  }
 }
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d401bf098..f1e24a740 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,9 +34,6 @@ class roles {
 		include roles::dakmaster
 		include roles::signing
 	}
-	if has_role('ftp.upload.d.o') {
-		include roles::ftp_upload
-	}
 	if has_role('ssh.upload.d.o') {
 		include roles::ssh_upload
 	}
-- 
2.20.1