Merge "Drop apache::dev in wiki"

2014-09-12 22:56:40 +00:00 · 2014-09-12 22:56:40 +00:00 · 9dbb5c6544
commit 9dbb5c6544
parent def85f8340 26ff9a7300
1 changed files with 8 additions and 1 deletions
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@ -14,7 +14,14 @@ class mediawiki(
 ) {

  if ($role == 'app' or $role == 'all') {
-    require apache::dev
+    # This is equivalent to apache::dev which is not puppet3
+    # compatible with puppetlabs-apache 0.0.4:
+    package { ['libaprutil1-dev',
+               'libapr1-dev',
+               'apache2-prefork-dev']:
+      ensure => present,
+    }
+
    include apache
    include mediawiki::php
    include mediawiki::app