directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: fix build - add slapd logger decls back
Date Tue, 22 Dec 2015 05:40:35 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master e32782d96 -> 53e42081a


fix build - add slapd logger decls back


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/53e42081
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/53e42081
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/53e42081

Branch: refs/heads/master
Commit: 53e42081a8de2df14da8ed704bc7a992c9aea0fb
Parents: e32782d
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Dec 21 23:40:32 2015 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Dec 21 23:40:32 2015 -0600

----------------------------------------------------------------------
 build.properties.example | 14 +++++---------
 docker/Dockerfile        |  2 +-
 docker/run-tests.sh      | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53e42081/build.properties.example
----------------------------------------------------------------------
diff --git a/build.properties.example b/build.properties.example
index f2a5ed8..4830bb7 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -97,20 +97,16 @@ admin.max.conn=10
 user.min.conn=1
 user.max.conn=10
 
-# Used for slapd logger connection pool.  Leave zeros when using apacheds:
-min.log.conn=1
-max.log.conn=3
-
 # Only works if ldap.server.type=openldap:
 #enable.audit=true
 
-# Used for searching slapd logger.  Comment out for ApacheDS or other directory servers:
-#log.admin.user=cn=Manager,cn=log
-#log.admin.pw=secret
+# Used for searching openldap slapo access log:
+log.admin.user=cn=Manager,cn=log
+log.admin.pw=secret
 
 # Used for slapd logger connection pool.  Leave zeros when using apacheds:
-#min.log.conn=1
-#max.log.conn=3
+min.log.conn=1
+max.log.conn=3
 
 ########################################################################
 # 3. GROUP OBJECT CLASS DEFINITIONS

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53e42081/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5cef9d3..30ddbf7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -29,7 +29,7 @@ RUN \
     unzip fortressBuilder-Debian-Silver-x86-64-1.0-RC39.zip && \
     chmod a+x -Rf * && \
     # Workaround for FC-33: enable rbac.accelerator=true to enable ACLs in slapd.conf
-    sed -i 's/#rbac\.accelerator=true/rbac\.accelerator=true/' slapd.properties &&
\
+    sed -i 's/#rbac\.accelerator=true/rbac\.accelerator=true/' build.properties &&
\
     # Fortress Quickstart README Section II
     sed -i 's/export JAVA_HOME=.*/export JAVA_HOME=\/usr\/lib\/jvm\/java-1.8.0-openjdk-amd64\//'
b.sh && \
     ./b.sh dist && \

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53e42081/docker/run-tests.sh
----------------------------------------------------------------------
diff --git a/docker/run-tests.sh b/docker/run-tests.sh
index a4e1e54..613d02d 100755
--- a/docker/run-tests.sh
+++ b/docker/run-tests.sh
@@ -25,16 +25,16 @@ echo $CONTAINER_PORT
 
 # configure build.properties
 cp build.properties.example build.properties
-cp slapd.properties.example slapd.properties
-sed -i 's/^ldap\.server\.type=.*/ldap.server.type=openldap/' slapd.properties
-sed -i 's/^enable\.audit=.*/enable.audit=true/' slapd.properties
-sed -i 's/^ldap\.host=.*/ldap.host=localhost/' slapd.properties
-sed -i 's/^ldap\.port=.*/ldap.port='${CONTAINER_PORT}'/' slapd.properties
-sed -i 's/^suffix\.name=.*/suffix.name=openldap/' slapd.properties
-sed -i 's/^suffix\.dc=.*/suffix.dc=org/' slapd.properties
-sed -i 's/^root\.dn=.*/root.dn=cn=Manager,${suffix}/' slapd.properties
-sed -i 's/^root\.pw=.*/root.pw={SSHA}pSOV2TpCxj2NMACijkcMko4fGrFopctU/' slapd.properties
-sed -i 's/^cfg\.root\.pw=.*/cfg.root.pw=secret/' slapd.properties
+sed -i 's/^ldap\.server\.type=.*/ldap.server.type=openldap/' build.properties
+sed -i 's/^enable\.audit=.*/enable.audit=true/' build.properties
+sed -i 's/^ldap\.host=.*/ldap.host=localhost/' build.properties
+sed -i 's/^ldap\.port=.*/ldap.port='${CONTAINER_PORT}'/' build.properties
+sed -i 's/^suffix\.name=.*/suffix.name=openldap/' build.properties
+sed -i 's/^suffix\.dc=.*/suffix.dc=org/' 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
+sed -i 's/^root\.dn=.*/root.dn=cn=Manager,${suffix}/' build.properties
 
 # prepare
 mvn clean install


Mime
View raw message