ftp_upload -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 0fc6272..2e4b0e6 100644 (file)
--- 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 fcfe9c3..dfa719b 100644 (file)
--- 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 (file)
index 0000000..7d70f59
--- /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 39e40d7..75bd568 100644 (file)
--- 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 d401bf0..f1e24a7 100644 (file)
--- 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
        }