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

suite

Browse Source
This commit is contained in:
Nicolas Bally 2019-01-26 20:19:49 +01:00
parent bf96dd15e5
commit 4244aba4c3
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,7 +360,7 @@
="-" ="-"
=ic(:phone) =ic(:phone)
+33 (0)3 88 85 05 40 +33 (0)3 29 89 35 34
="-" ="-"
=ic(:"envelope-o") =ic(:"envelope-o")

2
app/views/public/contacts/_form.html.haml
View File

@ -83,7 +83,7 @@
%p %p
=ic(:phone) =ic(:phone)
+33 (0)3 88 85 05 40 +33 (0)3 29 89 35 34
%p %p
=ic(:"envelope-o") =ic(:"envelope-o")

31
config/nginx.conf
View File

@ -6,8 +6,9 @@ upstream jipe_app_unicorn {
server { server {
listen [::]:80; listen [::]:443 ssl;
server_name jipe.fr; server_name jipe.fr;
root /srv/www/web/jipe_app/current/public; root /srv/www/web/jipe_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -17,18 +18,40 @@ server {
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_redirect off; proxy_redirect off;
proxy_pass http://jipe_app_unicorn; proxy_pass http://jipe_app_unicorn;
proxy_read_timeout 99999; proxy_read_timeout 6000;
} }
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/jipe.fr/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/jipe.fr/privkey.pem;
include snippets/letsencrypt.conf;
} }
server { server {
listen [::]:80; listen [::]:80;
server_name www.jipe.fr *.jipe.fr jipe.quartz.xyz; server_name jipe.fr *.jipe.fr;
rewrite ^(.*) http://jipe.fr$1 permanent;
return 301 https://jipe.fr$request_uri;
include snippets/letsencrypt.conf;
}
server {
listen [::]:443 ssl;
server_name www.jipe.fr;
ssl on;
ssl_certificate /etc/letsencrypt/live/jipe.fr/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/jipe.fr/privkey.pem;
return 301 https://jipe.fr$request_uri;
include snippets/letsencrypt.conf;
} }