Revert "appflow: Initial commit"

This reverts commit 2948f814ff.
This commit is contained in:
Daniel Molina committed 2012-09-13 14:22:53 +02:00
1 parent 2948f814ff
commit b1de66f9b6
4 files changed
+6 -10

No files matched your search

Submodule flow deleted from a7b1a6b3a0.
+4 -7
View File
@@ -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"
}
+1 -1
View File
@@ -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})"
+1 -1
View File
@@ -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