mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-21 14:50:08 +03:00
Feature #1229: :server: is now :host: in occi server configuration
This commit is contained in:
parent
235ba15ab9
commit
f437bd461f
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user