diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 020adda5..d7b9072f 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -48,7 +48,11 @@ jobs: uv run python3 manage.py makemigrations --check --dry-run uv run python3 manage.py collectstatic --noinput - name: Run Tests - run: uv run pytest --cov + run: | + uv run pytest -n auto --cov \ + --ignore=RIGS/tests/test_interaction.py \ + --ignore=assets/tests/test_interaction.py \ + --ignore=training/tests/test_interaction.py env: DATABASE_ENGINE: sqlite3 DATABASE_NAME: db.sqlite3 diff --git a/.gitignore b/.gitignore index 96c60b84..3cd84fa9 100644 --- a/.gitignore +++ b/.gitignore @@ -112,5 +112,6 @@ screenshots/ nginx/certs/ nginx/certbot/ +nginx/*.conf *.pem *.key \ No newline at end of file diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 60e676c8..542dfe74 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -48,7 +48,7 @@ INTERNAL_IPS = ['127.0.0.1'] DOMAIN = env('DOMAIN', default='example.com') -ADMINS = [('IT Manager', f'it@{DOMAIN}'), ('Arona Jones', f'arona.jones@{DOMAIN}')] +ADMINS = [('IT Manager', f'it@{DOMAIN}'), ('Hang Xu', f'hang.xu@{DOMAIN}')] if DEBUG: ADMINS.append(('Testing Superuser', 'superuser@example.com')) diff --git a/RIGS/views/rigboard.py b/RIGS/views/rigboard.py index ea4b4d73..1e3f5f44 100644 --- a/RIGS/views/rigboard.py +++ b/RIGS/views/rigboard.py @@ -17,7 +17,7 @@ from django.core import signing from django.core.exceptions import SuspiciousOperation from django.core.mail import EmailMultiAlternatives from django.db.models import Q -from django.http import HttpResponse +from django.http import HttpResponse, HttpResponseForbidden from django.shortcuts import get_object_or_404 from django.template.loader import get_template from django.urls import reverse diff --git a/compose.yml b/compose.yml index ba56f290..8f17ce48 100644 --- a/compose.yml +++ b/compose.yml @@ -8,7 +8,7 @@ services: POSTGRES_PASSWORD: ${DATABASE_PASSWORD} volumes: - - postgres_data:/var/lib/postgresql/data + - postgres_data:/var/lib/postgresql healthcheck: test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}" ] @@ -27,6 +27,7 @@ services: STAGING: ${STAGING:-false} SESSION_COOKIE_SECURE_ENABLED: ${SESSION_COOKIE_SECURE_ENABLED:-true} CSRF_COOKIE_SECURE_ENABLED: ${CSRF_COOKIE_SECURE_ENABLED:-true} + FORUM_WEBHOOK_SECRET: ${FORUM_WEBHOOK_SECRET} DATABASE_ENGINE: ${DATABASE_ENGINE:-postgresql} DATABASE_NAME: ${DATABASE_NAME} DATABASE_USERNAME: ${DATABASE_USERNAME}