Merge "Make the gitweb links in gerrit point to git.o.o"
This commit is contained in:
commit
b5c69b56f3
modules
@ -64,6 +64,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.
|
||||
@ -122,6 +126,8 @@ class gerrit(
|
||||
$replication = [],
|
||||
$replication_targets = [],
|
||||
$gitweb = true,
|
||||
$cgit = false,
|
||||
$web_repo_url = '',
|
||||
$testmode = false
|
||||
) {
|
||||
include apache
|
||||
|
@ -97,9 +97,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]
|
||||
|
@ -58,6 +58,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],
|
||||
@ -156,6 +159,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],
|
||||
}
|
||||
|
@ -64,6 +64,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 => [
|
||||
|
Loading…
Reference in New Issue
Block a user