Ajout : etc/nginx/conf.d/letsencrypt.conf

[lhc/admin.git] / srv / ateliers / etc / nginx / org / heureux-cyclage / www / server.conf.m4

diff --git a/srv/ateliers/etc/nginx/org/heureux-cyclage/www/server.conf.m4 b/srv/ateliers/etc/nginx/org/heureux-cyclage/www/server.conf.m4
index 45f349c..ad27b10 100644 (file)
--- a/srv/ateliers/etc/nginx/org/heureux-cyclage/www/server.conf.m4
+++ b/srv/ateliers/etc/nginx/org/heureux-cyclage/www/server.conf.m4
@@ -2,9 +2,10 @@ define(`DOMAIN',`org/heureux-cyclage')dnl
 define(`SITE',`DOMAIN/www')dnl
 server {
        listen 80;
+       include /etc/nginx/conf.d/letsencrypt.conf;
        include /etc/nginx/SITE/common.conf;
-       
-       return 301 http://www.heureux-cyclage.org$request_uri;
+       access_log /home/www/log/SITE/access.log main;
+       error_log  /home/www/log/SITE/error.log warn;
  }
 server {
        listen 443;
@@ -12,4 +13,16 @@ server {
        include /etc/nginx/conf.d/ssl-pfs.conf;
        ssl_certificate     /etc/nginx/DOMAIN/crt.pem;
        ssl_certificate_key /etc/nginx/DOMAIN/key.pem;
+       access_log /home/www/log/SITE/tls/access.log main;
+       error_log  /home/www/log/SITE/tls/error.log warn;
+}
+server {
+       server_name heureux-cyclage.org;
+       listen 80;
+       return 301 http://www.heureux-cyclage.org$request_uri;
+ }
+server {
+       server_name heureux-cyclage.org;
+       listen 443;
+       return 301 https://www.heureux-cyclage.org$request_uri;
 }