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 2015/01/27 13:54:35 UTC
[08/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - fix user pool config settings
FC-54 - Benchmark activities - fix user pool config settings
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/6df596de
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/6df596de
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/6df596de
Branch: refs/heads/master
Commit: 6df596dedd194b044f56ef5ecc159acf4d62d69c
Parents: 9d9649b
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Dec 23 11:47:19 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Dec 23 11:47:19 2014 -0600
----------------------------------------------------------------------
build.xml | 7 +++++--
config/fortress.properties.src | 8 ++++----
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6df596de/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1ac04d7..7a96b7a 100644
--- a/build.xml
+++ b/build.xml
@@ -856,8 +856,11 @@
<replace file="${dst.remote.conf}" token="@ADM_MAX_CONN@" value="${admin.max.conn}"/>
<replace file="${dst.remote.conf}" token="@LOG_ROOT_DN@" value="${log.admin.user}"/>
<replace file="${dst.remote.conf}" token="@CFG_LOG_ROOT_PW@" value="${log.admin.pw}"/>
+
<replace file="${dst.remote.conf}" token="@LOG_MIN_CONN@" value="${min.log.conn}"/>
<replace file="${dst.remote.conf}" token="@LOG_MAX_CONN@" value="${max.log.conn}"/>
+ <replace file="${dst.remote.conf}" token="@USR_MIN_CONN@" value="${user.min.conn}"/>
+ <replace file="${dst.remote.conf}" token="@USR_MAX_CONN@" value="${user.max.conn}"/>
<replace file="${dst.remote.conf}" token="@CFG_CRYPTO_PROP@" value="${crypto.prop}"/>
<replace file="${dst.remote.conf}" token="@ENABLE_REST@" value="${enable.mgr.impl.rest}"/>
<replace file="${dst.remote.conf}" token="@REST_HTTP_USER@" value="${http.user}"/>
@@ -873,6 +876,7 @@
<replace file="${dst.remote.conf}" token="@KEY_STORE@" value="${key.store}"/>
<replace file="${dst.remote.conf}" token="@KEY_STORE_PW@" value="${key.store.password}"/>
+
<echo message="############### Modify fortress load scripts per user settings ###############"/>
<delete file="${dst.load.bootstrap.script}"/>
<copy file="${src.load.bootstrap.script}" tofile="${dst.load.bootstrap.script}"/>
@@ -880,8 +884,7 @@
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX_DC@" value="${suffix.dc}"/>
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX_DC2@" value="${suffix.dc2}"/>
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX@" value="${suffix}"/>
- <replace file="${dst.load.bootstrap.script}" token="@USR_MIN_CONN@" value="${log.min.conn}"/>
- <replace file="${dst.load.bootstrap.script}" token="@USR_MAX_CONN@" value="${log.max.conn}"/>
+
<replace file="${dst.load.bootstrap.script}" token="@SERVER_TYPE@" value="${ldap.server.type}"/>
<replace file="${dst.load.bootstrap.script}" token="@USERS_DN@" value="${users.dn}"/>
<replace file="${dst.load.bootstrap.script}" token="@GROUPS_DN@" value="${groups.dn}"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6df596de/config/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/fortress.properties.src b/config/fortress.properties.src
index 06aa5f9..1e78e0d 100755
--- a/config/fortress.properties.src
+++ b/config/fortress.properties.src
@@ -43,16 +43,16 @@ admin.pw=@CFG_ROOT_PW@
min.admin.conn=@ADM_MIN_CONN@
max.admin.conn=@ADM_MAX_CONN@
-# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
-min.admin.conn=@ADM_MIN_CONN@
-max.admin.conn=@ADM_MAX_CONN@
+# This is min/max connection pool settings for LDAP User authentication connection pool:
+min.user.conn=@USR_MIN_CONN@
+max.user.conn=@USR_MAX_CONN@
# These credentials are used for read/write access to all nodes under slapd access log suffix:
log.admin.user=@LOG_ROOT_DN@
# For corresponding log user:
log.admin.pw=@CFG_LOG_ROOT_PW@
-# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
+# This is min/max settings for LDAP connections to read slapo access log:
min.log.conn=@LOG_MIN_CONN@
max.log.conn=@LOG_MAX_CONN@