diff options
Diffstat (limited to 'mason')
| -rwxr-xr-x | mason/mason-generator.sh | 16 | ||||
| -rwxr-xr-x | mason/mason.sh | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mason/mason-generator.sh b/mason/mason-generator.sh index acc27f3e..d93d89f7 100755 --- a/mason/mason-generator.sh +++ b/mason/mason-generator.sh @@ -48,12 +48,12 @@ sedescape() { # Key generation ############################################################################## -mkdir "ssh_keys-${HOST_PREFIX}" +mkdir -p "ssh_keys-${HOST_PREFIX}" cd "ssh_keys-${HOST_PREFIX}" -ssh-keygen -t rsa -b 2048 -f mason.key -C mason@TROVE_HOST -N '' -ssh-keygen -t rsa -b 2048 -f lorry.key -C lorry@TROVE_HOST -N '' -ssh-keygen -t rsa -b 2048 -f worker.key -C worker@TROVE_HOST -N '' -ssh-keygen -t rsa -b 2048 -f id_rsa -C trove-admin@TROVE_HOST -N '' +test -e mason.key || ssh-keygen -t rsa -b 2048 -f mason.key -C mason@TROVE_HOST -N '' +test -e lorry.key || ssh-keygen -t rsa -b 2048 -f lorry.key -C lorry@TROVE_HOST -N '' +test -e worker.key || ssh-keygen -t rsa -b 2048 -f worker.key -C worker@TROVE_HOST -N '' +test -e id_rsa || ssh-keygen -t rsa -b 2048 -f id_rsa -C trove-admin@TROVE_HOST -N '' cd ../ @@ -61,7 +61,7 @@ cd ../ # Mason setup ############################################################################## -cp mason.morph mason-${HOST_PREFIX}.morph +cp clusters/mason.morph mason-${HOST_PREFIX}.morph sed -i "s/red-box-v1/$(sedescape "$HOST_PREFIX")/g" "mason-$HOST_PREFIX.morph" sed -i "s/ssh_keys/ssh_keys-$(sedescape "$HOST_PREFIX")/g" "mason-$HOST_PREFIX.morph" @@ -76,8 +76,8 @@ sed -i "s/\.example\.com/$(sedescape "$HOST_POSTFIX")/g" "mason-$HOST_PREFIX.mor # System building ############################################################################## -morph build trove-system-x86_64 -morph build distbuild-system-x86_64 +morph build systems/trove-system-x86_64.morph +morph build systems/distbuild-system-x86_64.morph ############################################################################## diff --git a/mason/mason.sh b/mason/mason.sh index 2dca7d84..1facd58b 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -13,7 +13,7 @@ cd ws definitions_repo="$DEFINITIONS_REF"/"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions if [ ! -e "$definitions_repo" ]; then - morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions.git "$DEFINITIONS_REF" + morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions "$DEFINITIONS_REF" cd "$definitions_repo" git config user.name "$TROVE_ID"-mason git config user.email "$TROVE_ID"-mason@$(hostname) |