diff --git a/market/config/appmarket.yaml b/market/config/appmarket-server.conf similarity index 100% rename from market/config/appmarket.yaml rename to market/config/appmarket-server.conf diff --git a/market/controllers/server.rb b/market/controllers/server.rb index f99174b1bd..72e66fb123 100644 --- a/market/controllers/server.rb +++ b/market/controllers/server.rb @@ -17,8 +17,8 @@ else RUBY_LIB_LOCATION = ONE_LOCATION+"/lib/ruby" end -APPMARKET_LOG = LOG_LOCATION + "/appmarket.log" -CONFIGURATION_FILE = ETC_LOCATION + "/appmarket.yaml" +APPMARKET_LOG = LOG_LOCATION + "/appmarket-server.log" +CONFIGURATION_FILE = ETC_LOCATION + "/appmarket-server.conf" $: << RUBY_LIB_LOCATION $: << RUBY_LIB_LOCATION+'/cloud' diff --git a/market/install.sh b/market/install.sh index 24d93bc617..925673d947 100755 --- a/market/install.sh +++ b/market/install.sh @@ -96,5 +96,5 @@ copy_files "sunstone/routes/*" "$SUNSTONE_LOCATION/routes" # Do not link the ETC files LINK="no" -copy_files "config/appmarket.yaml" "$ETC_LOCATION" +copy_files "config/appmarket-server.conf" "$ETC_LOCATION"