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

Reviewed-on: Aurore/docker-ovh#4

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:

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": "",

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
-