You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2018/08/27 19:58:07 UTC
directory-fortress-core git commit: fix openldap config for docker
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 29388ddbd -> be79171ea
fix openldap config for docker
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/be79171e
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/be79171e
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/be79171e
Branch: refs/heads/master
Commit: be79171ea55c8391e8004928b6b932d87a2fb7f5
Parents: 29388dd
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Aug 27 14:37:23 2018 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Aug 27 14:37:23 2018 -0500
----------------------------------------------------------------------
build.properties.example | 7 +------
config/bootstrap/fortress.properties.src | 1 -
ldap/setup/refreshLDAPData-src.xml | 2 +-
.../openldap-for-apache-fortress-tests/run-tests.sh | 11 ++++++-----
4 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/be79171e/build.properties.example
----------------------------------------------------------------------
diff --git a/build.properties.example b/build.properties.example
index f4a25a3..4257a6b 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -155,9 +155,4 @@ group.properties=configParameter
# 5. RFC2307 OBJECT CLASS DEFINITIONS
########################################################################
# Boolean value. If true, requires rfc2307bis schema because posixUser and posixGroup must be auxiliary object classes to work with ftRls which is structural..
-rfc2307=false
-
-# TODO: remove me, workaround for broken jenkins build:
-# Used for searching openldap slapo access log:
-log.admin.user=cn=Manager,cn=log
-log.admin.pw=secret
+rfc2307=false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/be79171e/config/bootstrap/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/bootstrap/fortress.properties.src b/config/bootstrap/fortress.properties.src
index 3776cbb..1e28650 100755
--- a/config/bootstrap/fortress.properties.src
+++ b/config/bootstrap/fortress.properties.src
@@ -75,7 +75,6 @@ userou.root=@USEROUS_DN@
permou.root=@PERMOUS_DN@
adminrole.root=@ADMINROLES_DN@
adminperm.root=@ADMINPERMS_DN@
-audit.root=@AUDITS_DN@
group.root=@GROUPS_DN@
example.root=ou=Examples,@SUFFIX@
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/be79171e/ldap/setup/refreshLDAPData-src.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/refreshLDAPData-src.xml b/ldap/setup/refreshLDAPData-src.xml
index 35344dd..b6b0ff9 100755
--- a/ldap/setup/refreshLDAPData-src.xml
+++ b/ldap/setup/refreshLDAPData-src.xml
@@ -156,7 +156,7 @@
<config props="perm.root:ou=Permissions,ou=RBAC,@SUFFIX@"/>
<config props="sdconstraint.root:ou=Constraints,ou=RBAC,@SUFFIX@"/>
<config props="adminperm.root:ou=AdminPerms,ou=ARBAC,@SUFFIX@"/>
- <config props="audit.root:cn=log"/>
+ <config props="audit.root:@AUDITS_DN@"/>
<config props="superadmin.role:fortress-core-super-admin"/>
<config props="temporal.validator.0:org.apache.directory.fortress.core.util.time.Date"/>
<config props="temporal.validator.1:org.apache.directory.fortress.core.util.time.LockDate"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/be79171e/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
----------------------------------------------------------------------
diff --git a/src/docker/openldap-for-apache-fortress-tests/run-tests.sh b/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
index d623ad5..a97e2de 100755
--- a/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
+++ b/src/docker/openldap-for-apache-fortress-tests/run-tests.sh
@@ -40,11 +40,12 @@ sed -i 's/^suffix\.dc=.*/suffix.dc=com/' build.properties
sed -i 's/^root\.dn=.*/root.dn=cn=Manager,${suffix}/' build.properties
sed -i 's/^root\.pw=.*/root.pw={SSHA}pSOV2TpCxj2NMACijkcMko4fGrFopctU/' build.properties
sed -i 's/^cfg\.root\.pw=.*/cfg.root.pw=secret/' build.properties
-#echo "" >> build.properties
-#echo "log.admin.user=cn=Manager,cn=log" >> build.properties
-#echo "log.admin.pw=secret" >> build.properties
-#echo "min.log.conn=1" >> build.properties
-#echo "max.log.conn=3" >> build.properties
+echo "" >> build.properties
+echo "log.admin.user=cn=Manager,cn=log" >> build.properties
+echo "log.admin.pw=secret" >> build.properties
+echo "min.log.conn=1" >> build.properties
+echo "max.log.conn=3" >> build.properties
+echo "audits.dn=cn=log" >> build.properties
# prepare
mvn clean install