diff options
Diffstat (limited to 'git/web/templates')
| -rw-r--r-- | git/web/templates/cgit.nginx.conf.j2 | 5 | ||||
| -rw-r--r-- | git/web/templates/cgitrc.j2 | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/git/web/templates/cgit.nginx.conf.j2 b/git/web/templates/cgit.nginx.conf.j2 index 324dd0c..0ddbe38 100644 --- a/git/web/templates/cgit.nginx.conf.j2 +++ b/git/web/templates/cgit.nginx.conf.j2 @@ -25,11 +25,6 @@ server { root /usr/share/cgit; - # Redirect old Mercurial-style paths to cgit equivalents - rewrite ^/([^/]+)/file/tip/(.*)$ /$1/tree/$2 permanent; - rewrite ^/([^/]+)/file/tip$ /$1/tree permanent; - rewrite ^/([^/]+)/file$ /$1/tree permanent; - try_files $uri @cgit; location @cgit { diff --git a/git/web/templates/cgitrc.j2 b/git/web/templates/cgitrc.j2 index 76a91d6..6e8df0c 100644 --- a/git/web/templates/cgitrc.j2 +++ b/git/web/templates/cgitrc.j2 @@ -1,12 +1,22 @@ -scan-path={{cgit_scan_path}} remove-suffix=1 virtual-root=/ root-title={{cgit_root_title}} root-desc={{cgit_root_desc}} +{% if cgit_css_src is defined %} +css=/cgit-custom.css +{% endif %} +{% if cgit_header_src is defined %} +header=/etc/cgit/header.html +{% endif %} +{% if cgit_footer_src is defined %} +footer=/etc/cgit/footer.html +{% endif %} + difftype=ssdiff +enable-git-config=1 enable-http-clone=1 enable-index-links=1 enable-log-filecount=1 @@ -14,3 +24,5 @@ enable-log-linecount=1 source-filter=/usr/lib/cgit/filters/syntax-highlighting.py about-filter=/usr/lib/cgit/filters/about-formatting.sh + +scan-path={{cgit_scan_path}} |