From 09d6e9b3e6aae069f87d7145e6fbf16a9498ae97 Mon Sep 17 00:00:00 2001 From: K Jonathan Harker 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/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index ccd002e..6cd0ec9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -86,7 +86,7 @@ class cgit( apache::vhost { $vhost_name: port => $https_port, serveraliases => $serveraliases, - docroot => '/tmp/meaningless_docroot', + docroot => 'MEANINGLESS ARGUMENT', priority => '50', template => 'cgit/git.vhost.erb', ssl => true,