From d01dde658f2294078e79055b857fdea7adabdcb5 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Oct 2025 17:56:33 +0200 Subject: [PATCH 1/6] change mode to +x --- fet2020/docker-entrypoint.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 fet2020/docker-entrypoint.sh diff --git a/fet2020/docker-entrypoint.sh b/fet2020/docker-entrypoint.sh old mode 100644 new mode 100755 From 047dfcb14709e05d7b56a65cf387916764903e35 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 31 Oct 2025 15:05:34 +0100 Subject: [PATCH 2/6] Renamed Asset --- .../rental/{Verleihregeln.pdf => verleihregeln.pdf} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename assets/rental/{Verleihregeln.pdf => verleihregeln.pdf} (100%) diff --git a/assets/rental/Verleihregeln.pdf b/assets/rental/verleihregeln.pdf similarity index 100% rename from assets/rental/Verleihregeln.pdf rename to assets/rental/verleihregeln.pdf From 7613f3a547b7f684cfb998d71fc7e196874fb072 Mon Sep 17 00:00:00 2001 From: sebivh Date: Tue, 25 Nov 2025 15:41:24 +0100 Subject: [PATCH 3/6] 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 Date: Tue, 25 Nov 2025 15:42:47 +0100 Subject: [PATCH 4/6] 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" From 4d8a7a68f4f01e70dc4fac3f0c2450efc78bbecf Mon Sep 17 00:00:00 2001 From: sebivh Date: Tue, 16 Dec 2025 14:40:23 +0100 Subject: [PATCH 5/6] Add default env file --- .env.default | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .env.default diff --git a/.env.default b/.env.default new file mode 100644 index 00000000..d1b293cb --- /dev/null +++ b/.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 From 3b4e42c11928872beb07e02b2f0ae86b477a2a44 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 16 Dec 2025 15:02:14 +0100 Subject: [PATCH 6/6] Removed the fucking file volume --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fe8022fe..0a041970 100644 --- a/docker-compose.yml +++ b/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: @@ -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