From dce6e65c8e6e4408ae4b314733dc20d8b3bf3edd Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 19 Sep 2017 16:18:36 -0500
Subject: [PATCH] Override the cgit url settings in gerrit

The upstream ones add a .git. That does't work.

Values taken from:

  http://git.openstack.org/cgit/openstack-infra/gerrit/tree/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebConfig.java?h=openstack/2.13.8#n158

Change-Id: I197bc90b58db9e7048cc9a3892ef3dcfa575598f
---
 templates/gerrit.config.erb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/templates/gerrit.config.erb b/templates/gerrit.config.erb
index 064db91..3d56a9d 100644
--- a/templates/gerrit.config.erb
+++ b/templates/gerrit.config.erb
@@ -182,12 +182,21 @@
 	session = <%= @melody_session %>
 [plugin "javamelody"]
         allowTopMenu = <%= @enable_javamelody_top_menu %>
+# Gerrit upstream hardcodes a .git extension for cgit.
+# The cgit settings below are the same just without the
+# .git extension.
 <% if @gitweb or @cgit -%>
 [gitweb]
 <% if @gitweb -%>
 	revision = "?p=${project}.git;a=commitdiff;h=${commit}"
 <% else -%>
-	type = cgit
+	type = custom
+	project = "${project}/summary"
+	revision = "${project}/commit/?id=${commit}"
+	branch = "${project}/log/?h=${branch}"
+	roottree = "${project}/tree/?h=${commit}"
+	file = "${project}/tree/${file}?h=${commit}"
+	filehistory = "${project}/log/${file}?h=${branch}"
 <% end -%>
 <% if  scope.lookupvar("gerrit::web_repo_url") -%>
 	url = "<%= scope.lookupvar('gerrit::web_repo_url') %>"