X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=srv%2Fateliers%2Fetc%2Fnginx%2Forg%2Fchangedechaine%2Fwww%2Fserver.conf.m4;h=3b0ab4d535e4b4174b1f503d9d4be5bd9fec10d5;hb=ea6b93ffbab9d1bb47faa0110a118f39f4e9023e;hp=0098f1460321e6dbef64eeca67c7ebe1fb20e478;hpb=26ad5dd9a33e2f73b2b94959fbdb6a769b05289a;p=lhc%2Fadmin.git diff --git a/srv/ateliers/etc/nginx/org/changedechaine/www/server.conf.m4 b/srv/ateliers/etc/nginx/org/changedechaine/www/server.conf.m4 index 0098f14..3b0ab4d 100644 --- a/srv/ateliers/etc/nginx/org/changedechaine/www/server.conf.m4 +++ b/srv/ateliers/etc/nginx/org/changedechaine/www/server.conf.m4 @@ -3,18 +3,15 @@ define(`SITE',`DOMAIN/www')dnl define(`NAME',`changedechaine.org')dnl server { listen 80; + include /etc/nginx/conf.d/letsencrypt.conf; include /etc/nginx/SITE/common.conf; access_log /home/www/log/SITE/access.log main; error_log /home/www/log/SITE/error.log warn; } server { - server_name NAME; + server_name + NAME + futur.NAME; listen 80; return 301 http://www.NAME$request_uri; - } -server { - server_name futur.NAME; - listen 80; - return 301 http://www.NAME$request_uri; - } }