Code Review
/
yaml_builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix path errors in tools
[yaml_builds.git]
/
tools
/
generate_yamls.sh
diff --git
a/tools/generate_yamls.sh
b/tools/generate_yamls.sh
index
13d36dc
..
ccb39df
100755
(executable)
--- a/
tools/generate_yamls.sh
+++ b/
tools/generate_yamls.sh
@@
-37,9
+37,9
@@
echo "#######################################"
sed -E 's/(^.*password:).*/\1 ###PASSWORD REMOVED####/g' ${YAML_BUILDS}/${SITE}.yaml
echo "#######################################"
sed -E 's/(^.*password:).*/\1 ###PASSWORD REMOVED####/g' ${YAML_BUILDS}/${SITE}.yaml
echo "#######################################"
-echo "# NOTE: root ssh key will be used for genesis_ssh_public_key if no key i
s provided
"
+echo "# NOTE: root ssh key will be used for genesis_ssh_public_key if no key i
n yaml
"
RCKEY=$(cat ~/.ssh/id_rsa.pub | sed -e 's/[\/&]/\\&/g')
RCKEY=$(cat ~/.ssh/id_rsa.pub | sed -e 's/[\/&]/\\&/g')
-sed -i -e "s/genesis_ssh_public_key\:
*
/genesis_ssh_public_key: \'$RCKEY\'/" $SITE.yaml
+sed -i -e "s/genesis_ssh_public_key\:
\s*$
/genesis_ssh_public_key: \'$RCKEY\'/" $SITE.yaml
python ./scripts/jcopy.py $SITE.yaml ./tools/j2/set_site_env.sh ./tools/env_$SITE.sh
source ./tools/env_$SITE.sh
python ./scripts/jcopy.py $SITE.yaml ./tools/j2/set_site_env.sh ./tools/env_$SITE.sh
source ./tools/env_$SITE.sh
@@
-69,7
+69,11
@@
echo "# Merging config files to $AIRSHIP_TREASUREMAP/site/$SITE"
rm -rf $AIRSHIP_TREASUREMAP/site/$SITE
mkdir -p $AIRSHIP_TREASUREMAP/site/$SITE
rm -rf $AIRSHIP_TREASUREMAP/site/$SITE
mkdir -p $AIRSHIP_TREASUREMAP/site/$SITE
+echo "# Copying seaworth config files"
cp -r $AIRSHIP_TREASUREMAP/site/seaworthy/* $AIRSHIP_TREASUREMAP/site/$SITE
cp -r $AIRSHIP_TREASUREMAP/site/seaworthy/* $AIRSHIP_TREASUREMAP/site/$SITE
+echo "# Removing seaworthy example certificate files"
+rm -rf $AIRSHIP_TREASUREMAP/site/$SITE/secrets/certificates/
+echo "# Overlaying [$SITE] specific config files"
cp -r $YAML_BUILDS/site/$SITE/* $AIRSHIP_TREASUREMAP/site/$SITE
CONFIG_COUNT=`find $AIRSHIP_TREASUREMAP/site/$SITE -type f | wc -l`
cp -r $YAML_BUILDS/site/$SITE/* $AIRSHIP_TREASUREMAP/site/$SITE
CONFIG_COUNT=`find $AIRSHIP_TREASUREMAP/site/$SITE -type f | wc -l`