From 49f78fa0c1b99beb018939dd88560fe1ecb9d63f Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 6 Mar 2014 13:33:37 +0000 Subject: trove: Allow multiple configuration placeholders on one line The generated /etc/trove-setup.sed script, used to set up site configuration for a deployed Trove on first-boot by trove-early-setup, did not specify the 'g' (global) flag which meant that lines with more than one occurance of a placeholder such as ##TROVE_HOST## were not set correctly. --- trove.configure | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/trove.configure b/trove.configure index 38a5d614..17686eb3 100755 --- a/trove.configure +++ b/trove.configure @@ -61,16 +61,16 @@ lua_escape() echo "Create /etc/trove-setup.sed for trove-early-setup" cat < "$ROOT/etc/trove-setup.sed" -s/##TROVE_HOSTNAME##/$TROVE_ID/ -s/##MASON_HOST##/$MASON_ID/ -s/##MASON_PORT##/18755/ -s/##TROVE_TITLE##/$TROVE_ID/ -s/##TROVE_COMPANY##/$TROVE_COMPANY/ -s/##TROVE_LOG_PREFIX##/$TROVE_ID/ -s/##ESC_PERSONAL_PREFIX##/people/ -s/##PREFIX##/$TROVE_ID/ +s/##TROVE_HOSTNAME##/$TROVE_ID/g +s/##MASON_HOST##/$MASON_ID/g +s/##MASON_PORT##/18755/g +s/##TROVE_TITLE##/$TROVE_ID/g +s/##TROVE_COMPANY##/$TROVE_COMPANY/g +s/##TROVE_LOG_PREFIX##/$TROVE_ID/g +s/##ESC_PERSONAL_PREFIX##/people/g +s/##PREFIX##/$TROVE_ID/g ## The same prefix as above, only lua-pattern-escaped -s/##ESC_PREFIX##/$(lua_escape "$TROVE_ID")/ +s/##ESC_PREFIX##/$(lua_escape "$TROVE_ID")/g EOF ########################################################################## -- cgit v1.2.1