From 7613f3a547b7f684cfb998d71fc7e196874fb072 Mon Sep 17 00:00:00 2001
From: sebivh <sebivhelm@gmail.com>
Date: Tue, 25 Nov 2025 15:41:24 +0100
Subject: [PATCH 1/2] Remove uneccesary gitignore subdir

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6d45635e..f6b80c35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,4 @@ flowbite
 gallery/*
 tailwind
 whoosh_index
-databases/django
+databases

From dac53d2d06b6b73d1cb838d832729e1f7946669a Mon Sep 17 00:00:00 2001
From: sebivh <sebivhelm@gmail.com>
Date: Tue, 25 Nov 2025 15:42:47 +0100
Subject: [PATCH 2/2] Change compose layout to use env file

---
 .gitignore         |  2 +-
 docker-compose.yml | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f6b80c35..621d243f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.env/*
+.env*
 *.pyc
 *_design1
 fet2020/.env/*
diff --git a/docker-compose.yml b/docker-compose.yml
index c4053101..fe8022fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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
@@ -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"