Updated apache template, added args, removed ssl.

 - SSL was breaking testing, removed it for the time being.
 - Converted gitweb.conf to template.
 - Added more options to gitweb::settings.

2 files changed, 39 insertions, 0 deletions

diff --git a/templates/apache-gitweb.conf.erb b/templates/apache-gitweb.conf.erb
index d0736ae..dca3f5f 100644
--- a/templates/apache-gitweb.conf.erb
+++ b/templates/apache-gitweb.conf.erb
@@ -1,6 +1,11 @@
+NameVirtualHost  *:<%= port %>
 <VirtualHost *:<%= port %>>
     ServerName <%= name %>
     DocumentRoot <%= docroot %>
+
+    RewriteEngine On
+    RewriteRule ^/$ /gitweb [R]
+
     <Directory <%= docroot %>>
         Options ExecCGI +FollowSymLinks +SymLinksIfOwnerMatch
         AllowOverride All
@@ -8,6 +13,17 @@
         Allow from all
         AddHandler cgi-script cgi
         DirectoryIndex gitweb.cgi
+        <%# if auth == true -%>
+        AuthType Basic
+        AuthName "Protected"
+        AuthUserFile /usr/local/apache/passwd/passwords
+        Require valid-user
+        <%# end -%>
     </Directory>
+
+    ErrorLog /var/log/apache2/<%= name %>_error.log
+    LogLevel warn
+    CustomLog /var/log/apache2/<%= name %>_access.log combined
+    ServerSignature Off
 </VirtualHost>
 
diff --git a/templates/gitweb.conf.erb b/templates/gitweb.conf.erb
new file mode 100644
index 0000000..0731b69
--- /dev/null
+++ b/templates/gitweb.conf.erb
@@ -0,0 +1,23 @@
+# path to git projects (<project>.git)
+$projectroot = "<%= scope.lookupvar('gitweb::settings::projectroot') %>";
+
+# directory to use for temp files
+$git_temp = "/tmp";
+
+# target of the home link on top of all pages
+#$home_link = $my_uri || "/";
+
+# html text to include at home page
+$home_text = "indextext.html";
+
+# file with project list; by default, simply scan the projectroot dir.
+$projects_list = $projectroot;
+
+# stylesheet to use
+$stylesheet = "/gitweb/gitweb.css";
+
+# logo to use
+$logo = "/gitweb/git-logo.png";
+
+# the 'favicon'
+$favicon = "/gitweb/git-favicon.png";