CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 1.0.3
-
-- Log to stdout/stderr instead of a log file. The volume for logs isn't needed anymore.
-- Updated dependencies.
-
 ## 1.0.2
 
 ### Fixes

README.md

@@ -12,11 +12,12 @@ Assistants have a separate interface to set marks and schedule appointments with
 
 You can deploy AdvLabDB easily using Docker. Take a look at [`compose.yaml`](compose.yaml) as a starting point for usage with `docker compose`.
 
-One volume has to be mounted at `/volumes/data` in the container.
-This volume has to contain the two files `settings.ini` and `secrets.ini`:
+The container uses two volumes:
 
-- A template for `settings.ini` can be found at [`deploy/settings_template.ini`](deploy/settings_template.ini). This template will be automatically copied to the data volume as default settings file if a settings file does not already exist.
-- The file `secrets.ini` will be generated automatically after the first start of the container if it does not exist.
+- One volume has to be mounted at `/volumes/data` in the container. This volume has to contain the two files `settings.ini` and `secrets.ini`:
+  - A template for `settings.ini` can be found at [`deploy/settings_template.ini`](deploy/settings_template.ini). This template will be automatically copied to the data volume as default settings file if a settings file does not already exist.
+  - The file `secrets.ini` will be generated automatically after the first start of the container if it does not exist.
+- The second volume has to be mounted at `/volumes/logs` to store logs.
 
 After configuring a compose file, run the command `sudo docker compose run advlabdb manage.py setup init-db` to initialize the database with a guide.
 
@@ -33,7 +34,7 @@ If you don't want to use your own reverse proxy, you can use [`compose.yaml`](co
 - Open the file `~/advlabdb/traefik/etc/dynamic`, uncomment ``rule: Host(`SERVER_NAME`)`` and replace `SERVER_NAME` with your domain, `advlabdb.mo8it.com` for example.
 - Change the time zone `TZ` in `~/advlabdb/traefik/compose.yaml` if it is not `Europe/Berlin`. Use the command `tzselect` to find out your time zone.
 - Now start Traefik by running the command `sudo docker compose up -d` in the directory `~/advlabdb/traefik`.
-- Create a directory for the data volume: `mkdir ~/advlabdb/data`
+- Create directories for the data and logs volumes: `mkdir ~/advlabdb/{data,logs}`
 - Change the time zone `TZ` in `~/advlabdb/repo/compose.yaml` if it is not `Europe/Berlin`.
 - Initialize the database by running `sudo docker compose run advlabdb manage.py setup init-db` in the directory `~/advlabdb/repo` and following the guide.
 - Start AdvLabDB by running the command `sudo docker compose up -d` in the directory `~/advlabdb/repo`.

compose.yaml

@@ -8,6 +8,7 @@ services:
     restart: unless-stopped
     volumes:
       - ../data:/volumes/data:Z
+      - ../logs:/volumes/logs:Z
     environment:
       - TZ=Europe/Berlin
     networks:

deploy/traefik/compose.yaml

@@ -5,6 +5,7 @@ services:
     restart: unless-stopped
     volumes:
       - ./etc:/etc/traefik:Z,ro
+      - ./logs:/volumes/logs:Z
       - ./certs:/volumes/certs:Z
     environment:
       - TZ=Europe/Berlin

deploy/traefik/etc/traefik.yaml

@@ -3,6 +3,10 @@ global:
   checkNewVersion: false
   sendAnonymousUsage: false
 
+log:
+  filePath: /volumes/logs/traefik.log
+  level: ERROR
+
 entryPoints:
   web:
     address: :80
@@ -11,6 +15,7 @@ entryPoints:
         entryPoint:
           to: websecure
           scheme: https
+
   websecure:
     address: :443
     http:
@@ -26,6 +31,7 @@ certificatesResolvers:
       tlsChallenge: {}
 
 accessLog:
+  filePath: /volumes/logs/access.log
   bufferingSize: 128
 
 providers:

init.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# Use the settings template as default settings if the settings file doesn't already exist
+# Use settings template as default settings if the settings does not file already exist
 SETTINGS_FILE=/volumes/data/settings.ini
 if [[ ! -f "$SETTINGS_FILE" ]]; then
     cp deploy/settings_template.ini "$SETTINGS_FILE" \
         && echo "Initialized default settings at $SETTINGS_FILE"
 fi
 
-# Generate secrets if the secrets file doesn't already exist
+# Generate secrets if the secrets file does not already exist
 ./manage.py setup generate-secrets
 
 # Start the server
-gunicorn --bind 0.0.0.0:80 --workers 4 --log-level error "run:create_app()"
+gunicorn --bind "0.0.0.0:80" --workers "5" --log-file "/volumes/logs/gunicorn.log" "run:create_app()"

pyproject.toml

@@ -1,23 +1,26 @@
 [tool.poetry]
 name = "advlabdb"
-version = "1.0.3"
+version = "1.0.2"
 description = "Database with a web interface for labs."
 authors = ["Mo Bitar <mo8it@proton.me>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "~3.12"
-argon2-cffi = "^23.1" # Needed for hashing passwords with flask-security
+python = ">3.11,<3.13"
 click = "^8.1"
+email-validator = "^2.1"
+flask = "^3.0"
 flask-admin = "^1.6"
+flask-login = "^0.6"
 flask-migrate = "^4.0"
-flask-security = "^5.5"
+flask-security-Too = "^5.4"
 flask-sqlalchemy = "^3.1"
-gunicorn = "^23.0"
+flask-wtf = "^1.2"
+gunicorn = "^21.2"
 markupsafe = "^2.1"
-matplotlib = "^3.9"
-numpy = "^2.1"
-setuptools = "^74.1"
+matplotlib = "^3.8"
+numpy = "^1.26"
+setuptools = "^69.1"
 
 [tool.ruff]
 line-length = 120