You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/10/21 01:06:59 UTC
[42/50] git commit: FC-144 - Add Tomcat SSL to demo
FC-144 - Add Tomcat SSL to demo
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/103d2ac5
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/103d2ac5
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/103d2ac5
Branch: refs/heads/master
Commit: 103d2ac5a533ab6dbea50af084069e591e392eba
Parents: 6b045d6
Author: Shawn McKinney <sh...@jts.us>
Authored: Sat Aug 9 10:47:22 2014 -0500
Committer: Shawn McKinney <sh...@jts.us>
Committed: Sat Aug 9 10:47:22 2014 -0500
----------------------------------------------------------------------
build.properties | 8 +++++---
build.xml | 2 ++
config/fortress.properties.src | 4 ++++
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/103d2ac5/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index f33276d..8095a1e 100644
--- a/build.properties
+++ b/build.properties
@@ -69,11 +69,12 @@ ldap.host=localhost
ldap.port=389
ldap.uris=ldap://${ldap.host}:${ldap.port}
-
# These are needed for client SSL connections with LDAP Server:
#ldap.uris=ldap://${ldap.host}:389 ldaps://${ldap.host}:${ldap.port}
#enable.ldap.ssl=true
#enable.ldap.ssl.debug=true
+#key.store=/home/smckinn/GIT/fortressDev/openldap-fortress-core/src/test/resources/certs/mykeystore
+#key.store.password=changeit
#trust.store=/home/smckinn/GIT/fortressDev/openldap-fortress-core/src/test/resources/certs/mytruststore
#trust.store.password=changeit
#trust.store.set.prop=true
@@ -197,7 +198,7 @@ dflt.checkpoint=checkpoint 64 5
# 5. BEGIN SYMAS-OPENLDAP INSTALL CONFIGURATION SECTION (Ignore if using ApacheDS or HTTP):
###########################################################################################
-#slapd.start=${openldap.root}/etc/solserver start
+slapd.start=${openldap.root}/etc/solserver start
## If using Symas OpenLDAP, uncomment single option from #1 - 8 below:
# Each of the options are used for a particular Symas-OpenLDAP platform.
@@ -216,7 +217,7 @@ platform=Debian-Silver-x86-64
#slapd.uninstall=dpkg -r symas-openldap-silver
install.image.dir=/home/smckinn/archives/debian64
slapd.module.dir=${openldap.root}/lib64/openldap
-slapd.start=${openldap.root}/lib64/slapd -h ldap://${ldap.host}:${ldap.port} -f ${openldap.root}/etc/openldap/slapd.conf -F ${openldap.root}/etc/openldap
+#slapd.start=${openldap.root}/lib64/slapd -h ldap://${ldap.host}:${ldap.port} -f ${openldap.root}/etc/openldap/slapd.conf -F ${openldap.root}/etc/openldap
# Option 3 - Debian i386 Gold:
#platform=Debian-Gold-i386
@@ -287,6 +288,7 @@ slapd.start=${openldap.root}/lib64/slapd -h ldap://${ldap.host}:${ldap.port} -f
M2_HOME=./apache-maven
#M2_HOME=/usr/share/maven2
tomcat-realm.conf=<Realm className="org.openldap.sentry.tomcat.Tc7AccessMgrProxy" debug="0" resourceName="UserDatabase" containerType="Tomcat7" realmClasspath="${user.dir}${file.separator}conf${path.separator}${user.dir}${file.separator}dist${file.separator}fortressSentry-${version}.jar"/>
+tomcat-ssl.conf=<Connector port="8443" maxThreads="200" scheme="https" secure="true" SSLEnabled="true" keystoreFile="${key.store}" keystorePass="${key.store.password}" clientAuth="false" sslProtocol="TLS"/>
tomcat.dir=../apache-tomcat
#These props are for 'Builder' target and have been moved here: "${user.home}/build.properties"
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/103d2ac5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7bee54a..6a6f615 100644
--- a/build.xml
+++ b/build.xml
@@ -860,6 +860,8 @@
<replace file="${dst.remote.conf}" token="@TRUST_STORE@" value="${trust.store}"/>
<replace file="${dst.remote.conf}" token="@TRUST_STORE_PW@" value="${trust.store.password}"/>
<replace file="${dst.remote.conf}" token="@TRUST_STORE_SET_PROPW@" value="${trust.store.set.prop}"/>
+ <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}"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/103d2ac5/config/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/fortress.properties.src b/config/fortress.properties.src
index 30a4593..0be6bfc 100755
--- a/config/fortress.properties.src
+++ b/config/fortress.properties.src
@@ -26,6 +26,10 @@ trust.store=@TRUST_STORE@
trust.store.password=@TRUST_STORE_PW@
trust.store.set.prop=@TRUST_STORE_SET_PROPW@
+# Used for SSL Demo with Tomcat:
+key.store=@KEY_STORE@
+key.store.password=@KEY_STORE_PW@
+
# 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: