api.ftp-master -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 127795d..97997ea 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -54,8 +54,6 @@ roles:
   ftp.upload.d.o:
     - coccia.debian.org
     - usper.debian.org
-  api.ftp-master:
-    - coccia.debian.org
   dgit_browse:
     - cgi-grnet-01.debian.org
   dgit_git:

diff --git a/hieradata/nodes/coccia.debian.org.yaml b/hieradata/nodes/coccia.debian.org.yaml
index 3ccff77..fcfe9c3 100644 (file)
--- a/hieradata/nodes/coccia.debian.org.yaml
+++ b/hieradata/nodes/coccia.debian.org.yaml
@@ -1,2 +1,4 @@
+---
 classes:
+  - roles::api_ftp_master
   - roles::static_source

diff --git a/modules/roles/manifests/api_ftp_master.pp b/modules/roles/manifests/api_ftp_master.pp
new file mode 100644 (file)
index 0000000..b602469
--- /dev/null
+++ b/modules/roles/manifests/api_ftp_master.pp
@@ -0,0 +1,7 @@
+class roles::api_ftp_master {
+  include apache2
+  ssl::service { 'api.ftp-master.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+}

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 09bf308..c8842fa 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -47,12 +47,6 @@ class roles {
        if has_role('security_upload') {
                include roles::security_upload
        }
-       if has_role('api.ftp-master') {
-               ssl::service { 'api.ftp-master.debian.org':
-                       notify  => Exec['service apache2 reload'],
-                       key => true,
-               }
-       }
        #
        # security.debian.org
        if has_role('security_master') {