diff --git a/blechreiz/database.sqlite b/blechreiz/database.sqlite index f1c7d51..18a491a 100644 Binary files a/blechreiz/database.sqlite and b/blechreiz/database.sqlite differ diff --git a/blechreiz/settings.py b/blechreiz/settings.py index 64eb746..c4e744c 100644 --- a/blechreiz/settings.py +++ b/blechreiz/settings.py @@ -45,7 +45,9 @@ EMAIL_USE_TLS = False # Hosts/domain names that are valid for this site; required if DEBUG is False -ALLOWED_HOSTS = ["localhost", "127.0.0.1", ".blechreiz.com", ".bauer.tech", ".br.tech"] +ALLOWED_HOSTS = ["localhost", "127.0.0.1", ".blechreiz.com", ".bauer.tech"] + +CSRF_TRUSTED_ORIGINS = ["https://br.bauer.tech", "https://*.bauer.tech", "https://*.blechreiz.com"] # Local time zone for this installation. TIME_ZONE = "Europe/Berlin" @@ -179,7 +181,7 @@ GCAL_COUPLING = { "clientId": "34462582242-4kpdvvbi27ajt4u22uitqurpve9o8ipj.apps.googleusercontent.com", "client_secret": os.environ.get("GCAL_CLIENT_SECRET", ""), "credentials_file": PROJECT_PATH + "/calendarCredentials.dat", - "push_url": "https://blechreiz.bauer.tech/eventplanner_gcal/gcalApiCallback", + "push_url": "https://br.bauer.tech/eventplanner_gcal/gcalApiCallback", } diff --git a/docker-compose.yml b/docker-compose.yml index 7c8d3b4..eceafa2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,16 @@ services: dockerfile: Dockerfile volumes: - .:/app # git repo is the live source + environment: + - VIRTUAL_HOST=br.bauer.tech + - VIRTUAL_PORT=8000 env_file: - blechreiz/.env ports: - - "127.0.0.1:8000:8000" # only localhost; HTTPS handled by external proxy + - "8000:8000" # only localhost; HTTPS handled by external proxy restart: unless-stopped +networks: + default: + name: nginx-proxy + external: true