manpages_dyn -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4043308..350d66e 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -55,9 +55,6 @@ roles:
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
-  manpages-dyn:
-    - manziarly.debian.org
-    - cgi-grnet-01.debian.org
   mirrormaster:
     - melartin.debian.org
   muninmaster:

diff --git a/hieradata/nodes/cgi-grnet-01.debian.org.yaml b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
index add01d6..38e0843 100644 (file)
--- a/hieradata/nodes/cgi-grnet-01.debian.org.yaml
+++ b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
@@ -4,6 +4,7 @@ classes:
   - roles::cdimage_search
   - roles::dgit_browse
   - roles::dgit_git
+  - roles::manpages_dyn
   - roles::search_frontend
 
 # dgit's git sometimes needs a lot of memory.  raise the limit to 512 MB

diff --git a/hieradata/nodes/manziarly.debian.org.yaml b/hieradata/nodes/manziarly.debian.org.yaml
index f044c03..8bd215f 100644 (file)
--- a/hieradata/nodes/manziarly.debian.org.yaml
+++ b/hieradata/nodes/manziarly.debian.org.yaml
@@ -1,3 +1,5 @@
+---
 classes:
+  - roles::manpages_dyn
   - roles::static_master
   - roles::static_source

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4c07c5a..8f1e391 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,10 +15,6 @@ class roles {
                include nagios::server
        }
 
-       if has_role('manpages-dyn') {
-               include roles::manpages_dyn
-       }
-
        # archive.debian.org
        if has_role('historical_mirror') {
                include roles::historical_mirror

diff --git a/modules/roles/manifests/manpages_dyn.pp b/modules/roles/manifests/manpages_dyn.pp
index 5ced4b4..15ffea1 100644 (file)
--- a/modules/roles/manifests/manpages_dyn.pp
+++ b/modules/roles/manifests/manpages_dyn.pp
@@ -1,12 +1,13 @@
 class roles::manpages_dyn {
-       include apache2::ssl
-       include apache2::proxy_http
-       include apache2::expires
+  include apache2
+  include apache2::ssl
+  include apache2::proxy_http
+  include apache2::expires
 
-       ssl::service { 'dyn.manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+  ssl::service { 'dyn.manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 
-       apache2::site { 'dyn.manpages.debian.org':
-               site   => 'dyn.manpages.debian.org',
-               content => template('roles/manpages/dyn.manpages.debian.org.erb')
-       }
+  apache2::site { 'dyn.manpages.debian.org':
+    site    => 'dyn.manpages.debian.org',
+    content => template('roles/manpages/dyn.manpages.debian.org.erb')
+  }
 }