From 9ebaa1b7cf576256794bd426707d7e28d3fc80e6 Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@utou.ch>
Date: Sat, 2 Jun 2018 14:37:25 +0200
Subject: [PATCH] Domain setup and archive message

---
 README.md                                     |  4 ++--
 .../web/templates/ph-extra-nginx.conf.j2      | 24 ++++++++++++++++---
 publichealth/static/org/archive-message.html  |  4 +++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 985f2b3..bda3c75 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This project is open source under the [MIT License](LICENSE.md).
 
 ## Development environment
 
-The easiest way to set up your machine would be to use [Vagrant](https://vagrantup.com), then in the project folder in the terminal type: `vagrant up`. Then when it is ready, follow instructions for *Database setup*.
+The easiest way to set up your machine would be to use [Vagrant](https://vagrantup.com), then in the project folder in the terminal type: `vagrant up`. Then when it is ready, follow instructions for *publichealth/static/org/archive-message.htmlDatabase setup*.
 
 To set up a full development environment, follow all these instructions.
 
@@ -21,7 +21,7 @@ If not using Vagrant, you will need to have Ruby and SASS installed on your syst
 sudo apt-get install ruby-sass
 ```
 
-Make sure a recent version of node.js (we recommend using [nave.sh](https://github.com/isaacs/nave)), then:
+Make sure a recent version of node.js (we recommend using [nave.sh](https://gipublichealth/static/org/archive-message.htmlthub.com/isaacs/nave)), then:
 
 ```
 npm install -g bower grunt-cli
diff --git a/ansible/roles/web/templates/ph-extra-nginx.conf.j2 b/ansible/roles/web/templates/ph-extra-nginx.conf.j2
index 50b901d..5f51ef8 100644
--- a/ansible/roles/web/templates/ph-extra-nginx.conf.j2
+++ b/ansible/roles/web/templates/ph-extra-nginx.conf.j2
@@ -7,12 +7,23 @@ server {
 	server_name www-old.{{ domain }};
 	index index.html index.htm;
 	root {{ archive_dir }};
+	add_after_body /archive-message.html;
+	location = /archive-message.html {
+		root {{ release_dir }}/static/org/;
+	}
 	location / {
 		try_files $uri $uri/ =404;
 	}
-	add_after_body /archive-message.html;
-	location = /archive-message.html {
-		root {{ release_dir }}/static/org/archive-message.html;
+	# Enable secure site support
+	listen [::]:443;
+	listen 443 ssl;
+	ssl on;
+	ssl_certificate /etc/letsencrypt/live/{{ domain }}/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/{{ domain }}/privkey.pem;
+	include /etc/letsencrypt/options-ssl-nginx.conf;
+
+	if ($scheme != "https") {
+		return 301 https://$host$request_uri;
 	}
 }
 
@@ -25,4 +36,11 @@ server {
 	location / {
 		return 301 $scheme://sph17.organizers-congress.org;
 	}
+	# Enable secure site support
+	listen [::]:443;
+	listen 443 ssl;
+	ssl on;
+	ssl_certificate /etc/letsencrypt/live/{{ domain }}/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/{{ domain }}/privkey.pem;
+	include /etc/letsencrypt/options-ssl-nginx.conf;
 }
diff --git a/publichealth/static/org/archive-message.html b/publichealth/static/org/archive-message.html
index 12984a9..e9977e8 100644
--- a/publichealth/static/org/archive-message.html
+++ b/publichealth/static/org/archive-message.html
@@ -4,7 +4,7 @@
 </h3>
 <style>
   .archive-message {
-    padding: 2em;
+    padding: 1em;
     background: red;
     color: white;
     position: fixed;
@@ -12,6 +12,8 @@
     display: block;
     width: 100%;
     left: 0px;
+    z-index: 10000;
+    margin: 0px;
   }
   .archive-message a {
     border-radius: 5px;