planet_{search,master} -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index aff2fa0..2b06049 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -185,10 +185,6 @@ roles:
   debug_mirror_onion:
     - mirror-accumu.debian.org
     - schmelzer.debian.org
-  planet_master:
-    - philp.debian.org
-  planet_search:
-    - philp.debian.org
   i18n.d.o:
     - tye.debian.org
   l10n.d.o:

diff --git a/hieradata/nodes/philp.debian.org.yaml b/hieradata/nodes/philp.debian.org.yaml
index 3ccff77..a4a5beb 100644 (file)
--- a/hieradata/nodes/philp.debian.org.yaml
+++ b/hieradata/nodes/philp.debian.org.yaml
@@ -1,2 +1,5 @@
+---
 classes:
+  - roles::planet_master
+  - roles::planet_search
   - roles::static_source

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d77859e..450e7f6 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -117,13 +117,6 @@ class roles {
                include roles::snapshot_shell
        }
 
-       if has_role('planet_master') {
-               include roles::planet_master
-       }
-       if has_role('planet_search') {
-               ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
        if has_role('i18n.d.o') {
                ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }

diff --git a/modules/roles/manifests/planet_master.pp b/modules/roles/manifests/planet_master.pp
index 8e67d46..5632005 100644 (file)
--- a/modules/roles/manifests/planet_master.pp
+++ b/modules/roles/manifests/planet_master.pp
@@ -1,13 +1,14 @@
 class roles::planet_master {
-       include apache2::ssl
-       apache2::config { 'puppet-debianhosts':
-               ensure => 'absent',
-       }
-       apache2::site { 'planet-master.debian.org':
-               content => template('roles/planet_master/planet-master.debian.org.erb')
-       }
-       ssl::service { 'planet-master.debian.org':
-               notify => Exec['service apache2 reload'],
-               key => true,
-       }
+  include apacke2
+  include apache2::ssl
+  apache2::config { 'puppet-debianhosts':
+    ensure => 'absent',
+  }
+  apache2::site { 'planet-master.debian.org':
+    content => template('roles/planet_master/planet-master.debian.org.erb')
+  }
+  ssl::service { 'planet-master.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
 }

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