Merge pull request #21 from docker/noIntermediate

mods for hybrid config

configBuilder.sh

@@ -290,7 +290,8 @@ echo ""
 echo "Would you like your Shibboleth IdP containers to utilize a "
 echo "Shibboleth config which has been \"burned\" (copied) into each "
 echo "container, or would you like your IdP containers to instead "
-echo "mount their configuration from the container host's local filesystem or would you like to use a hybrid config utilizing secrets?"
+echo "mount all of their configuration from the container host's local "
+echo "filesystem or would you like to use a hybrid config utilizing secrets (requires a swarm)?"
 echo ""
 while [ ${BURNMOUNT} == "None" ]; do
     echo -n "Please select your choice (please enter either \"burn\" or \"mount\" or \"hybrid\"): "
@@ -521,6 +522,7 @@ mv -f $destPath/credentials/shib-idp/idp-signing.key $destPath/SECRETS/idp-signi
 mv -f $destPath/credentials/shib-idp/idp-signing.crt $destPath/SECRETS/idp-signing.crt > /dev/null
 mv -f $destPath/credentials/shib-idp/idp-encryption.key $destPath/SECRETS/idp-encryption.key > /dev/null
 mv -f $destPath/credentials/shib-idp/idp-encryption.crt $destPath/SECRETS/idp-encryption.crt > /dev/null
+mv -f $destPath/credentials/tomcat/keystore.jks $destPath/SECRETS/keystore.jks > /dev/null
 mv -f $destPath/config/shib-idp/conf/relying-party.xml $destPath/SECRETS/relying-party.xml > /dev/null
 mv -f $destPath/config/shib-idp/conf/attribute-filter.xml $destPath/SECRETS/attribute-filter.xml > /dev/null
 mv -f $destPath/config/shib-idp/conf/attribute-resolver.xml $destPath/SECRETS/attribute-resolver.xml > /dev/null