diff --git a/compose.yaml b/compose.yaml index ffe2a46..b91ae2f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,7 +7,7 @@ services: ports: - "8912:5432" healthcheck: - test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] + test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ] interval: 1s timeout: 2s retries: 300 @@ -47,7 +47,7 @@ services: - /app/.venv networks: - lasuite - - default + - default depends_on: postgresql: condition: service_healthy @@ -67,7 +67,7 @@ services: networks: - default - lasuite - command: ["celery", "-A", "calendars.celery_app", "worker", "-l", "DEBUG"] + command: [ "celery", "-A", "calendars.celery_app", "worker", "-l", "DEBUG" ] environment: - DJANGO_CONFIGURATION=Development env_file: @@ -108,8 +108,6 @@ services: - ./src/frontend/:/home/frontend/ - /home/frontend/node_modules - /home/frontend/apps/calendars/node_modules - - /home/frontend/packages/open-calendar/dist - - /home/frontend/packages/open-calendar/node_modules ports: - "8920:3000" diff --git a/env.d/development/backend.defaults b/env.d/development/backend.defaults index 37d58ee..7141512 100644 --- a/env.d/development/backend.defaults +++ b/env.d/development/backend.defaults @@ -50,6 +50,8 @@ OIDC_RS_ALLOWED_AUDIENCES="" CALDAV_URL=http://caldav:80 CALDAV_OUTBOUND_API_KEY=changeme-outbound-in-production CALDAV_INBOUND_API_KEY=changeme-inbound-in-production +# Internal URL for CalDAV scheduling callbacks (accessible from CalDAV container) +CALDAV_CALLBACK_BASE_URL=http://backend-dev:8000 # Frontend FRONTEND_THEME=default diff --git a/env.d/development/caldav.defaults b/env.d/development/caldav.defaults index d44d66e..ca086e2 100644 --- a/env.d/development/caldav.defaults +++ b/env.d/development/caldav.defaults @@ -5,4 +5,7 @@ PGUSER=pgroot PGPASSWORD=pass CALENDARS_BASE_URI=/api/v1.0/caldav/ CALDAV_INBOUND_API_KEY=changeme-inbound-in-production -CALDAV_OUTBOUND_API_KEY=changeme-outbound-in-production \ No newline at end of file +CALDAV_OUTBOUND_API_KEY=changeme-outbound-in-production +# Default callback URL for sending scheduling notifications (emails) +# Used when clients (like Apple Calendar) don't provide X-CalDAV-Callback-URL header +CALDAV_CALLBACK_URL=http://backend-dev:8000/api/v1.0/caldav-scheduling-callback \ No newline at end of file