1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00

feature #1369. Add information to Sunstone conf file and VNC log. Default value for session is memory.

This commit is contained in:
Ruben S. Montero 2013-03-08 00:18:52 +01:00
parent 987f833b16
commit 2289b1d3f4
4 changed files with 7 additions and 3 deletions

View File

@ -63,7 +63,7 @@ class OpenNebulaVNC
end
if @proxy_path == nil || @proxy_path.empty?
@logger.error "VNC proxy not configured"
@logger.error "VNC proxy not configured. Try #{SHARE_LOCATION}/install_novnc.sh"
return false
end

View File

@ -23,12 +23,14 @@ if !ONE_LOCATION
LOG_LOCATION = "/var/log/one"
LOCK_LOCATION = "/var/lock/one"
VAR_LOCATION = "/var/lib/one"
SHARE_LOCATION = "/usr/share/one"
ETC_LOCATION = "/etc/one"
RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
else
VAR_LOCATION = ONE_LOCATION + "/var"
LOCK_LOCATION = ONE_LOCATION + "/var"
LOG_LOCATION = ONE_LOCATION + "/var"
SHARE_LOCATION = ONE_LOCATION + "/share"
ETC_LOCATION = ONE_LOCATION + "/etc"
RUBY_LIB_LOCATION = ONE_LOCATION+"/lib/ruby"
end

View File

@ -34,6 +34,9 @@
# Place where to store sessions, this value can be memory or memcache
# Use memcache when starting multiple server processes, for example,
# with passenger
#
# NOTE. memcache needs a separate memcached server to be configured. Refer
# to memcached documentation to configure the server.
:sessions: memory
# Memcache configuration

View File

@ -81,7 +81,7 @@ set :bind, settings.config[:host]
set :port, settings.config[:port]
case settings.config[:sessions]
when 'memory'
when 'memory', nil
use Rack::Session::Pool, :key => 'sunstone'
when 'memcache'
memcache_server=settings.config[:memcache_host]+':'<<
@ -92,7 +92,6 @@ when 'memcache'
use Rack::Session::Memcache,
:memcache_server => memcache_server,
:namespace => settings.config[:memcache_namespace]
else
STDERR.puts "Wrong value for :sessions in configuration file"
exit(-1)