Make a proper role for cgi.debian.org on wolkenstein

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4746258..7796a1b 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -157,8 +157,6 @@ roles:
     - wilder.debian.org
   www_master:
     - wolkenstein.debian.org
-  cgi.d.o:
-    - wolkenstein.debian.org
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org

diff --git a/hieradata/nodes/wolkenstein.debian.org.yaml b/hieradata/nodes/wolkenstein.debian.org.yaml
index 2061247..1ecdf50 100644 (file)
--- a/hieradata/nodes/wolkenstein.debian.org.yaml
+++ b/hieradata/nodes/wolkenstein.debian.org.yaml
@@ -3,3 +3,4 @@ classes:
   - roles::search_backend
   - roles::static_source
   - roles::weblog_destination
+  - roles::www_cgi

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 765e1e0..d298086 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -66,10 +66,6 @@ class roles {
                include roles::www_master
        }
 
-       if has_role('cgi.d.o') {
-               ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
        if has_role('wiki') {
                include roles::wiki
        }

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