cdimage_search -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ca45b2d..d371eef 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -231,8 +231,6 @@ roles:
   bgp:
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
-  cdimage-search:
-    - cgi-grnet-01.debian.org
   apache_prefork:
     # php needs this
     - quantz.debian.org

diff --git a/hieradata/nodes/cgi-grnet-01.debian.org.yaml b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
index 8e45ae1..add01d6 100644 (file)
--- a/hieradata/nodes/cgi-grnet-01.debian.org.yaml
+++ b/hieradata/nodes/cgi-grnet-01.debian.org.yaml
@@ -1,6 +1,7 @@
 ---
 classes:
   - roles::anonscm
+  - roles::cdimage_search
   - roles::dgit_browse
   - roles::dgit_git
   - roles::search_frontend

diff --git a/modules/roles/manifests/cdimage_search.pp b/modules/roles/manifests/cdimage_search.pp
index 9c1859c..69269ee 100644 (file)
--- a/modules/roles/manifests/cdimage_search.pp
+++ b/modules/roles/manifests/cdimage_search.pp
@@ -1,14 +1,15 @@
 class roles::cdimage_search {
-       include apache2::proxy_http
-       include apache2::ssl
+  include apache2
+  include apache2::proxy_http
+  include apache2::ssl
 
-       package { 'debian.org-cdimage-search.debian.org': ensure => installed, }
+  package { 'debian.org-cdimage-search.debian.org': ensure => installed, }
 
-       ssl::service { 'cdimage-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       apache2::site { '010-cdimage-search.debian.org':
-               site   => 'cdimage-search.debian.org',
-               content => template('roles/apache-cdimage-search.debian.org.conf.erb')
-       }
+  ssl::service { 'cdimage-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+  apache2::site { '010-cdimage-search.debian.org':
+    site    => 'cdimage-search.debian.org',
+    content => template('roles/apache-cdimage-search.debian.org.conf.erb')
+  }
 
-       onion::service { 'cdimage-search.debian.org': port => 80, target_address => 'cdimage-search.debian.org', target_port => 80, direct => true }
+  onion::service { 'cdimage-search.debian.org': port => 80, target_address => 'cdimage-search.debian.org', target_port => 80, direct => true }
 }

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 63ec89d..25e6bbd 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -191,9 +191,6 @@ class roles {
        if has_role('bgp') {
                include roles::bgp
        }
-       if has_role('cdimage-search') {
-               include roles::cdimage_search
-       }
 
        if has_role('postgresql_server') {
                include postgres::backup_source