From e5905c4ac3ebe706c2222954a6d7d1acc763961a Mon Sep 17 00:00:00 2001
From: Scheepers <scheepers@afrikaburn.org>
Date: Sun, 11 Oct 2020 18:07:29 +0200
Subject: [PATCH] external env

---
 .gitignore         |  3 +++
 default.env        |  6 +++---
 docker-compose.yml | 15 ++++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8bcd4f7e..18a20c23f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+/local/backups
+/local/config/ldap
+/local/data
 /environment.env
\ No newline at end of file
diff --git a/default.env b/default.env
index 7c4ecd3fb..c813f4c7f 100644
--- a/default.env
+++ b/default.env
@@ -1,10 +1,10 @@
 # Auth
 KEYCLOAK_USER=admin
-KEYCLOAK_PASSWORD=CHANGE_ME
+KEYCLOAK_PASSWORD=change_me!
 
 # Store
-LDAP_ADMIN_PASSWORD=CHANGE_ME
-LDAP_CONFIG_PASSWORD=CHANGE_ME
+LDAP_ADMIN_PASSWORD=change_me!
+LDAP_CONFIG_PASSWORD=change_me!
 LDAP_ORGANISATION=TMI
 LDAP_DOMAIN=tmi.mobi
 LDAP_BASE_DN=dc=tmi,dc=mobi
diff --git a/docker-compose.yml b/docker-compose.yml
index a6a909c9e..76dc49c0f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,10 @@
-version: '2'
+version: '3'
 
 # Copy default.env to environment.env and change passwords.
 
 services:
 
-  auth:
+  app:
     container_name: tmi_access_token_auth
     image: jboss/keycloak:10.0.2
     restart: always
@@ -14,12 +14,12 @@ services:
     volumes:
       - ./local/config/auth:/etc/auth
     depends_on:
-      - store
+      - db
     env_file:
       - environment.env
 
-  store:
-    container_name: tmi_access_token_store
+  db:
+    container_name: tmi_access_token_db
     image: osixia/openldap:1.3.0
     restart: always
     ports:
@@ -29,6 +29,7 @@ services:
       - ./local/data:/var/lib/ldap
       - ./local/config/ldap:/etc/ldap/slapd.d
       - ./local/backups:/var/backups
+      - ./seed:/seed
     env_file:
       - environment.env
 
@@ -40,8 +41,8 @@ services:
       - '11020:80'
       - '11025:443'
     depends_on:
-      - store
+      - db
     environment:
-      - PHPLDAPADMIN_LDAP_HOSTS=store
+      - PHPLDAPADMIN_LDAP_HOSTS=db
     env_file:
       - environment.env