diff options
Diffstat (limited to 'trove.configure')
-rwxr-xr-x | trove.configure | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/trove.configure b/trove.configure index 1851e38c..a4000e42 100755 --- a/trove.configure +++ b/trove.configure @@ -20,6 +20,7 @@ # from the environment (see MUSTARD for a description of them): # # * TROVE_ID +# * TROVE_HOSTNAME (optional, defaults to TROVE_ID) # * TROVE_COMPANY # * LORRY_SSH_KEY # * UPSTREAM_TROVE @@ -42,13 +43,15 @@ set -e ROOT="$1" +if [ -z "$TROVE_HOSTNAME" ] +then + export TROVE_HOSTNAME="$TROVE_ID" +fi + ########################################################################## # Configuration in /etc, which we need to do on all deployments. ########################################################################## -echo "Set hostname to $TROVE_ID" -echo "$TROVE_ID" > "$ROOT/etc/hostname" - ########################################################################## lua_escape() @@ -59,7 +62,7 @@ lua_escape() echo "Creating /etc/trove-setup.sed" cat <<EOF > "$ROOT"/etc/trove-setup.sed -s/##TROVE_HOSTNAME##/$TROVE_ID/g +s/##TROVE_HOSTNAME##/$TROVE_HOSTNAME/g s/##MASON_HOST##/$MASON_ID/g s/##MASON_PORT##/18755/g s/##TROVE_TITLE##/$TROVE_ID/g |