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

.env.default

@@ -0,0 +1,14 @@
+HOSTNAME="fet.at" # Hostname that will be used to filter requests
+DEBUG="false" # Debug flag ( disables ldap integration )
+LDAP="True" # Ldap flag ( enables connection with fet ldap )
+#SECRET_KEY="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" # Secret key for the Website encryption
+ETHERPAD_GROUP="g.snlbqn7S6ksRbom3" # The Etherpad Group to use
+
+EMAIL_HOST_USER="verleih@fet.at" # The user to be used for rental Emails
+#EMAIL_HOST_PASSWORD="password" # The password for the smtp account for the rental Email
+
+#ETHERPAD_DB_USER="user" # User for the Eterpad MySql Database
+#ETHERPAD_DB_PASSWORD="password" # Password for the Etherpad MySql Database
+
+#DJANGO_MYSQL_USER="user" # The MySql User used for Database
+#DJANGO_MYSQL_PASSWORD"="password" # The Password for the MySql Database

.gitignore

@@ -1,4 +1,4 @@
-.env/*
+.env*
 *.pyc
 *_design1
 fet2020/.env/*
@@ -19,4 +19,4 @@ flowbite
 gallery/*
 tailwind
 whoosh_index
-databases/django
+databases

docker-compose.yml

@@ -9,7 +9,7 @@ services:
     depends_on:
       - django-homepage
     volumes:
-      - ./files:/usr/src/app/files
+      - ./fet2020/files:/usr/src/app/files
       - ./gallery:/usr/src/app/files/uploads/gallery
       - ./assets:/usr/src/app/assets:ro
     networks:
@@ -18,15 +18,15 @@ services:
     container_name: django-container
     image: django-image:latest
     environment:
-      HOST_NAME: "fet.at"
-      DEBUG: "False"
-      LDAP: "True"
-      SECRET_KEY: "sae34sADfrFr89E!Gl#f!34hdjGR#!jopi4qFEr#4R56rT56zT2#wE1!feGp"
-      MYSQL_USER: "user"
-      MYSQL_PASSWORD: "hgu"
-      ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
-      EMAIL_HOST_USER: "verleih@fet.at"
-      EMAIL_HOST_PASSWORD: ""
+      HOST_NAME: ${HOSTNAME}
+      DEBUG: ${DEBUG}
+      LDAP: ${LDAP}
+      SECRET_KEY: ${SECRET_KEY}
+      MYSQL_USER: ${DJANGO_MYSQL_USER}
+      MYSQL_PASSWORD: ${DJANGO_MYSQL_PASSWORD}
+      ETHERPAD_GROUP: ${ETHERPAD_GROUP}
+      EMAIL_HOST_USER: ${EMAIL_HOST_USER}
+      EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
     depends_on:
       mysql:
         condition: service_healthy
@@ -35,7 +35,7 @@ services:
     volumes:
       - ./fet2020:/usr/src/app
       - ./gallery:/usr/src/app/files/uploads/gallery:shared
-      - files-volume:/usr/src/app/files
+      - ./fet2020/files:/usr/src/app/files
       - ./assets:/usr/src/app/assets:ro
     networks:
       - fet-network
@@ -55,8 +55,8 @@ services:
       DB_HOST: etherpadsql
       DB_PORT: 3306
       DB_NAME: etherpaddb
-      DB_USER: user
-      DB_PASS: "hgu"
+      DB_USER: ${ETHERPAD_DB_USER}
+      DB_PASS: ${ETHERPAD_DB_PASSWORD}
       DB_CHARSET: "utf8mb4"
       TRUST_PROXY: false
       AUTHENTICATION_METHOD: "apikey"
@@ -79,8 +79,8 @@ services:
     image: mariadb:10.7
     environment:
       MYSQL_DATABASE: fet2020db
-      MYSQL_USER: user
-      MYSQL_PASSWORD: hgu
+      MYSQL_USER: ${DJANGO_MYSQL_USER}
+      MYSQL_PASSWORD: ${DJANGO_MYSQL_PASSWORD}
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
@@ -98,8 +98,8 @@ services:
     image: mariadb:10.7
     environment:
       MYSQL_DATABASE: etherpaddb
-      MYSQL_USER: user
-      MYSQL_PASSWORD: "hgu"
+      MYSQL_USER: ${ETHERPAD_DB_USER}
+      MYSQL_PASSWORD: ${ETHERPAD_DB_PASSWORD}
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"