wiki -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4a637e1..1e02cf0 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -131,8 +131,6 @@ roles:
     - smit.debian.org
   udd:
     - ullmann.debian.org
-  wiki:
-    - wilder.debian.org
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org

diff --git a/hieradata/nodes/wilder.debian.org.yaml b/hieradata/nodes/wilder.debian.org.yaml
new file mode 100644 (file)
index 0000000..06b47c5
--- /dev/null
+++ b/hieradata/nodes/wilder.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::wiki

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2afec7f..0abfd9b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,10 +45,6 @@ class roles {
                include roles::security_mirror
        }
 
-       if has_role('wiki') {
-               include roles::wiki
-       }
-
        if has_role('syncproxy') {
                include roles::syncproxy
        }

diff --git a/modules/roles/manifests/wiki.pp b/modules/roles/manifests/wiki.pp
index b6fb7e8..0299aef 100644 (file)
--- a/modules/roles/manifests/wiki.pp
+++ b/modules/roles/manifests/wiki.pp
@@ -1,9 +1,10 @@
 class roles::wiki {
-       ssl::service { 'wiki.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
-       }
-       rsync::site { 'wiki':
-               source => 'puppet:///modules/roles/wiki/rsyncd.conf',
-       }
+  include apache2
+  ssl::service { 'wiki.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  rsync::site { 'wiki':
+    source => 'puppet:///modules/roles/wiki/rsyncd.conf',
+  }
 }