From 94424dbde877664ffa882e4b936df0059de32956 Mon Sep 17 00:00:00 2001
From: peter_rabbit <pierrejarriges@gmail.com>
Date: Mon, 25 Jan 2021 15:27:38 +0100
Subject: [PATCH] fix:https 301

---
 data/nginx/app.conf | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/data/nginx/app.conf b/data/nginx/app.conf
index cfbc0c9..0c688f0 100644
--- a/data/nginx/app.conf
+++ b/data/nginx/app.conf
@@ -1,39 +1,26 @@
 server {
-    listen 80;
-
+    listen 80;  
+    server_name kuadrado-software.fr www.kuadrado-software.fr;
     root   /usr/share/nginx/html;
     index  index.html index.htm;
-
-    server_name kuadrado-software.fr www.kuadrado-software.fr;
     server_tokens off;
-
     location /.well-known/acme-challenge/ {
         root /var/www/certbot;
     }
 
-#    location / {
-#        return 301 https://$host$request_uri;
-#    }
+   location / {
+       return 301 https://$host$request_uri;
+   }
 }
 
 server {
+    server_name kuadrado-software.fr www.kuadrado-software.fr;
     listen 443 ssl;
-
     root   /usr/share/nginx/html;
     index  index.html index.htm;
-
-    server_name kuadrado-software.fr www.kuadrado-software.fr;
     server_tokens off;
-
     ssl_certificate /etc/letsencrypt/live/kuadrado-software.fr/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/kuadrado-software.fr/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
-    location / {
-        proxy_pass  http://kuadrado-software.fr;
-        proxy_set_header    Host                $http_host;
-        proxy_set_header    X-Real-IP           $remote_addr;
-        proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-    }
 }
-- 
GitLab