diff --git a/configBuilder.sh b/configBuilder.sh index c37feb3..1627a72 100755 --- a/configBuilder.sh +++ b/configBuilder.sh @@ -77,6 +77,7 @@ cp -rf ${TMP_DIR_S}/shib-idp-conftree-4.0-InCommon/conf/metadata-providers.xml $ cp -rf ${TMP_DIR_S}/shib-idp-conftree-4.0-InCommon/conf/attribute-resolver.xml ${SHBCFG} cp -rf ${TMP_DIR_S}/shib-idp-conftree-4.0-InCommon/conf/attribute-filter.xml ${SHBCFG} cp -rf ${TMP_DIR_S}/shib-idp-conftree-4.0-InCommon/credentials/inc-md-cert-mdq.pem ${SHBCREDS} +cp -rf ${TMP_DIR_S}/shib-idp-conftree-4.0-InCommon/credentials/sealer.kver ${SHBCREDS} cp -rf ${TMP_DIR_T}/shib-idp-tomcat-config-master/conf/* ${TOMCFG} cp -rf ${TMP_DIR_T}/shib-idp-tomcat-config-master/wwwroot/* ${TOMWWWROOT} @@ -123,17 +124,18 @@ echo "" echo "We will use the information you enter here to configure your IdP." echo "" while [ ${SCOPE} == "None" ]; do - echo -n "Enter the Scope for your IdP: " + echo -n "Enter the Scope for your IdP [`expr "$FQDN" | cut -f2- -d.`]: " read response - if [ ${#response} -lt 5 ]; then + TMPSCOPE=${response:-`expr "$FQDN" | cut -f2- -d.`} + if [ ${#TMPSCOPE} -lt 5 ]; then echo "Remember, you need domain - domain.edu or similar" continue fi - echo -n "You entered: ${response} Is this correct [Yes/No]? " + echo -n "You entered: ${TMPSCOPE} Is this correct [Yes/No]? " read yesno case $yesno in Yes|yes|Y|y) - SCOPE=$response + SCOPE=$TMPSCOPE ;; esac done