api.ftp-master -> hiera role; explicitly include apache2
authorPeter Palfrader <peter@palfrader.org>
Sun, 15 Sep 2019 13:00:31 +0000 (15:00 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 15 Sep 2019 13:00:31 +0000 (15:00 +0200)
hieradata/common.yaml
hieradata/nodes/coccia.debian.org.yaml
modules/roles/manifests/api_ftp_master.pp [new file with mode: 0644]
modules/roles/manifests/init.pp

index 127795d..97997ea 100644 (file)
@@ -54,8 +54,6 @@ roles:
   ftp.upload.d.o:
     - coccia.debian.org
     - usper.debian.org
   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:
   dgit_browse:
     - cgi-grnet-01.debian.org
   dgit_git:
index 3ccff77..fcfe9c3 100644 (file)
@@ -1,2 +1,4 @@
+---
 classes:
 classes:
+  - roles::api_ftp_master
   - roles::static_source
   - 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
@@ -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,
+  }
+}
index 09bf308..c8842fa 100644 (file)
@@ -47,12 +47,6 @@ class roles {
        if has_role('security_upload') {
                include roles::security_upload
        }
        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') {
        #
        # security.debian.org
        if has_role('security_master') {