From d397f265e17e83b1a86707cc038fac58c261fc16 Mon Sep 17 00:00:00 2001
From: root <root@cook.e-declic.net>
Date: Tue, 9 Oct 2018 10:08:08 +0200
Subject: [PATCH] Conf : add https support

---
 conf/nginx.conf                         | 23 ++++++++++++++++++++---
 www/modules/blocknewsadv/head.tpl       |  4 ++--
 www/themes/default-bootstrap/header.tpl |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 2eaf815..bdd9d44 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,9 +4,7 @@ server {
 }
 
 server{
-  listen 80;
-
-  #server_name adapei56.e-declic.net alimentaire.adapei56.e-declic.net industrie.adapei56.e-declic.net menuiserie.adapei56.e-declic.net;
+  listen 443;
   server_name www.esatea-adapei56.com;
   root /home/www/adapei56.esat.com/www;
   client_header_buffer_size 16k;
@@ -185,4 +183,23 @@ rewrite  ^/sauces-et-accompagnements/tomates-cuisinees-au-poivron-et-au-basilic.
 rewrite  ^/terrasses/terrasses-basses.html$  http://www.esatea-adapei56.com/terrasses/ permanent;
 rewrite  ^/terrasses/terrasses-mobil-home.html$  http://www.esatea-adapei56.com/terrasses/ permanent;
 
+
+    ssl_certificate /etc/letsencrypt/live/www.esatea-adapei56.com/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/www.esatea-adapei56.com/privkey.pem; # managed by Certbot
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+
+}
+
+
+server{
+    if ($host = www.esatea-adapei56.com) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+  listen 80;
+  server_name www.esatea-adapei56.com;
+    return 404; # managed by Certbot
+
+
 }
diff --git a/www/modules/blocknewsadv/head.tpl b/www/modules/blocknewsadv/head.tpl
index 70921e3..0d1fea1 100644
--- a/www/modules/blocknewsadv/head.tpl
+++ b/www/modules/blocknewsadv/head.tpl
@@ -19,9 +19,9 @@
  */
  *}
  
- <link href="{$base_dir}modules/blocknewsadv/css/blocknewsadv.css" rel="stylesheet" type="text/css" media="all" />
+ <link href="{$base_dir_ssl}modules/blocknewsadv/css/blocknewsadv.css" rel="stylesheet" type="text/css" media="all" />
 
 {if $blocknewsadvrsson == 1}
-<link rel="alternate" type="application/rss+xml" href="{$base_dir}modules/blocknewsadv/rss.php" />
+<link rel="alternate" type="application/rss+xml" href="{$base_dir_ssl}modules/blocknewsadv/rss.php" />
 {/if}
 	
diff --git a/www/themes/default-bootstrap/header.tpl b/www/themes/default-bootstrap/header.tpl
index 1ac338f..7188369 100755
--- a/www/themes/default-bootstrap/header.tpl
+++ b/www/themes/default-bootstrap/header.tpl
@@ -49,7 +49,7 @@
 		<link rel="stylesheet" href="{$css_uri}" type="text/css" media="{$media}" />
 	{/foreach}
 {/if}
-		<link href='http://fonts.googleapis.com/css?family=Dancing+Script:400,700|Roboto:400,300,300italic,400italic,700italic,700|Roboto+Condensed:300italic,400italic,700italic,400,300,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+		<link href='https://fonts.googleapis.com/css?family=Dancing+Script:400,700|Roboto:400,300,300italic,400italic,700italic,700|Roboto+Condensed:300italic,400italic,700italic,400,300,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
 		<link rel="stylesheet" href="http{if Tools::usingSecureMode()}s{/if}://fonts.googleapis.com/css?family=Open+Sans:300,600" type="text/css" media="all" />
 		{$HOOK_HEADER}
 		<!--[if IE 8]>