Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 45E54200CC7 for ; Sun, 16 Jul 2017 22:34:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4424F163F42; Sun, 16 Jul 2017 20:34:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62E25163F41 for ; Sun, 16 Jul 2017 22:34:39 +0200 (CEST) Received: (qmail 36153 invoked by uid 500); 16 Jul 2017 20:34:38 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 36144 invoked by uid 99); 16 Jul 2017 20:34:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jul 2017 20:34:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0FAAE0192; Sun, 16 Jul 2017 20:34:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smckinney@apache.org To: commits@directory.apache.org Message-Id: <3b838fdd838449408a62c5ee7d9a77f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: directory-fortress-core git commit: do minor refefactor on props Date: Sun, 16 Jul 2017 20:34:37 +0000 (UTC) archived-at: Sun, 16 Jul 2017 20:34:40 -0000 Repository: directory-fortress-core Updated Branches: refs/heads/master 5058e2da8 -> 685a26115 do minor refefactor on props 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/685a2611 Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/685a2611 Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/685a2611 Branch: refs/heads/master Commit: 685a26115b08a9835cd69264b17b938df093c05c Parents: 5058e2d Author: Shawn McKinney Authored: Sun Jul 16 15:34:38 2017 -0500 Committer: Shawn McKinney Committed: Sun Jul 16 15:34:38 2017 -0500 ---------------------------------------------------------------------- README.md | 95 --------------------------- config/bootstrap/fortress.properties.src | 3 - config/fortress.properties.src | 1 - src/test/resources/fortress.properties | 2 +- 4 files changed, 1 insertion(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/685a2611/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index bfdf3ab..b969cfd 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,6 @@ * SECTION 13. Instructions to build and test the Apache Fortress samples. * SECTION 14. Instructions to performance test. * SECTION 15. Instructions to encrypt LDAP passwords used in config files. - * SECTION 16. Fortress Core properties ___________________________________________________________________________________ ## Document Overview @@ -831,99 +830,5 @@ use the 'encrypt' ant target. cfg.log.root.pw=wApnJUnuYZRBTF1zQNxX/Q== ``` -___________________________________________________________________________________ -## SECTION 16. Fortress Core properties - -This section describes the properties needed to control fortress core. - -1. LDAP Hostname coordinates. The host name can be specified as a fully qualified domain name or IP address. - - ``` - # Host name and port of LDAP DIT: - host=localhost - port=10389 - ``` - -2. LDAP Server type. Each LDAP server impl has different behavior on operations like password policies and audit. If using a 3rd type of server that isn't formally supported, leave blank or type is other. - - ``` - # If ApacheDS server: - ldap.server.type=apacheds - ``` - - ``` - # Else if OpenLDAP server: - ldap.server.type=slapd - ``` - - ``` - # Else leave blank: - #ldap.server.type=other - ``` - -3. Set the credentials of service account. Must have read/write privileges over the Fortress LDAP DIT: - - ``` - # If ApacheDS it will look something like this: - admin.user=uid=admin,ou=system - admin.pw=secret - ``` - - ``` - # Else If OpenLDAP it will look something like this: - admin.user=cn=Manager,dc=example,dc=com - ``` - -4. Define the number of LDAP connections to use in the pool This setting will be proportional to the number of concurrent users but won't be one-to-one. The number of required ldap connections will be much lower than concurrent users: - - ``` - # This is min/max settings for LDAP connections. For testing and low-volume instances this will work: - min.admin.conn=1 - max.admin.conn=10 - ``` - -5. Give coordinates to the Config node that contains all of the other Fortress properties. This will match your LDAP's server's config node per Fortress Core setup. - - ``` - # This node contains fortress properties stored on behalf of connecting LDAP clients: - config.realm=DEFAULT - config.root=ou=Config,dc=example,dc=com - ``` - -6. If using LDAPS. - - ``` - # Used for SSL Connection to LDAP Server: - enable.ldap.ssl=true - enable.ldap.ssl.debug=true - trust.store=/fully/qualified/path/and/file/name/to/java/truststore - trust.store.password=changeit - trust.store.set.prop=true - ``` - -7. To use REST instead of LDAP. Points to fortress-rest instance. - - ``` - # This will override default LDAP manager implementations for the RESTful ones: - enable.mgr.impl.rest=true - ``` - -8. If using REST, provide the credentials of user that has access to fortress-rest. - - ``` - # Optional parameters needed when Fortress client is connecting with the En Masse (rather than LDAP) server: - http.user=demouser4 - http.pw=gX9JbCTxJW5RiH+otQEX0Ja0RIAoPBQf - http.host=localhost - http.port=8080 - ``` - -9. If using ApacheDS and setting password policies, point to the correction location. - - ``` - # ApacheDS stores its password policies objects here by default: - apacheds.pwpolicy.root=ou=passwordPolicies,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config - ``` - ___________________________________________________________________________________ #### END OF README \ No newline at end of file http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/685a2611/config/bootstrap/fortress.properties.src ---------------------------------------------------------------------- diff --git a/config/bootstrap/fortress.properties.src b/config/bootstrap/fortress.properties.src index be81b6f..c3cb160 100755 --- a/config/bootstrap/fortress.properties.src +++ b/config/bootstrap/fortress.properties.src @@ -78,7 +78,6 @@ audit.root=@AUDITS_DN@ group.root=@GROUPS_DN@ example.root=ou=Examples,@SUFFIX@ -superadmin.role=oamSuperAdmin # these properties will enable temporal constraint checks on role activations: temporal.validator.0=org.apache.directory.fortress.core.util.time.Date @@ -101,8 +100,6 @@ sys.user.5=oamTU6User5 accessmgr.implementation=org.apache.directory.fortress.core.impl.AccessMgrImpl auditmgr.implementation=org.apache.directory.fortress.core.impl.AuditMgrImpl -dao.connector=@LDAP_CLIENT_TYPE@ - ehcache.config.file=ehcache.xml ## Fortress Data Validation settings http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/685a2611/config/fortress.properties.src ---------------------------------------------------------------------- diff --git a/config/fortress.properties.src b/config/fortress.properties.src index fac6623..9bda2d7 100755 --- a/config/fortress.properties.src +++ b/config/fortress.properties.src @@ -92,7 +92,6 @@ http.pw=@REST_HTTP_PW@ http.host=@REST_HTTP_HOST@ http.port=@REST_HTTP_PORT@ http.protocol=@REST_HTTP_PROTOCOL@ -dao.connector=@LDAP_CLIENT_TYPE@ GroupTest=org.apache.directory.fortress.core.group.GroupAntTest http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/685a2611/src/test/resources/fortress.properties ---------------------------------------------------------------------- diff --git a/src/test/resources/fortress.properties b/src/test/resources/fortress.properties index bb83ff4..e092e2f 100644 --- a/src/test/resources/fortress.properties +++ b/src/test/resources/fortress.properties @@ -98,7 +98,7 @@ sys.user.5=oamTU6User5 accessmgr.implementation=org.apache.directory.fortress.core.impl.AccessMgrImpl auditmgr.implementation=org.apache.directory.fortress.core.impl.AuditMgrImpl -dao.connector=@LDAP_CLIENT_TYPE@ +#dao.connector=@LDAP_CLIENT_TYPE@ ehcache.config.file=ehcache.xml