From 1f93c50fde3dce75cc35d9dc0b5426807b6f43da Mon Sep 17 00:00:00 2001
From: Malte Vogl <mvogl@mpiwg-berlin.mpg.de>
Date: Wed, 3 Jan 2018 14:37:14 +0100
Subject: [PATCH] redirect from http, edit env address

---
 .gitlab-ci.yml             | 2 +-
 config/nginx/mydjango.conf | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e587b9..2474673 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ deploy:
         - ssh -t cloud@$DEPLOYHOST "export ADMIN_PWD=$DJANGO_ADMIN_PWD && cd django/eoa-django-test && git fetch --all && git reset --hard origin/master && sh scripts/start_deploy.sh "
     environment:
         name: production
-        url: http://141.5.105.187:8000/publications/studies/312/index.html
+        url: https://c105-187.cloud.gwdg.de/publications/studies/312/index.html
     only:
         - master
     when: manual
diff --git a/config/nginx/mydjango.conf b/config/nginx/mydjango.conf
index 01ee836..e85669d 100644
--- a/config/nginx/mydjango.conf
+++ b/config/nginx/mydjango.conf
@@ -3,6 +3,13 @@ upstream web {
   server web:8000;
 }
 
+server {
+    listen 80;
+    listen [::]:80;
+    return 301 https://$host$request_uri;
+}
+
+
 server {
 
     location /static/ {