Skip to content
Permalink
Browse files

fix generation of config without secrets

  • Loading branch information
pcaskey committed Oct 31, 2017
1 parent 713d641 commit 7a99fe2e0293f7bca17a620b6dc91e926a4f3acd
Showing with 18 additions and 15 deletions.
  1. +18 −15 configBuilder.sh
@@ -502,21 +502,6 @@ fi
sed "s#keystorePass=\"password\"#keystorePass=\"${STOREPWD}\"#" ${TOMCFG}/server.xml.dist > ${TOMCFG}/server.xml


echo ""
echo "Archiving generated config..."
echo ""
#ensure zip
command -v zip >/dev/null 2>&1 || { echo >&2 "ERROR: zip is required, but doesn't appear to be installed. Aborting..."; exit 1; }
FILENAME=./shib-idp-config_`date +%m%d%Y-%H%M%S`.zip
zip -r ${FILENAME} ./* > /dev/null

#special for the special-purpose container
cp ${FILENAME} /output
zip -d /output/${FILENAME:2} "configBuilder.sh"
zip -d /output/${FILENAME:2} "Dockerfile"
zip -d /output/${FILENAME:2} "setup.log"
echo copied archive to output location...

# if the user chose a hybrid config, then generate a directory containing the config with secrets removed
# copy files
if [ ${BURNMOUNT} == "hybrid" ]; then
@@ -553,6 +538,24 @@ echo ""
fi


echo ""
echo "Archiving generated config..."
echo ""
#ensure zip
command -v zip >/dev/null 2>&1 || { echo >&2 "ERROR: zip is required, but doesn't appear to be installed. Aborting..."; exit 1; }
FILENAME=./shib-idp-config_`date +%m%d%Y-%H%M%S`.zip
zip -r ${FILENAME} ./* > /dev/null

#special for the special-purpose container
cp ${FILENAME} /output
zip -d /output/${FILENAME:2} "configBuilder.sh"
zip -d /output/${FILENAME:2} "Dockerfile"
zip -d /output/${FILENAME:2} "setup.log"
echo copied archive to output location...




############################################################################################################################
### notify user of next steps (docker build and docker run commands, based on burn/mount and chosen directory locations) ###
############################################################################################################################

0 comments on commit 7a99fe2

Please sign in to comment.
You can’t perform that action at this time.