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-124 - Quickstarts
Date Tue, 08 Dec 2015 00:44:06 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master df8ae323b -> b5b8ef467


 FC-124 - Quickstarts


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

Branch: refs/heads/master
Commit: b5b8ef46793a370eb18cf0f97260e863eefee790
Parents: df8ae32
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Dec 7 18:44:02 2015 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Dec 7 18:44:02 2015 -0600

----------------------------------------------------------------------
 build.properties.example | 6 +++---
 build.xml                | 8 ++++----
 slapd.properties.example | 3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b5b8ef46/build.properties.example
----------------------------------------------------------------------
diff --git a/build.properties.example b/build.properties.example
index 6c826f7..eda75b6 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -44,9 +44,6 @@ tenant=HOME
 # 2. 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
@@ -99,6 +96,9 @@ user.max.conn=10
 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

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b5b8ef46/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ef18957..145da91 100644
--- a/build.xml
+++ b/build.xml
@@ -22,10 +22,6 @@
          ================================= -->
    <target name="init">
       <tstamp/>
-       <!-- read user defined properties from the build.properties -->
-       <property name="component-propfile" value="${basedir}/build.properties"/>
-       <property file="${component-propfile}"/>
-
        <!-- read properties from the ${user.home}/propfile, if any -->
        <property name="user-propfile" value="${user.home}/build.properties"/>
        <property file="${user-propfile}"/>
@@ -38,6 +34,10 @@
        <property name="apacheds-propfile" value="${basedir}/apacheds.properties"/>
        <property file="${apacheds-propfile}"/>
 
+       <!-- read user defined properties from the build.properties -->
+       <property name="component-propfile" value="${basedir}/build.properties"/>
+       <property file="${component-propfile}"/>
+
        <!-- ########### Project specific properties ########################### -->
        <property name="project.name" value="Fortress Identity Access Management SDK"/>
        <property name="name" value="fortress"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b5b8ef46/slapd.properties.example
----------------------------------------------------------------------
diff --git a/slapd.properties.example b/slapd.properties.example
index 4db68a0..a4531af 100644
--- a/slapd.properties.example
+++ b/slapd.properties.example
@@ -33,6 +33,9 @@
 ldap.server.type=openldap
 ldap.host=localhost
 ldap.port=389
+suffix.name=example
+suffix.dc=com
+suffix=dc=${suffix.name},dc=${suffix.dc}
 root.dn=cn=Manager,${suffix}
 # Used to load OpenLDAP admin root password in slapd.conf and was encrypted using 'slappasswd'
command:
 root.pw={SSHA}pSOV2TpCxj2NMACijkcMko4fGrFopctU


Mime
View raw message