diff --git a/playbooks/roles/gerrit/files/gitiles.config b/playbooks/roles/gerrit/files/gitiles.config new file mode 100644 index 0000000000..312c59ce40 --- /dev/null +++ b/playbooks/roles/gerrit/files/gitiles.config @@ -0,0 +1,2 @@ +[gerrit] + noWebLinks = true diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml index f23b486b8c..b7f5fb4386 100644 --- a/playbooks/roles/gerrit/tasks/main.yaml +++ b/playbooks/roles/gerrit/tasks/main.yaml @@ -215,6 +215,14 @@ group: '{{ gerrit_user_name }}' mode: 0644 +- name: Write Gitiles plugin configuration file + copy: + src: gitiles.config + dest: '{{ gerrit_site_dir }}/etc/gitiles.config' + owner: '{{ gerrit_user_name }}' + group: '{{ gerrit_user_name }}' + mode: 0644 + - name: Write manage-projects script template: src: "manage-projects.j2" diff --git a/playbooks/roles/gerrit/templates/gerrit.config.j2 b/playbooks/roles/gerrit/templates/gerrit.config.j2 index 46516437d5..9841a8d907 100644 --- a/playbooks/roles/gerrit/templates/gerrit.config.j2 +++ b/playbooks/roles/gerrit/templates/gerrit.config.j2 @@ -133,13 +133,19 @@ system = Storyboard [plugin "javamelody"] allowTopMenu = false -# Gerrit upstream hardcodes a .git extension for cgit. -# The cgit settings below are the same just without the -# .git extension. +# Custom code browser linking for Gitea. [gitweb] - type = gitweb - cgi = /usr/share/gitweb/gitweb.cgi - revision = "?p=${project}.git;a=commitdiff;h=${commit}" + branch = "${project}/src/branch/${branch}" + file = "${project}/src/commit/${hash}/${file}" + filehistory = "${project}/commits/branch/${branch}/${file}" + linkname = gitea + project = "${project}" + revision = "${project}/commit/${commit}" + roottree = "${project}/src/commit/${commit}" + type = custom + urlEncode = false + tag = "${project}/src/tag/${tag}" + url = "https://opendev.org/" [index] type = LUCENE threads = 8