shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

feature #795: Use yaml conf file in Sunstone

Browse Source
This commit is contained in:
Daniel Molina 2011-09-21 19:10:49 +02:00
parent b52e99c0dd
commit 4623bdc264
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sunstone/etc/sunstone-server.conf
View File

@ -1,12 +1,12 @@
# OpenNebula sever contact information
ONE_XMLRPC=http://localhost:2633/RPC2
:one_xmlrpc: http://localhost:2633/RPC2
# Server Configuration
HOST=127.0.0.1
PORT=9869
:host: 127.0.0.1
:port: 9869
AUTH=basic
:auth: basic
# VNC Configuration
VNC_PROXY_BASE_PORT=29876
NOVNC_PATH=
:vnc_proxy_base_port: 29876
:novnc_path:

14
src/sunstone/sunstone-server.rb
View File

@ -46,16 +46,24 @@ require 'rubygems'
require 'sinatra'
require 'erb'
require 'Configuration'
require 'CloudAuth'
require 'SunstoneServer'
require 'SunstonePlugins'
set :config, Configuration.new(CONFIGURATION_FILE)
begin
conf = YAML.load_file(CONFIGURATION_FILE)
rescue Exception => e
puts "Error parsing config file #{CONFIGURATION_FILE}: #{e.message}"
exit 1
end
conf[:hash_passwords] = true
##############################################################################
# Sinatra Configuration
##############################################################################
use Rack::Session::Pool, :key => 'sunstone'
set :config, conf
set :host, settings.config[:host]
set :port, settings.config[:port]
@ -82,7 +90,7 @@ helpers do
# Add a log message
return [500, ""]
end
session[:user] = user['NAME']
session[:user_id] = user['ID']
session[:user_gid] = user['GID']