diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 9ac0cd4b92..15ea9e292c 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -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 diff --git a/src/sunstone/bin/novnc-server b/src/sunstone/bin/novnc-server index e203ff4bf6..20d2772a50 100755 --- a/src/sunstone/bin/novnc-server +++ b/src/sunstone/bin/novnc-server @@ -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 diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf index 0104ff5e17..de5da49729 100644 --- a/src/sunstone/etc/sunstone-server.conf +++ b/src/sunstone/etc/sunstone-server.conf @@ -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 diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index 35eac27f14..ac64ad5f49 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -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)