summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorTharre <tharre3@gmail.com>2018-07-20 14:04:08 +0200
committerTharre <tharre3@gmail.com>2018-07-20 14:08:18 +0200
commit9fce696c7e8ec25901fc30033f47562e74deeb0e (patch)
tree9bac8d8919bf47b2024df37c8168fcb5fe218307 /roles
parent468fbc855502e45af1e60581ee03cb8fa62e15e8 (diff)
downloadinfrastructure-9fce696c7e8ec25901fc30033f47562e74deeb0e.tar.gz
infrastructure-9fce696c7e8ec25901fc30033f47562e74deeb0e.tar.xz
infrastructure-9fce696c7e8ec25901fc30033f47562e74deeb0e.zip
cgit: enable blame and set .git/description
Diffstat (limited to 'roles')
-rw-r--r--roles/cgit/templates/cgitrc.j23
-rw-r--r--roles/gitolite/templates/gitolite.rc.j22
2 files changed, 2 insertions, 3 deletions
diff --git a/roles/cgit/templates/cgitrc.j2 b/roles/cgit/templates/cgitrc.j2
index 562a002..d5204ae 100644
--- a/roles/cgit/templates/cgitrc.j2
+++ b/roles/cgit/templates/cgitrc.j2
@@ -17,8 +17,7 @@ about-filter=/usr/lib/cgit/filters/about-formatting.sh
clone-url=https://$HTTP_HOST/$CGIT_REPO_URL git://{{ gitolite_clone }}:$CGIT_REPO_URL ssh://{{ gitolite_clone }}/$CGIT_REPO_URL
# enable git blame
-# not implemented yet in v1.1
-#enable-blame=1
+enable-blame=1
# use information from gitolite
enable-git-config=1
diff --git a/roles/gitolite/templates/gitolite.rc.j2 b/roles/gitolite/templates/gitolite.rc.j2
index 39ad211..b183a87 100644
--- a/roles/gitolite/templates/gitolite.rc.j2
+++ b/roles/gitolite/templates/gitolite.rc.j2
@@ -154,7 +154,7 @@
# 'upstream',
# updates 'description' file instead of 'gitweb.description' config item
- # 'cgit',
+ 'cgit',
# allow repo-specific hooks to be added
'repo-specific-hooks',