Simplify letsencrypt

This commit is contained in:
root
2018-03-29 16:13:38 +02:00
parent 3cb8e7ad71
commit d592a40806
18 changed files with 83 additions and 188 deletions

View File

@@ -3,13 +3,7 @@ server {
listen 80;
server_name www.git.triton.fet.at git.triton.fet.at;
location /.well-known {
root /srv/welcome;
allow all;
}
location /{
return 301 https://$host$request_uri;
}
include snippets/letsencrypt.conf;
}
server {
@@ -19,7 +13,6 @@ server {
ssl_certificate /etc/letsencrypt/live/triton.fet.at/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/triton.fet.at/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/triton.fet.at/chain.pem;
include snippets/ssl.conf;
# satisfy any;
@@ -27,8 +20,7 @@ server {
# allow 127.0.0.1;
# deny all;
#
# auth_ldap "FET Login";
# auth_ldap_servers fet;
# include snippets/ldap.conf;
access_log logs/git.triton.access.log;
location = / {
@@ -68,10 +60,11 @@ server {
root /mnt/git_repo/;
}
location ~ ^.*\.git/(HEAD|info/refs|objects/info/.*|git-(upload|receive)-pack)$ {
# satisfy any;
# allow 192.168.95.0/24;
# allow 127.0.0.1;
# deny all;
satisfy any;
allow 192.168.95.0/24;
allow 127.0.0.1;
deny all;
include snippets/ldap.conf;
root /mnt/git_repo/git/;