summaryrefslogtreecommitdiff
path: root/per-service
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-11-09 13:39:58 -0600
committerAndy Doan <andy.doan@linaro.org>2016-11-10 19:16:08 +0000
commit3ee7e66259be4da581ffaaf58657beb0e16941c5 (patch)
treed414e3beb4f05ecf667663fdad1d2377d75a62d3 /per-service
parent42fb96d6002e9f1c79cc8f2e139512c2239f9217 (diff)
downloadansible-playbooks-3ee7e66259be4da581ffaaf58657beb0e16941c5.tar.gz
cgit: add more configuration options to cgitrc
Android git servers need a few options defined differently. Change-Id: I0e1b1b8103e107b15bf4c094c2dabe2a7eaa3a21 Reviewed-on: https://review.linaro.org/15427 Reviewed-by: Ben Copeland <ben.copeland@linaro.org>
Diffstat (limited to 'per-service')
-rw-r--r--per-service/git-servers/group_vars/git6
-rw-r--r--per-service/git-servers/roles/cgit/templates/cgitrc5
2 files changed, 10 insertions, 1 deletions
diff --git a/per-service/git-servers/group_vars/git b/per-service/git-servers/group_vars/git
index 30a4348..9020726 100644
--- a/per-service/git-servers/group_vars/git
+++ b/per-service/git-servers/group_vars/git
@@ -5,6 +5,12 @@ host_site_desc: Git repositories hosted by Linaro
gitolite_help_url: https://wiki.linaro.org/Platform/Systems/Git
has_gerrit: true
+clone_urls:
+ - https://{{git_host}}
+ - ssh://git@{{git_host}}
+
+cgit_strict_export: true
+
collapsible_sections:
- boot
- bsp
diff --git a/per-service/git-servers/roles/cgit/templates/cgitrc b/per-service/git-servers/roles/cgit/templates/cgitrc
index c0fa02c..9de0147 100644
--- a/per-service/git-servers/roles/cgit/templates/cgitrc
+++ b/per-service/git-servers/roles/cgit/templates/cgitrc
@@ -7,10 +7,13 @@ css=/cgit-css/cgit.css
logo=/cgit-css/git-logo.png
virtual-root=/
+{% if cgit_strict_export %}
strict-export=git-daemon-export-ok
+{% endif %}
enable-git-config=1
enable-index-owner=0
-clone-prefix=https://{{git_host}} ssh://git@{{git_host}}
+clone-prefix={%for x in clone_urls%}{{x}} {%endfor%}
+
snapshots=tar.gz
header={{apache_root}}/cgit/header.html