From b1de66f9b63ccd1c1bbb3df61b512c4e5d026e52 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 13 Sep 2012 14:22:53 +0200 Subject: [PATCH] Revert "appflow: Initial commit" This reverts commit 2948f814ffbe9d193276e6accd586c442bdd02a0. --- flow | 1 - market/bin/appmarket-server | 11 ++++------- market/client/lib/appplace_client.rb | 2 +- market/config/appmarket.yaml | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) delete mode 160000 flow diff --git a/flow b/flow deleted file mode 160000 index a7b1a6b3a0..0000000000 --- a/flow +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a7b1a6b3a04bb3fa78be135b2452f7fa87dae02e diff --git a/market/bin/appmarket-server b/market/bin/appmarket-server index 9905efc672..5a683a2c56 100755 --- a/market/bin/appmarket-server +++ b/market/bin/appmarket-server @@ -16,7 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -if [ -z "$MARKET_LOCATION" ]; then +if [ -z "$ONE_LOCATION" ]; then MARKET_PID=/var/run/one/appmarket-server.pid MARKET_SERVER=/usr/lib/one/ruby/apptools/market/controllers/server.rb MARKET_LOCK_FILE=/var/lock/one/.appmarket.lock @@ -36,10 +36,10 @@ setup() { if [ -f $MARKET_LOCK_FILE ]; then if [ -f $MARKET_PID ]; then - MARKETPID=`cat $MARKET_PID` - ps $MARKETPID > /dev/null 2>&1 + ONEPID=`cat $MARKET_PID` + ps $MARKET_PID > /dev/null 2>&1 if [ $? -eq 0 ]; then - echo "MARKET Server is still running (PID:$MARKETPID). Please try 'appmarket-server stop' first." + echo "MARKET Server is still running (PID:$MARKET_PID). Please try 'appmarket-server stop' first." exit 1 fi fi @@ -55,8 +55,6 @@ start() exit 1 fi - touch $MARKET_LOCK_FILE - # Start the appmarket-server daemon ruby $MARKET_SERVER >$MARKET_LOG 2>$MARKET_LOG_ERROR & @@ -99,7 +97,6 @@ stop() # Remove pid files rm -f $MARKET_PID > /dev/null 2>&1 - rm -f $MARKET_LOCK_FILE &> /dev/null echo "appmarket-server stopped" } diff --git a/market/client/lib/appplace_client.rb b/market/client/lib/appplace_client.rb index 8aaac18d65..0f243c7a73 100644 --- a/market/client/lib/appplace_client.rb +++ b/market/client/lib/appplace_client.rb @@ -7,7 +7,7 @@ module Market @username = username @password = password - url ||= 'http://localhost:6242/' + url ||= 'http://marketplace.c12g.com/' @uri = URI.parse(url) @user_agent = "OpenNebula #{CloudClient::VERSION} (#{user_agent})" diff --git a/market/config/appmarket.yaml b/market/config/appmarket.yaml index a8dde2533d..e4c3ab5d4b 100644 --- a/market/config/appmarket.yaml +++ b/market/config/appmarket.yaml @@ -1,6 +1,6 @@ # Host and port where AppMarket server will run :host: 127.0.0.1 -:port: 6242 +:port: 4567 # DB db_host: localhost