From 5463b603d6d52496c52c22ec695c5110c3d357eb Mon Sep 17 00:00:00 2001
From: bearns <alex@bearns.me>
Date: Fri, 16 Oct 2020 15:38:24 +0300
Subject: [PATCH] Ldap issue fix

---
 docker-compose.yml                                 | 2 ++
 ldap.env                                           | 4 ++--
 redmine/{999_config-ldap.rb => 999_config_ldap.rb} | 0
 redmine/Dockerfile                                 | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename redmine/{999_config-ldap.rb => 999_config_ldap.rb} (100%)

diff --git a/docker-compose.yml b/docker-compose.yml
index bf1bd08..383ce1a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,7 @@ services:
       REDMINE_SECRET_KEY_BASE: supersecretkey
       REDMINE_PLUGINS_MIGRATE: "true"
       REDMINE_LDAP: ldap
+      LDAP_BASE_DN: "dc=example,dc=org"
     env_file:
       - ldap.env     
     volumes:
@@ -30,6 +31,7 @@ services:
     restart: always
     environment:
       MYSQL_DATABASE: redmine
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     #env_file:
     #  - db.env
     volumes:
diff --git a/ldap.env b/ldap.env
index f2c4dc2..b9bb482 100644
--- a/ldap.env
+++ b/ldap.env
@@ -1,2 +1,2 @@
-LDAP_BASE_DN: "DC=example,DC=org"
-LDAP_ADMIN_PASSWORD: "admin"
\ No newline at end of file
+#LDAP_BASE_DN="o=example,c=org"
+LDAP_ADMIN_PASSWORD="admin"
\ No newline at end of file
diff --git a/redmine/999_config-ldap.rb b/redmine/999_config_ldap.rb
similarity index 100%
rename from redmine/999_config-ldap.rb
rename to redmine/999_config_ldap.rb
diff --git a/redmine/Dockerfile b/redmine/Dockerfile
index b984110..a61cb43 100644
--- a/redmine/Dockerfile
+++ b/redmine/Dockerfile
@@ -1,3 +1,3 @@
 FROM redmine:latest
 ADD --chown=999:999 ./redmine_ldap_passwd/ /usr/src/redmine/plugins/redmine_ldap_passwd/
-ADD --chown=999:999 ./999_config-ldap.rb /usr/src/redmine/db/migrate/
\ No newline at end of file
+ADD --chown=999:999 ./999_config_ldap.rb /usr/src/redmine/db/migrate/
\ No newline at end of file