From 4cc98b149ca4659aaa0de82a4d8b9f4b81f38f83 Mon Sep 17 00:00:00 2001
From: K Jonathan Harker <k.jonathan.harker@hp.com>
Date: Tue, 1 Jul 2014 17:35:00 -0700
Subject: [PATCH] Revert "Revert "Downgrade puppetlabs-apache to version
 0.0.4.""

This reverts commit 3afc75132aa3a7d3cae911ae5e7166383b9ee4ba.

The new apache module has started managing /etc/httpd/conf/httpd.conf
with a template that has some significant differences than our template
in the cgit module.

Change-Id: I99795d35596f35dfc34e89891155dd2b83e465fe
---
 manifests/apache.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/apache.pp b/manifests/apache.pp
index 26eaa20..93287b0 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  => '/tmp/meaningless_docroot',
+    docroot  => 'MEANINGLESS ARGUMENT',
     priority => '50',
     template => 'etherpad_lite/etherpadlite.vhost.erb',
     ssl      => true,