Merge remote-tracking branch 'origin/development' into single-course-…

…view

.dev.env

@@ -2,6 +2,7 @@
 PUID=1000
 PGID=1000
 TZ=Europe/Brussels
+FIXTURE=small
 
 # File directories
 DATA_DIR="./data"
@@ -14,11 +15,11 @@ REDIS_IP=192.168.90.10
 REDIS_PORT=6379
 
 # Django
-DJANGO_SECRET_KEY="" # Set to a random string
-DJANGO_DEBUG=True # Django debug mode
-DJANGO_DOMAIN_NAME=localhost # Domain name for the Django server
-DJANGO_CAS_URL_PREFIX="" # URL prefix for the CAS server. Should be empty for development
-DJANGO_CAS_PORT=8080 # Port for the CAS server. Should be 8080 if DJANGO_DOMAIN_NAME is localhost
-DJANGO_DB_ENGINE=django.db.backends.sqlite3 # Database engine
-DJANGO_REDIS_HOST=${REDIS_IP} # Redis configuration
+DJANGO_SECRET_KEY=""
+DJANGO_DEBUG=True
+DJANGO_DOMAIN_NAME=localhost
+DJANGO_CAS_URL_PREFIX=""
+DJANGO_CAS_PORT=8080
+DJANGO_DB_ENGINE="django.db.backends.sqlite3"
+DJANGO_REDIS_HOST=${REDIS_IP}
 DJANGO_REDIS_PORT=${REDIS_PORT}

.github/workflows/backend-linting.yaml

@@ -7,19 +7,18 @@ on:
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
-      - name: Add permission to remove contents of previous action script
-        run: echo ${{ secrets.SUDO }} | sudo -S chown -R $USER:$USER /home/selab2/actions-runner/_work/UGent-7/
       - uses: actions/checkout@v4
       - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
           python-version: "3.11"
       - name: Install dependencies
         run: |
+          cd backend
           python -m pip install --upgrade pip
           pip install poetry
-          poetry install --directory=./backend
+          poetry install
       - name: Execute linting checks
-        run: flake8 --config ./backend/.flake8 ./backend
+        run: cd backend; poetry run flake8 --config .flake8

.github/workflows/tests.yaml

@@ -7,10 +7,8 @@ on:
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
-      - name: Add permission to remove contents of previous action script
-        run: echo ${{ secrets.SUDO }} | sudo -S chown -R $USER:$USER /home/selab2/actions-runner/_work/UGent-7/
       - uses: actions/checkout@v4
       - name: Run tests
-        run: echo ${{ secrets.SUDO }} | sudo -S ./test.sh -c
+        run: ./test.sh -c

.prod.env

@@ -14,23 +14,23 @@ POSTGRES_IP=192.168.90.9
 POSTGRES_PORT=5432
 POSTGRES_DB=selab
 POSTGRES_USER=selab_user
-POSTGRES_PASSWORD="" # Set to desired password
+POSTGRES_PASSWORD=""
 
 # Redis
 REDIS_IP=192.168.90.10
 REDIS_PORT=6379
 
 # Django
-DJANGO_SECRET_KEY="" # Set to a random string
-DJANGO_DEBUG=False # Django debug mode
-DJANGO_DOMAIN_NAME="" # Domain name for the Django server
-DJANGO_CAS_URL_PREFIX="" # URL prefix for the CAS server
-DJANGO_CAS_PORT="" # Port for the CAS server
-DJANGO_DB_ENGINE=django.db.backends.postgresql # Database engine configuration
+DJANGO_SECRET_KEY=""
+DJANGO_DEBUG=False
+DJANGO_DOMAIN_NAME=""
+DJANGO_CAS_URL_PREFIX=""
+DJANGO_CAS_PORT=""
+DJANGO_DB_ENGINE=django.db.backends.postgresql
 DJANGO_DB_NAME=${POSTGRES_DB}
 DJANGO_DB_USER=${POSTGRES_USER}
 DJANGO_DB_PASSWORD=${POSTGRES_PASSWORD}
 DJANGO_DB_HOST=${POSTGRES_IP}
 DJANGO_DB_PORT=${POSTGRES_PORT}
-DJANGO_REDIS_HOST=${REDIS_IP} # Redis configuration
+DJANGO_REDIS_HOST=${REDIS_IP}
 DJANGO_REDIS_PORT=${REDIS_PORT}