From af78ec85ccac8e34facdac89c11dd5ddc5f8f688 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 19 Aug 2013 13:40:08 -0400
Subject: [PATCH] Make the gitweb links in gerrit point to git.o.o

Gerrit has builtin support for cgit links. Use it - but test it out on
review-dev first.

Change-Id: I8ea38e08258cdc8eb95e2fc3c1da5a4dc8faee57
---
 modules/gerrit/manifests/init.pp                  | 6 ++++++
 modules/gerrit/templates/gerrit.config.erb        | 9 ++++++++-
 modules/openstack_project/manifests/gerrit.pp     | 6 ++++++
 modules/openstack_project/manifests/review_dev.pp | 3 +++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 1d2ed192a1..13833c4199 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -60,6 +60,10 @@
 #     A boolean enabling local replication for apache acceleration
 #   gitweb:
 #     A boolean enabling gitweb
+#   cgit:
+#     A boolean enabling cgit
+#   web_repo_url:
+#     Url for setting the location of an external git browser
 #   testmode:
 #     Set this to true to disable cron jobs and replication,
 #     which can interfere with testing.
@@ -110,6 +114,8 @@ class gerrit(
   $replication = [],
   $replication_targets = [],
   $gitweb = true,
+  $cgit = false,
+  $web_repo_url = '',
   $testmode = false
 ) {
   include apache
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index 4ce7859c24..749339f40a 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -78,9 +78,16 @@
 [melody]
 	monitoring = <%= enable_melody %>
 	session = <%= melody_session %>
-<% if gitweb -%>
+<% if gitweb or cgit -%>
 [gitweb]
+<% if gitweb -%>
 	revision = "?p=${project}.git;a=commitdiff;h=${commit}"
+<% else -%>
+	type = cgit
+<% end -%>
+<% if web_repo_url -%>
+	url = "<%= web_repo_url %>"
+<% end -%>
 <% end -%>
 <% if contactstore == true -%>
 [contactstore]
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 7e878462bd..9466faacd5 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -60,6 +60,9 @@ class openstack_project::gerrit (
   $sysadmins = [],
   $swift_username = '',
   $swift_password = '',
+  $gitweb = true,
+  $cgit = false,
+  $web_repo_url = '',
 ) {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443, 29418],
@@ -150,6 +153,9 @@ class openstack_project::gerrit (
     email_private_key               => $email_private_key,
     replicate_local                 => $replicate_local,
     replication                     => $replication,
+    gitweb                          => $gitweb,
+    cgit                            => $cgit,
+    web_repo_url                    => $web_repo_url,
     testmode                        => $testmode,
     require                         => Class[openstack_project::server],
   }
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 9e66aa1e47..ebcab23b09 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -59,6 +59,9 @@ class openstack_project::review_dev (
       'trivial-rebase@review-dev.openstack.org',
     email_private_key               => $email_private_key,
     sysadmins                       => $sysadmins,
+    gitweb                          => false,
+    cgit                            => true,
+    web_repo_url                    => 'https://git.openstack.org/cgit',
     swift_username                  => $swift_username,
     swift_password                  => $swift_password,
     replication                     => [