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

ajout

Browse Source
This commit is contained in:
Caroline Girard 2018-09-25 09:49:14 +02:00
commit 517699ae5f
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/public.scss
View File

@ -276,6 +276,8 @@ h2{
max-width:500px; max-width:500px;
margin:auto; margin:auto;
} }
.row{}
h2{ h2{
color:white; color:white;
@ -343,6 +345,8 @@ h2{
.menu_inner{ .menu_inner{
display:none; display:none;
} }
#menu{ #menu{
display:block; display:block;
background:rgba(255,255,255,0.8); background:rgba(255,255,255,0.8);

18
config/nginx.conf
View File

@ -4,7 +4,7 @@ upstream bievre_reno_app_unicorn {
server { server {
listen [::]:443 ssl; listen [::]:443 ssl;
server_name olwen-capital.com; server_name bievre-renovation.com;
root /srv/www/web/bievre_reno_app/current/public; root /srv/www/web/bievre_reno_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -21,8 +21,8 @@ server {
keepalive_timeout 10; keepalive_timeout 10;
ssl on; ssl on;
ssl_certificate /etc/letsencrypt/live/olwen-capital.com/fullchain.pem; ssl_certificate /etc/letsencrypt/live/bievre-renovation.com/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/olwen-capital.com/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/bievre-renovation.com/privkey.pem;
include snippets/letsencrypt.conf; include snippets/letsencrypt.conf;
@ -31,21 +31,21 @@ server {
server { server {
listen [::]:80; listen [::]:80;
server_name olwen-capital.com olwen.quartz.xyz www.olwen.quartz.xyz; server_name bievre-renovation.com *.bievre-renovation.com;
return 301 https://olwen-capital.com$request_uri; return 301 https://bievre-renovation.com$request_uri;
include snippets/letsencrypt.conf; include snippets/letsencrypt.conf;
} }
server { server {
listen [::]:443 ssl; listen [::]:443 ssl;
server_name www.olwen-capital.com; server_name www.bievre-renovation.com;
ssl on; ssl on;
ssl_certificate /etc/letsencrypt/live/olwen-capital.com/fullchain.pem; ssl_certificate /etc/letsencrypt/live/bievre-renovation.com/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/olwen-capital.com/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/bievre-renovation.com/privkey.pem;
return 301 https://olwen-capital.com$request_uri; return 301 https://bievre-renovation.com$request_uri;
include snippets/letsencrypt.conf; include snippets/letsencrypt.conf;
} }