diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 4c22048..4f7a855 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -360,7 +360,7 @@
="-"
=ic(:phone)
- +33 (0)3 88 85 05 40
+ +33 (0)3 29 89 35 34
="-"
=ic(:"envelope-o")
diff --git a/app/views/public/contacts/_form.html.haml b/app/views/public/contacts/_form.html.haml
index 8e612bb..ff054ac 100755
--- a/app/views/public/contacts/_form.html.haml
+++ b/app/views/public/contacts/_form.html.haml
@@ -83,7 +83,7 @@
%p
=ic(:phone)
- +33 (0)3 88 85 05 40
+ +33 (0)3 29 89 35 34
%p
=ic(:"envelope-o")
diff --git a/config/nginx.conf b/config/nginx.conf
index 21c5937..ca69ea0 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -6,9 +6,10 @@ upstream jipe_app_unicorn {
+
server {
- listen [::]:80;
- server_name jipe.fr ;
+ listen [::]:443 ssl;
+ server_name jipe.fr;
root /srv/www/web/jipe_app/current/public;
try_files $uri/index.html $uri @unicorn;
@@ -17,18 +18,40 @@ server {
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_pass http://jipe_app_unicorn;
- proxy_read_timeout 99999;
+ proxy_read_timeout 6000;
}
error_page 500 502 503 504 /500.html;
client_max_body_size 4G;
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 {
listen [::]:80;
- server_name www.jipe.fr *.jipe.fr jipe.quartz.xyz;
- rewrite ^(.*) http://jipe.fr$1 permanent;
+ server_name jipe.fr *.jipe.fr;
+
+ 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;
}