From 447d8e5f1405cfa6ba04c21acf6a1a963234f9c2 Mon Sep 17 00:00:00 2001 From: K Jonathan Harker Date: Fri, 27 Jun 2014 15:19:01 -0700 Subject: [PATCH] Revert "Downgrade puppetlabs-apache to version 0.0.4." This reverts commit 7b9ea298cf4ae941af74381925b17a4b29337eb9. Upgrading puppetlabs-apache to version 0.4.0 will give us important variables in apache::params (specifically $conf_dir and $vdir) which will allow us to modify the cgit module to run on both Debuntu and RHEL systems -- which is useful because test.sh should be testing all modules on both systems. Of the two issues that 7b9ea298 addresses, I believe that our Oneiric hosts have all gone the way of the dinosaur and we can work around the docroot check by replacing 'MEANINGLESS ARGUMENT' with '/tmp/meaningless_docroot'. Conflicts: install_modules.sh Change-Id: I7c08f85db6810ab28fa044f1923833359271e8ec --- manifests/apache.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/apache.pp b/manifests/apache.pp index 93287b0..26eaa20 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -17,7 +17,7 @@ class etherpad_lite::apache ( include apache apache::vhost { $vhost_name: port => 443, - docroot => 'MEANINGLESS ARGUMENT', + docroot => '/tmp/meaningless_docroot', priority => '50', template => 'etherpad_lite/etherpadlite.vhost.erb', ssl => true,