From 516d1792cee52c30d6f876231973f75224dec74f Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Fri, 8 Apr 2011 17:03:58 -0400
Subject: [PATCH 1/2] gitweb-caching: Configure httpd to use /git

We want to replace stock gitweb with gitweb-caching.  To do this we need
to use the same URL.

This is now configurable in the gitweb-caching::gitweb-caching define.
---
 modules/gitweb-caching/manifests/init.pp           |    3 ++-
 .../gitweb.http.erb}                               |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename modules/gitweb-caching/{files/gitweb-caching.conf => templates/gitweb.http.erb} (73%)

diff --git a/modules/gitweb-caching/manifests/init.pp b/modules/gitweb-caching/manifests/init.pp
index b80c379..4ed4a13 100644
--- a/modules/gitweb-caching/manifests/init.pp
+++ b/modules/gitweb-caching/manifests/init.pp
@@ -6,6 +6,7 @@ class gitweb-caching::package {
 
 define gitweb-caching::gitweb-caching (
         $git_path = '/usr/bin/git',
+        $git_url = '/git',
         $projectroot = '/git',
         $project_maxdepth = '2007',
         $logo = "git-logo.png",
@@ -20,7 +21,7 @@ define gitweb-caching::gitweb-caching (
     $site_name = $name
 
     file { '/etc/httpd/conf.d/gitweb-caching.conf':
-        source => "puppet:///gitweb-caching/gitweb-caching.conf",
+        content => template('gitweb-caching/gitweb.httpd.erb'),
         require => Package['httpd'],
         notify => Service['httpd'],
     }
diff --git a/modules/gitweb-caching/files/gitweb-caching.conf b/modules/gitweb-caching/templates/gitweb.http.erb
similarity index 73%
rename from modules/gitweb-caching/files/gitweb-caching.conf
rename to modules/gitweb-caching/templates/gitweb.http.erb
index c16a2ba..717d48a 100644
--- a/modules/gitweb-caching/files/gitweb-caching.conf
+++ b/modules/gitweb-caching/templates/gitweb.http.erb
@@ -1,5 +1,4 @@
-
-Alias /gitweb /var/www/gitweb-caching
+Alias <%= git_url %> /var/www/gitweb-caching
 
 <Directory /var/www/gitweb-caching>
   Options +ExecCGI
-- 
1.7.4.4