From 8e1e589274d5bb104d193d031cc22e0b4f9bef2d Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Tue, 6 Sep 2016 12:16:19 +0200 Subject: [PATCH] =?utf8?q?Modifications=C2=A0:=20=20=20=20=20=20=20=20=20e?= =?utf8?q?tc/sv/nginx/local.sh=20-=20Mise=20en=20place=20de=20letsencrypt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- etc/nginx/site.d/burette/site.conf | 2 ++ etc/nginx/site.d/gitweb-tls/local.conf | 4 ++-- etc/sv/nginx/local.sh | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/nginx/site.d/burette/site.conf b/etc/nginx/site.d/burette/site.conf index a65c12e..f7b371a 100644 --- a/etc/nginx/site.d/burette/site.conf +++ b/etc/nginx/site.d/burette/site.conf @@ -46,6 +46,8 @@ server_name burette.vieuxbiclou.org burettes.heureux-cyclage.org; + include /etc/nginx/conf.d/letsencrypt.conf; + client_body_buffer_size 1024k; client_max_body_size 10m; diff --git a/etc/nginx/site.d/gitweb-tls/local.conf b/etc/nginx/site.d/gitweb-tls/local.conf index 9bc6201..2acbbae 100644 --- a/etc/nginx/site.d/gitweb-tls/local.conf +++ b/etc/nginx/site.d/gitweb-tls/local.conf @@ -1,5 +1,5 @@ listen 443; include /etc/nginx/conf.d/ssl.conf; -ssl_certificate /etc/nginx/x509.d/gitweb-tls/crt.pem; -ssl_certificate_key /etc/nginx/x509.d/gitweb-tls/key.pem; +ssl_certificate /etc/nginx/org/heureux-cyclage/crt.pem; +ssl_certificate_key /etc/nginx/org/heureux-cyclage/key.pem; ssl_session_timeout 5m; diff --git a/etc/sv/nginx/local.sh b/etc/sv/nginx/local.sh index e7331d4..9f4249e 100644 --- a/etc/sv/nginx/local.sh +++ b/etc/sv/nginx/local.sh @@ -78,6 +78,7 @@ for site in $(find "$tool"/etc/nginx/site.d \ sudo install -m 660 -o www -g www /dev/stdin \ /etc/nginx/site.d/"$site"/server.conf <<-EOF server { + include /etc/nginx/conf.d/letsencrypt.conf; access_log /home/www/log/$site/nginx/access.log main; error_log /home/www/log/$site/nginx/error.log warn; $(if ! grep -q '^root\>' "$tool"/etc/nginx/site.d/"$site"/site.conf -- 2.20.1