diff --git a/config/nginx.conf b/config/nginx.conf index b4f8c16..1d92125 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream ecole_eft_app_unicorn { server { listen [::]:443 ssl; - server_name ecole-eft-france.fr arreter-de-fumer-avec-eft.com; + server_name ecole-eft-france.fr; root /srv/www/web/ecole_eft_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -28,21 +28,10 @@ server { include snippets/letsencrypt.conf; } -server { - listen [::]:443 ssl; - server_name www.arreter-de-fumer-avec-eft.com ; - ssl on; - ssl_certificate /etc/letsencrypt/live/ecole-eft-france.fr/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/ecole-eft-france.fr/privkey.pem; - - return 301 https://arreter-de-fumer-avec-eft.com$request_uri; - - include snippets/letsencrypt.conf; -} server { listen [::]:443 ssl; - server_name www.ecole-eft-france.fr *.techniques-eft.org *.techniques-eft.info *.techniques-eft.fr *.techniques-eft.eu techniques-eft.org techniques-eft.info techniques-eft.fr techniques-eft.eu ; + server_name www.ecole-eft-france.fr; ssl on; ssl_certificate /etc/letsencrypt/live/ecole-eft-france.fr/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/ecole-eft-france.fr/privkey.pem; @@ -52,58 +41,9 @@ server { include snippets/letsencrypt.conf; } - -server { - listen [::]:80; - server_name te.quartz.xyz; - root /srv/www/web/ecole_eft_app/current/public; - try_files $uri/index.html $uri @unicorn; - - location @unicorn { - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_pass http://ecole_eft_app_unicorn; - proxy_read_timeout 6000; - } - - error_page 500 502 503 504 /500.html; - client_max_body_size 4G; - keepalive_timeout 10; - - - include snippets/letsencrypt.conf; -} - - -server { - listen [::]:443 ssl; - server_name www.ecole-eft-france.fr *.techniques-eft.org *.techniques-eft.info *.techniques-eft.fr *.techniques-eft.eu techniques-eft.org techniques-eft.info techniques-eft.fr techniques-eft.eu ; - ssl on; - ssl_certificate /etc/letsencrypt/live/ecole-eft-france.fr/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/ecole-eft-france.fr/privkey.pem; - - return 301 https://ecole-eft-france.fr$request_uri; - - include snippets/letsencrypt.conf; -} - - - - - -server { - listen [::]:80; - server_name arreter-de-fumer-avec-eft.com *.arreter-de-fumer-avec-eft.com www.arreter-de-fumer-avec-eft.com arreter-de-fumer.bally.me; - - return 301 https://arreter-de-fumer-avec-eft.com$request_uri; - - include snippets/letsencrypt.conf; -} - server { listen [::]:80; - server_name ecole-eft-france.fr www.ecole-eft-france.fr eft.bally.me *.techniques-eft.org *.techniques-eft.info *.techniques-eft.fr *.techniques-eft.eu techniques-eft.org techniques-eft.info techniques-eft.fr techniques-eft.eu ; + server_name ecole-eft-france.fr www.ecole-eft-france.fr ; return 301 https://ecole-eft-france.fr$request_uri;