www_master -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index c63ec9a..b805539 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -142,8 +142,6 @@ roles:
     - ullmann.debian.org
   wiki:
     - wilder.debian.org
-  www_master:
-    - 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 1ecdf50..c7b4369 100644 (file)
--- a/hieradata/nodes/wolkenstein.debian.org.yaml
+++ b/hieradata/nodes/wolkenstein.debian.org.yaml
@@ -4,3 +4,4 @@ classes:
   - roles::static_source
   - roles::weblog_destination
   - roles::www_cgi
+  - roles::www_master

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 83ddc6c..0ce9337 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -52,10 +52,6 @@ class roles {
                include roles::git_master
        }
 
-       if has_role('www_master') {
-               include roles::www_master
-       }
-
        if has_role('wiki') {
                include roles::wiki
        }

diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index cce0338..737c197 100644 (file)
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -1,21 +1,23 @@
 class roles::www_master {
-       ssl::service { 'www-master.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
-       }
+  include apache2
 
-       $vhost_listen = '*:80'
-       $vhost_listen_443 = '*:443'
-       $redirect_vhosts = false
-       $wwwdo_server_name = 'www-staging.debian.org'
-       $wwwdo_document_root = '/srv/www.debian.org/www'
-       apache2::site { '005-www-staging.debian.org':
-               site    => 'www-staging.debian.org',
-               content => template('roles/apache-www.debian.org.erb'),
-       }
+  ssl::service { 'www-master.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 
-       ssl::service { 'www-staging.debian.org' :
-               notify => Exec['service apache2 reload'],
-               key    => true,
-       }
+  $vhost_listen = '*:80'
+  $vhost_listen_443 = '*:443'
+  $redirect_vhosts = false
+  $wwwdo_server_name = 'www-staging.debian.org'
+  $wwwdo_document_root = '/srv/www.debian.org/www'
+  apache2::site { '005-www-staging.debian.org':
+    site    => 'www-staging.debian.org',
+    content => template('roles/apache-www.debian.org.erb'),
+  }
+
+  ssl::service { 'www-staging.debian.org' :
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 }