From 607870c7c1cef85d421eba771e44bd6071a5d216 Mon Sep 17 00:00:00 2001
From: ray <ray@kvm.isnet.uk>
Date: Mon, 25 Feb 2019 23:09:57 +0200
Subject: [PATCH] ssl config

---
 etc/nginx/sites-available/marcleopold |  24 ++++++++++++++++++++++--
 server/storage/database.sqlite        | Bin 458752 -> 458752 bytes
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/etc/nginx/sites-available/marcleopold b/etc/nginx/sites-available/marcleopold
index 9dde7f3..292430e 100644
--- a/etc/nginx/sites-available/marcleopold
+++ b/etc/nginx/sites-available/marcleopold
@@ -1,6 +1,4 @@
 server {
-	listen 80;
-	listen [::]80;
 
 	server_name marcleopold.isnet.uk;
 
@@ -15,6 +13,14 @@ server {
 		proxy_set_header X-Forwarded-Proto $scheme;
 	}
 
+
+    listen [::]:443 ssl; # managed by Certbot
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/marcleopold.isnet.uk/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/marcleopold.isnet.uk/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 {
@@ -52,3 +58,17 @@ server {
 	server_name cms.marcleopold.isnet.uk;
     return 404; # managed by Certbot
 }
+server {
+    if ($host = marcleopold.isnet.uk) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+
+	listen 80;
+	listen [::]80;
+
+	server_name marcleopold.isnet.uk;
+    return 404; # managed by Certbot
+
+
+}
\ No newline at end of file
diff --git a/server/storage/database.sqlite b/server/storage/database.sqlite
index e82d0a2b1ebe3a33b077f2ea8277dd195a0a8f5e..95e63dce9a805ee422ddbb9ea84ef6a9e39d9588 100755
GIT binary patch
delta 172
zcmZo@kZEX;nIO$*H&Mo!(QaeHVm(HdW)}T+7JWt_W?Igo&#cJ9!oP%p|0Vwg{$2b_
zHVYa|;TIEO;bP!a<X`|nLvtfNBXd0iJ;Uj{;+egGs^2p3|Kb16|B3%CQ1xAYWfo>m
zMivmk3?i7AnK?PR7#J8>_zyAw4L!*Jk^eqW;YR-H7wVZg*}z7zv;)~d45C@LU#Mp@
GXaE2XzbsGy

delta 126
zcmZo@kZEX;nIO$*J5k1&(RO3PVm(IYW)}T+7JWt_W?Igo&#cJB%)g6)|0Vwg{#}~|
z4c72a-xbg71r+?m!2gH;JO3x3;1hls7G_RHW)Q)|%*@Hj#lXP8%zuFasOcmBeV~d%
V{OuR&nSq!Eh*`H^sAn^1005FlB&`4d