From fe5b55554dc146aededd5a0ca2e75294cbf3602d Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Thu, 29 Oct 2026 22:17:56 +0100 Subject: [PATCH] cojedzie: Add COJEDZIE_DATABASE_URL, drop unused update cron var Co-Authored-By: Claude Opus 5.5 --- services/cojedzie/templates/api.env | 2 ++ services/cojedzie/vars/main.yml | 1 - services/cojedzie@next/templates/api.env | 2 ++ services/cojedzie@next/vars/main.yml | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/cojedzie/templates/api.env b/services/cojedzie/templates/api.env index 7898f78..425c027 100644 --- a/services/cojedzie/templates/api.env +++ b/services/cojedzie/templates/api.env @@ -2,7 +2,9 @@ MERCURE_URL=http://mercure/.well-known/mercure MERCURE_PUBLIC_URL=https://{{ cojedzie_domain }}/.well-known/mercure MERCURE_JWT_SECRET={{ cojedzie_mercure_jwt_key }} +# DATABASE_URL is read by images before the COJEDZIE_ prefix (cojedzie#65); drop it once both run a newer one DATABASE_URL=mysql://{{ cojedzie_database.user }}:{{ cojedzie_database.password }}@{{ database_mysql_host }}/{{ cojedzie_database.name }} +COJEDZIE_DATABASE_URL=mysql://{{ cojedzie_database.user }}:{{ cojedzie_database.password }}@{{ database_mysql_host }}/{{ cojedzie_database.name }} SENTRY_DSN={{ sentry_dsn_api }} SENTRY_SAMPLE_RATE={{ sentry_sample_rate_api }} diff --git a/services/cojedzie/vars/main.yml b/services/cojedzie/vars/main.yml index 87c3177..09fb22f 100644 --- a/services/cojedzie/vars/main.yml +++ b/services/cojedzie/vars/main.yml @@ -1,6 +1,5 @@ --- cojedzie_domain: cojedzie.pl -cojedzie_update_cron: 0 0 4 * * * cojedzie_gtm: "" cojedzie_mercure_jwt_key: !vault | $ANSIBLE_VAULT;1.1;AES256 diff --git a/services/cojedzie@next/templates/api.env b/services/cojedzie@next/templates/api.env index 7898f78..425c027 100644 --- a/services/cojedzie@next/templates/api.env +++ b/services/cojedzie@next/templates/api.env @@ -2,7 +2,9 @@ MERCURE_URL=http://mercure/.well-known/mercure MERCURE_PUBLIC_URL=https://{{ cojedzie_domain }}/.well-known/mercure MERCURE_JWT_SECRET={{ cojedzie_mercure_jwt_key }} +# DATABASE_URL is read by images before the COJEDZIE_ prefix (cojedzie#65); drop it once both run a newer one DATABASE_URL=mysql://{{ cojedzie_database.user }}:{{ cojedzie_database.password }}@{{ database_mysql_host }}/{{ cojedzie_database.name }} +COJEDZIE_DATABASE_URL=mysql://{{ cojedzie_database.user }}:{{ cojedzie_database.password }}@{{ database_mysql_host }}/{{ cojedzie_database.name }} SENTRY_DSN={{ sentry_dsn_api }} SENTRY_SAMPLE_RATE={{ sentry_sample_rate_api }} diff --git a/services/cojedzie@next/vars/main.yml b/services/cojedzie@next/vars/main.yml index d2214c9..0b4b185 100644 --- a/services/cojedzie@next/vars/main.yml +++ b/services/cojedzie@next/vars/main.yml @@ -1,6 +1,5 @@ --- cojedzie_domain: cojedzie.pl -cojedzie_update_cron: 0 0 4 * * * cojedzie_gtm: "" cojedzie_mercure_jwt_key: !vault | $ANSIBLE_VAULT;1.1;AES256