nicolas/coton_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nicolas:484215164c5153b3e076c3a9c41a81ebd7e16f70
Branches Tags
nicolas:master
nicolas:worker-update
..
compare: nicolas:5f5d2b403f875b5423a95728f60d184aeed56bc5
Branches Tags
nicolas:worker-update
nicolas:master

No commits in common. "484215164c5153b3e076c3a9c41a81ebd7e16f70" and "5f5d2b403f875b5423a95728f60d184aeed56bc5" have entirely different histories.
484215164c ... 5f5d2b403f

2 changed files with 19 additions and 42 deletions
Show Stats Expand all files Collapse all files

2
app/views/layouts/public.html.haml
View File

@ -68,7 +68,7 @@
%span.remove=ic :times %span.remove=ic :times
=flash[:alert] =flash[:alert]
-if current_p_customer and !current_p_customer.account_validated -if !current_p_customer.account_validated
.alert.alert-warning{:style => "margin:0;border-radius:0;"} .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. 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.

31
config/nginx.conf
View File

@ -3,8 +3,8 @@ upstream coton_app_unicorn {
} }
server { server {
listen [::]:443 ssl; listen [::]:80;
server_name shop.biocoton.net; server_name biocoton.quartz.xyz ;
root /srv/www/web/coton_app/current/public; root /srv/www/web/coton_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -19,36 +19,13 @@ server {
error_page 500 502 503 504 /500.html; error_page 500 502 503 504 /500.html;
client_max_body_size 4G; client_max_body_size 4G;
keepalive_timeout 10; 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 { server {
listen [::]:80; listen [::]:80;
server_name shop.biocoton.net *.shop.biocoton.net biocoton.quartz.xyz; server_name www.biocoton.quartz.xyz;
rewrite ^(.*) http://biocoton.quartz.xyz$1 permanent;
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;
} }