Merge pull request #15 from docker/fixsecrets

bugfixes

configBuilder.sh

@@ -8,7 +8,7 @@ cd /scriptrun
 
 # script config items
 SHB_CFG_URL=https://github.internet2.edu/docker/shib-idp-conftree/archive/3.3release.zip
-TOM_CFG_URL=https://github.intrnet2.edu/docker/shib-idp-tomcat-config/archive/master.zip
+TOM_CFG_URL=https://github.internet2.edu/docker/shib-idp-tomcat-config/archive/master.zip
 TMP_DIR_S=/tmp/3.3release
 TMP_DIR_T=/tmp/tomcfg
 TMP_DIR_D=/tmp/buildfiles
@@ -85,9 +85,12 @@ esac
 
 unzip -o -d ${TMP_DIR_D} ${TMP_DIR_D}.zip > /dev/null 2>&1
 
-cp -rf ${TMP_DIR_D}/* /output
+cp -rf ${TMP_DIR_D}/shib-idp_noVM-master/* /output
 rm -f /output/configBuilder.sh > /dev/null 2>&1
 rm -f /output/setup.log > /dev/null 2>&1
+rm -f /output/README.md > /dev/null 2>&1
+rm -rf /output/shib-idp_noVM-master/*
+
 
 #grab copy of Dockerfile in working dir
 cp -f /output/Dockerfile .
@@ -98,6 +101,7 @@ cp -f /output/Dockerfile .
 ### download default/TIER config for both shibb and tomcat ###
 ##############################################################
 #
+echo "Downloading TIER default configs"
 wget -q -O ${TMP_DIR_S}.zip ${SHB_CFG_URL}  > /dev/null
 wget -q -O ${TMP_DIR_T}.zip ${TOM_CFG_URL}  > /dev/null
 
@@ -725,6 +729,6 @@ rmdir ${TMP_DIR_D}
 #
 #echo config saved to ${FILENAME:2}
 echo config saved to configured local directory
-sleep 5
+#sleep 3
 echo ""
 echo ""