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: FC-126 - ApacheDS Quickstart
Date Tue, 08 Dec 2015 00:11:58 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master a965cf28d -> cc60cab47


 FC-126 - ApacheDS Quickstart


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

Branch: refs/heads/master
Commit: cc60cab47fc105e756862a6519a403a57573679b
Parents: a965cf2
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Dec 7 18:11:53 2015 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Dec 7 18:11:53 2015 -0600

----------------------------------------------------------------------
 README-CONFIG.txt           |   2 +-
 apacheds.properties.example |  54 +++++++++++++++++++++
 build.properties.example    | 101 ++++++++++++++++-----------------------
 3 files changed, 97 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cc60cab4/README-CONFIG.txt
----------------------------------------------------------------------
diff --git a/README-CONFIG.txt b/README-CONFIG.txt
index 195f8d6..d1977ca 100644
--- a/README-CONFIG.txt
+++ b/README-CONFIG.txt
@@ -83,7 +83,7 @@ The build.properties file is used by the fortress core ant script, build.xml,
to
 2. refreshLDAPData.xml - this is the base load script that sets up the DIT structure and
populates the config node in LDAP
 
 The fortress.properties are then loaded onto the classpath where it will be found by fortress.
 The refreshLDAPData.xml is
-the base load script that can be loaded using this command:
+the base load script that can be loaded using this command:a
 # mvn install -Dload.file=./ldap/setup/refreshLDAPData.xml
 
 Anytime you need to refresh the values contained inside the other files, run this command:

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cc60cab4/apacheds.properties.example
----------------------------------------------------------------------
diff --git a/apacheds.properties.example b/apacheds.properties.example
new file mode 100644
index 0000000..9e99242
--- /dev/null
+++ b/apacheds.properties.example
@@ -0,0 +1,54 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you under the Apache License, Version 2.0 (the
+#   "License"); you may not use this file except in compliance
+#   with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing,
+#   software distributed under the License is distributed on an
+#   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#   KIND, either express or implied.  See the License for the
+#   specific language governing permissions and limitations
+#   under the License.
+#
+#
+########################################################################
+# 0. About the fortress apacheds.properties file
+########################################################################
+
+# Use this property file to specify environment settings specific to your environment and
fortress runtime components.
+# These parameters will be loaded into the following locations by the Fortress during the
init targets within the build.xml ant management utility:
+# a. fortress.properties - Fortress' configuration file tells fortress runtime how to connect
to remote resources
+# b. refreshLDAPData.xml - Used by fortress to initialize and base load the LDAP DIT data
structures.  Fortress also stores runtime params inside 'ou=Config' container on remote server.
+# c. slapd.conf - This will be used to configure the runtime OpenLDAP server (slapd) if applicable.
+
+########################################################################
+# 3. BEGIN LDAP CLIENT CONFIGURATION SECTION: (Ignore if using HTTP):
+########################################################################
+
+# This is default, tells fortress what type of ldap server in use:
+ldap.server.type=apacheds
+
+# These parameters point fortress to LDAP host:
+ldap.host=localhost
+ldap.port=10389
+enable.ldap.ssl=false
+
+# These are the connection parameters used for LDAP service account:
+root.dn=uid=admin,ou=system
+# This admin pass is bound for fortress.properties used by 'admin' pooled connections:
+cfg.root.pw=secret
+
+# These are needed for client SSL connections with LDAP Server:
+#enable.ldap.ssl=true
+#ldap.host=fortressdemo2.com
+#ldap.port=10636
+#enable.ldap.ssl.debug=true
+#trust.store=src/test/resources/certs/mytruststore
+#trust.store.password=changeit
+#trust.store.set.prop=true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cc60cab4/build.properties.example
----------------------------------------------------------------------
diff --git a/build.properties.example b/build.properties.example
index 78865da..6c826f7 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -37,66 +37,32 @@ version=1.0-RC41-SNAPSHOT
 # Enable local.mode property if your machine does not have connection to Internet and runtime
dependencies have already downloaded to FORTRESS_HOME/lib folder on this machine:
 #local.mode=true
 
-# Set sudo.pw is used by 'init-slapd', 'start-slapd' and 'stop-slapd' tagets on Linux machine
when sudo access required, otherwise leave this value blank
-# The sudo.pw variable must be uncommented and left empty iff installing Symas-OpenLDAP package
onto Redhat Linux platform:
-#sudo.pw=
+# Ths variable sets default tenant for current running ant process.  It is used during ldap
initialization operations.
+tenant=HOME
 
 ########################################################################
-# 2. BEGIN HTTP CLIENT CONFIGURATION SECTION (Ignore if using LDAPv3):
+# 2. BEGIN LDAP CLIENT CONFIGURATION SECTION: (Ignore if using HTTP):
 ########################################################################
 
-# The following optional HTTP parameters are needed when Fortress client communicates though
EnMasse HTTP proxy (rather than LDAP) server:
-# Setting the enable.mgr.impl.rest to 'true' sets Fortress instance to use HTTP services
rather than LDAPv3 protocol. Default value is 'false':
-# Using REST/HTTP allows Fortress communications to pass through firewalls and other non-LDAP
network intermediaries.
-enable.mgr.impl.rest=false
-#enable.mgr.impl.rest=true
-
-# This user account is added automatically during init-slapd or init-apacheds target via
'FortressDemoUsers.xml' policy file:
-http.user=demouser4
-http.pw=password
-http.host=localhost
-http.port=8080
-http.protocol=http
-# For TLs connections:
-#http.port=8443
-#http.protocol=https
-
-########################################################################
-# 3. BEGIN LDAP CLIENT CONFIGURATION SECTION: (Ignore if using HTTP):
-########################################################################
+# Only works if ldap.server.type=openldap:
+#enable.audit=true
 
 # This is default, tells fortress what type of ldap server in use:
 ldap.server.type=apacheds
 #ldap.server.type=openldap
 
-# Only works if ldap.server.type=openldap:
-enable.audit=true
-
-# This is the default:
-ldap.client.type=apache
-
 # These parameters point fortress to LDAP host:
 ldap.host=localhost
 ldap.port=10389
-enable.ldap.ssl=false
-#ldap.uris=ldap://${ldap.host}:${ldap.port}
-
-# These are needed for client SSL connections with LDAP Server:
 #enable.ldap.ssl=true
-#ldap.host=fortressdemo2.com
-#ldap.port=10636
-#enable.ldap.ssl.debug=true
-#trust.store=src/test/resources/certs/mytruststore
-#trust.store.password=changeit
-#trust.store.set.prop=true
 
-# These are needed for slapd startup SSL configuration:
-#ldap.uris=ldap://${ldap.host}:389 ldaps://${ldap.host}:${ldap.port}
+# These are the connection parameters used for LDAP service account:
+root.dn=uid=admin,ou=system
+# This admin pass is bound for fortress.properties used by 'admin' pooled connections:
+cfg.root.pw=secret
 
-# These are needed for slapd server-side SSL configuration:
-#tls.ca.cert.file=ca-cert.pem
-#tls.cert.file=server-cert.pem
-#tls.key.file=server-key.pem
+# This is the default:
+ldap.client.type=apache
 
 # These are used to construct suffix for DIT, i.e. dc=example,dc=com.
 suffix.name=example
@@ -121,14 +87,6 @@ adminperms.dn=ou=AdminPerms,ou=ARBAC,${suffix}
 audits.dn=cn=log
 groups.dn=ou=Groups,${suffix}
 
-# These are the connection parameters used for LDAP service account:
-#root.dn=cn=Manager,${suffix}
-root.dn=uid=admin,ou=system
-# Used to load OpenLDAP admin root password in slapd.conf and was encrypted using 'slappasswd'
command:
-root.pw={SSHA}pSOV2TpCxj2NMACijkcMko4fGrFopctU
-# This OpenLDAP admin root pass is bound for fortress.properties used by 'admin' pooled connections:
-cfg.root.pw=secret
-
 # This specifies the number of default LDAP connections to maintain in the pool:
 admin.min.conn=1
 admin.max.conn=10
@@ -137,16 +95,20 @@ admin.max.conn=10
 user.min.conn=1
 user.max.conn=10
 
-# 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 slapd logger connection pool.  Leave zeros when using apacheds:
 min.log.conn=1
 max.log.conn=3
 
+# 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 slapd logger connection pool.  Leave zeros when using apacheds:
+#min.log.conn=1
+#max.log.conn=3
+
 ########################################################################
-# 9. GROUP OBJECT CLASS DEFINITIONS
+# 3. GROUP OBJECT CLASS DEFINITIONS
 ########################################################################
 
 # Use Fortress defined LDAP Group objectclass:
@@ -157,4 +119,25 @@ group.properties=configParameter
 # Use Guacamole defined LDAP Group objectclass:
 #group.objectclass=guacConfigGroup
 #group.protocol=guacConfigProtocol
-#group.properties=guacConfigParameter
\ No newline at end of file
+#group.properties=guacConfigParameter
+
+########################################################################
+# 4. BEGIN HTTP CLIENT CONFIGURATION SECTION (Ignore if using LDAPv3):
+########################################################################
+
+# The following optional HTTP parameters are needed when Fortress client communicates though
EnMasse HTTP proxy (rather than LDAP) server:
+# Setting the enable.mgr.impl.rest to 'true' sets Fortress instance to use HTTP services
rather than LDAPv3 protocol. Default value is 'false':
+# Using REST/HTTP allows Fortress communications to pass through firewalls and other non-LDAP
network intermediaries.
+enable.mgr.impl.rest=false
+#enable.mgr.impl.rest=true
+
+# This user account is added automatically during init-slapd or init-apacheds target via
'FortressDemoUsers.xml' policy file:
+http.user=demouser4
+http.pw=password
+http.host=localhost
+http.port=8080
+http.protocol=http
+# For TLs connections:
+#http.port=8443
+#http.protocol=https
+


Mime
View raw message