summaryrefslogtreecommitdiffstats
path: root/roles/git/files/etc
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2015-12-09 17:21:06 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-12-09 17:21:06 +0100
commit2e67b6809d3b44da2e1e6ee6a974f10a3844964f (patch)
tree5e01116da2e0108dc53fe18a2d53d3a8a45c9289 /roles/git/files/etc
parent32dbd35ec0e3e96a1a6ef569a641dc3c9e6a91f7 (diff)
ngnix: mv ssl/config conf.d/ssl
Diffstat (limited to 'roles/git/files/etc')
-rw-r--r--roles/git/files/etc/nginx/sites-available/git2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/git/files/etc/nginx/sites-available/git b/roles/git/files/etc/nginx/sites-available/git
index 112babb..c71dd7b 100644
--- a/roles/git/files/etc/nginx/sites-available/git
+++ b/roles/git/files/etc/nginx/sites-available/git
@@ -33,41 +33,41 @@ server {
uwsgi_pass unix:/run/uwsgi/app/git-http-backend/socket;
}
# send all other URLs to cgit
location / {
gzip off;
include uwsgi_params;
uwsgi_modifier1 9;
uwsgi_pass unix:/run/uwsgi/app/cgit/socket;
}
}
server {
listen 443;
listen [::]:443;
server_name git.fripost.org;
- include ssl/config;
+ include conf.d/ssl;
ssl_certificate /etc/nginx/ssl/git.fripost.org.pem;
ssl_certificate_key /etc/nginx/ssl/git.fripost.org.key;
access_log /var/log/nginx/git.access.log;
error_log /var/log/nginx/git.error.log info;
location ^~ /static/ {
alias /usr/share/cgit/;
expires 30d;
}
# Bypass the CGI to return static files stored on disk. Try first repo with
# a trailing '.git', then without.
location ~* "^/((?U)[^/]+)(?:\.git)?/objects/(?:[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(?:pack|idx))$" {
root /var/lib/gitolite/repositories;
try_files /$1.git/objects/$2 /$1/objects/$2 =404;
expires 30d;
gzip off;
# TODO honor git-daemon-export-ok
}