summaryrefslogtreecommitdiff
path: root/mason/mason-generator.sh
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-08-21 15:27:31 +0000
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-08-21 15:27:31 +0000
commitffff5a72fd7883e3b396d1f9db696dc8f38d8527 (patch)
tree6ef5cbded3ed387f2f014ebadd6dd799e54fa17e /mason/mason-generator.sh
parent13d084a14439609ddb822b0e1f1c60757ab149fd (diff)
downloaddefinitions-baserock/danielsilverstone/mason-new-kernel.tar.gz
Diffstat (limited to 'mason/mason-generator.sh')
-rwxr-xr-xmason/mason-generator.sh16
1 files changed, 8 insertions, 8 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
##############################################################################