From 6ef45b9011f1e87f0b1a6aca8e4f56effdcb1a36 Mon Sep 17 00:00:00 2001 From: otthorn Date: Tue, 23 Mar 2021 00:11:01 +0100 Subject: [PATCH 1/2] hotfix element and add local modif for grafana --- element/config.json | 11 ++++++----- grafana/Dockerfile | 7 ++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/element/config.json b/element/config.json index fc1e8f0..5222b38 100644 --- a/element/config.json +++ b/element/config.json @@ -15,11 +15,12 @@ "brand": "Riot", "branding": { "welcomeBackgroundUrl": "/background.jpg", - "authHeaderLogoUrl": :"/logo.png", - "authFooterLinks": [ - {"text": "Site Web", "url": "https://auro.re"}, - {"text": "Intranet", "url": "https://intranet.auro.re"}, - {"text": "Email support", "url": "mailto:support.aurore@lists.crans.org"} + "authHeaderLogoUrl": "/logo.png", + "authFooterLinks": [ + {"text": "Site Web", "url": "https://auro.re"}, + {"text": "Intranet", "url": "https://intranet.auro.re"}, + {"text": "Email support", "url": "mailto:support.aurore@lists.crans.org"} + ] }, "integrations_ui_url": "", "integrations_rest_url": "", diff --git a/grafana/Dockerfile b/grafana/Dockerfile index 681c7f3..75a7799 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -9,6 +9,11 @@ ENV GF_USERS_ALLOW_ORG_CREATE=false ENV GF_AUTH_BASIC_ENABLED=false ENV GF_AUTH_LDAP_ENABLED=true ENV GF_AUTH_LDAP_CONFIG_FILE=/etc/grafana/ldap.toml +ENV GF_DATABASE_TYPE=postgres +ENV GF_DATABASE_HOST=10.128.0.96 +ENV GF_DATABASE_USER=grafana +ENV GF_DATABASE_NAME=grafana +ENV GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION=true +ENV GF_DISABLE_GRAVATAR=true COPY ldap.toml /etc/grafana/ldap.toml - From 695290184a147de8ec2f08f2b9768fa40218b023 Mon Sep 17 00:00:00 2001 From: Solal Nathan Date: Tue, 23 Mar 2021 00:22:38 +0100 Subject: [PATCH 2/2] Fix GRAFANA_DB_PASSWORD --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 90fd166..19fae4f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,6 +25,7 @@ services: restart: always environment: ENV_PASSWORD: "${GRAFANA_LDAP_PASSWORD}" + GF_DATABASE_PASSWORD: "${GRAFANA_DB_PASSWORD}" volumes: - ./grafana_data:/var/lib/grafana ports: