wiki -> hiera role; explicitly include apache2

[mirror/dsa-puppet.git] / modules / roles / manifests / wiki.pp

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',
+  }
 }