aurore/docker-ovh
12
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request 'hotfix' (#4) from hotfix into master

Browse source 
Reviewed-on: Aurore/docker-ovh#4
This commit is contained in:
otthorn 2021-03-23 01:05:17 +01:00
commit 73008b436c
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docker-compose.yml
View file

@ -25,6 +25,7 @@ services:
restart: always restart: always
environment: environment:
ENV_PASSWORD: "${GRAFANA_LDAP_PASSWORD}" ENV_PASSWORD: "${GRAFANA_LDAP_PASSWORD}"
GF_DATABASE_PASSWORD: "${GRAFANA_DB_PASSWORD}"
volumes: volumes:
- ./grafana_data:/var/lib/grafana - ./grafana_data:/var/lib/grafana
ports: ports:

3
element/config.json
View file

@ -15,11 +15,12 @@
"brand": "Riot", "brand": "Riot",
"branding": { "branding": {
"welcomeBackgroundUrl": "/background.jpg", "welcomeBackgroundUrl": "/background.jpg",
"authHeaderLogoUrl": :"/logo.png", "authHeaderLogoUrl": "/logo.png",
"authFooterLinks": [ "authFooterLinks": [
{"text": "Site Web", "url": "https://auro.re"}, {"text": "Site Web", "url": "https://auro.re"},
{"text": "Intranet", "url": "https://intranet.auro.re"}, {"text": "Intranet", "url": "https://intranet.auro.re"},
{"text": "Email support", "url": "mailto:support.aurore@lists.crans.org"} {"text": "Email support", "url": "mailto:support.aurore@lists.crans.org"}
]
}, },
"integrations_ui_url": "", "integrations_ui_url": "",
"integrations_rest_url": "", "integrations_rest_url": "",

7
grafana/Dockerfile
View file

@ -9,6 +9,11 @@ ENV GF_USERS_ALLOW_ORG_CREATE=false
ENV GF_AUTH_BASIC_ENABLED=false ENV GF_AUTH_BASIC_ENABLED=false
ENV GF_AUTH_LDAP_ENABLED=true ENV GF_AUTH_LDAP_ENABLED=true
ENV GF_AUTH_LDAP_CONFIG_FILE=/etc/grafana/ldap.toml 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 COPY ldap.toml /etc/grafana/ldap.toml