directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-realm git commit: last of the config cleanup
Date Sat, 23 Jan 2016 23:17:09 GMT
Repository: directory-fortress-realm
Updated Branches:
  refs/heads/master 828b5ea8a -> d441317f4


last of the config cleanup


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/d441317f
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/d441317f
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/d441317f

Branch: refs/heads/master
Commit: d441317f485c9143e42b4902f13f2c21a918895c
Parents: 828b5ea
Author: Shawn McKinney <smckinney@apache.org>
Authored: Sat Jan 23 16:21:19 2016 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Sat Jan 23 16:21:19 2016 -0600

----------------------------------------------------------------------
 conf/fortress.properties.example | 58 +++++++++++++++++++++++++++++++++++
 conf/fortress.properties.src     | 37 ----------------------
 2 files changed, 58 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/d441317f/conf/fortress.properties.example
----------------------------------------------------------------------
diff --git a/conf/fortress.properties.example b/conf/fortress.properties.example
new file mode 100644
index 0000000..4e202dc
--- /dev/null
+++ b/conf/fortress.properties.example
@@ -0,0 +1,58 @@
+#
+#   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.
+#
+
+# Host name and port of LDAP DIT:
+host=localhost
+port=10389
+
+# These credentials are used for read/write access to all nodes under suffix:
+admin.user=uid=admin,ou=system
+admin.pw=secret
+
+# This is min/max settings for LDAP administrator pool connections that have read/write access
to all nodes under suffix:
+min.admin.conn=1
+max.admin.conn=10
+
+# 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
+
+# This node contains fortress properties stored on behalf of connecting LDAP clients:
+config.realm=DEFAULT
+config.root=ou=Config,dc=example,dc=com
+
+# enable this to see trace statements when connection pool allocates new connections:
+debug.ldap.pool=false
+
+# Default for pool reconnect flag is false:
+enable.pool.reconnect=true
+
+ehcache.config.file=ehcache.xml
+
+# If 'true' it will route API calls through Fortress Rest:
+enable.mgr.impl.rest=false
+
+# 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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/d441317f/conf/fortress.properties.src
----------------------------------------------------------------------
diff --git a/conf/fortress.properties.src b/conf/fortress.properties.src
deleted file mode 100644
index 6f1039e..0000000
--- a/conf/fortress.properties.src
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2009-2013. Joshua Tree Software, LLC.  All Rights Reserved.
-#
-
-# Host name and port of LDAP DIT:
-host=@LDAP_HOST@
-port=@LDAP_PORT@
-
-# These credentials are used for read/write access to all nodes under suffix:
-admin.user=@ROOT_DN@
-# LDAP admin root pass is encrypted using 'encrypt' target in build.xml:
-admin.pw=@CFG_ROOT_PW@
-
-# This is min/max connection pool settings for User's who access their accounts in ou=People:
-min.admin.conn=@ADM_MIN_CONN@
-max.admin.conn=@ADM_MAX_CONN@
-
-# Used for SSL Connection to LDAP Server:
-enable.ldap.ssl=@ENABLE_LDAP_SSL@
-enable.ldap.ssl.debug=@ENABLE_LDAP_SSL_DEBUG@
-trust.store=@TRUST_STORE@
-trust.store.password=@TRUST_STORE_PW@
-trust.store.set.prop=@TRUST_STORE_SET_PROPW@
-
-# This node contains fortress properties stored on behalf of connecting LDAP clients (in
this case specific to Tomcat Realm connectivity):
-config.realm=TOMCAT
-config.root=ou=Config,@SUFFIX@
-
-# enable this to see trace statements when connection pool allocates new connections:
-debug.ldap.pool=true
-
-# Default for pool reconnect flag is false:
-enable.pool.reconnect=true
-
-crypto.prop=@CFG_CRYPTO_PROP@
-
-ehcache.config.file=ehcache.xml
\ No newline at end of file


Mime
View raw message