suite

app/views/layouts/public.html.haml

@@ -68,7 +68,7 @@
             %span.remove=ic :times
             =flash[:alert] 
     
-    -if !current_p_customer.account_validated
+    -if current_p_customer and !current_p_customer.account_validated
     
       .alert.alert-warning{:style => "margin:0;border-radius:0;"}
         Votre compte client n'a pas encore été validé, vous pouvez dès à présent découvrir nos produits. Notre service commercial validera votre compte dans les plus brefs délais.

config/nginx.conf

@@ -3,8 +3,8 @@ upstream coton_app_unicorn {
 }
 
 server {
-	listen [::]:80;
-	server_name  biocoton.quartz.xyz ;
+        listen [::]:443 ssl;
+        server_name  shop.biocoton.net;
         root /srv/www/web/coton_app/current/public;
         try_files $uri/index.html $uri @unicorn;
 
@@ -19,13 +19,36 @@ server {
         error_page 500 502 503 504 /500.html;
         client_max_body_size 4G;
         keepalive_timeout 10;
+
+  ssl on;
+  ssl_certificate /etc/letsencrypt/live/shop.biocoton.net/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/shop.biocoton.net/privkey.pem;
+
+
+  include snippets/letsencrypt.conf;
 }
 
 
 server {
         listen [::]:80;
-  server_name  www.biocoton.quartz.xyz;
-  rewrite ^(.*) http://biocoton.quartz.xyz$1 permanent;
+  server_name  shop.biocoton.net *.shop.biocoton.net biocoton.quartz.xyz;
+
+  return 301 https://shop.biocoton.net$request_uri;
+
+  include snippets/letsencrypt.conf;
+}
+
+server {
+        listen [::]:443 ssl;
+  server_name  www.shop.biocoton.net biocoton.quartz.xyz;
+  ssl on;
+  ssl_certificate /etc/letsencrypt/live/shop.biocoton.net/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/shop.biocoton.net/privkey.pem;
+
+  return 301 https://shop.biocoton.net$request_uri;
+
+  include snippets/letsencrypt.conf;
 }
 
 
+