From f437bd461fbf6b9ffc972737c50c603b52d0ec98 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Fri, 4 May 2012 14:52:57 +0200
Subject: [PATCH] Feature #1229: :server: is now :host: in occi server
 configuration

---
 src/cloud/occi/etc/occi-server.conf |  2 +-
 src/cloud/occi/lib/occi-server.rb   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/cloud/occi/etc/occi-server.conf b/src/cloud/occi/etc/occi-server.conf
index 16f0f6ea6c..f041e6d83e 100644
--- a/src/cloud/occi/etc/occi-server.conf
+++ b/src/cloud/occi/etc/occi-server.conf
@@ -22,7 +22,7 @@
 :one_xmlrpc: http://localhost:2633/RPC2
 
 # Host and port where OCCI server will run
-:server: localhost
+:host: 127.0.0.1
 :port: 4567
 
 # SSL proxy that serves the API (set if is being used)
diff --git a/src/cloud/occi/lib/occi-server.rb b/src/cloud/occi/lib/occi-server.rb
index 851d58dc5c..183ef31c88 100644
--- a/src/cloud/occi/lib/occi-server.rb
+++ b/src/cloud/occi/lib/occi-server.rb
@@ -89,7 +89,7 @@ enable_logging OCCI_LOG, settings.config[:debug_level].to_i
 # Set Sinatra configuration
 use Rack::Session::Pool, :key => 'occi'
 
-set :public, Proc.new { File.join(root, "ui/public") }
+set :public_folder, Proc.new { File.join(root, "ui/public") }
 set :views, settings.root + '/ui/views'
 
 if CloudServer.is_port_open?(settings.config[:server],
@@ -101,10 +101,20 @@ if CloudServer.is_port_open?(settings.config[:server],
     exit -1
 end
 
-set :bind, settings.config[:server]
+host = settings.config[:host] || settings.config[:server]
+set :bind, host
+
+if settings.config[:server]
+    warning = "Warning: :server: configuration parameter has been deprecated."
+    warning << " Use :host: instead."
+    settings.logger.error warning
+end
+
 set :port, settings.config[:port]
 
 
+
+
 # Create CloudAuth
 begin
     ENV["ONE_CIPHER_AUTH"] = OCCI_AUTH