Merge branch 'master' of https://git.fet.at/bofh/fet2020

deployment/nginx.conf

@@ -20,6 +20,15 @@ server {
   
     }
     
+    location /etherpad {
+    	rewrite /etherpad/(.*) $1 break;
+	rewrite ^/etherpad$ /etherpad/ permanent;
+	proxy_pass http://etherpad:8080;
+	proxy_redirect / /etherpad/;
+	proxy_set_header Host $host;
+	proxy_buffering off;
+    }
+    
     location / {
     	include uwsgi_params;
         uwsgi_pass unix:///tmp/uwsgi.sock;

docker-compose.yml

@@ -41,6 +41,8 @@ services:
       - etherpadsql
   fet2020:
     image: fet2020django
+    environment:
+      HOST_NAME: "uat1.2020.fet.at"
     depends_on:
      - mysql
     ports:

fet2020/fet2020/settings.py

@@ -19,7 +19,8 @@ env = environ.Env(
     MYSQL_PORT=(int, 3308),
     MYSQL_DATABASE=(str, "fet2020db"),
     MYSQL_USER=(str),
-    MYSQL_PASSWORD=(str)
+    MYSQL_PASSWORD=(str),
+    HOST_NAME=(str, "localhost")
 )
 
 # Prints and logs are written to console
@@ -56,7 +57,7 @@ else:
     SECRET_KEY = env('SECRET_KEY')
 
 
-ALLOWED_HOSTS = ["127.0.0.1", "localhost"]
+ALLOWED_HOSTS = ["127.0.0.1", env('HOST_NAME')]
 
 
 DATA_UPLOAD_MAX_MEMORY_SIZE = 1024 * 1024 * 1024

fet2020/initdb

@@ -1,3 +1,3 @@
 #!/bin/sh
-python manage.py makemigrations && python manage.py makemigrations posts members \
+python manage.py makemigrations && python manage.py makemigrations posts members blackboard\
 && python manage.py migrate