Feature #1229: :server: is now :host: in occi server configuration

(cherry picked from commit f437bd461f)
This commit is contained in:
Hector Sanjuan authored and Ruben S. Montero committed 2012-05-04 16:29:45 +02:00
1 parent 42872f9c44
commit 7c6e890bde
2 files changed
+13 -3

No files matched your search

+1 -1
View File
@@ -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)
+12 -2
View File
@@ -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