diff --git a/Services/www/www.rb b/Services/www/www.rb index 7ff42ef..ac3e0dc 100644 --- a/Services/www/www.rb +++ b/Services/www/www.rb @@ -55,7 +55,7 @@ end # ### Sinatra Bootstrap class Node0 < Sinatra::Application enable :sessions - # use Rack::Session::Cookie, {:key => "rack.session", :expire_after => 318513600, :same_site => :strict, :secure => true} + #use Rack::Session::Cookie, {:key => "rack.session", :expire_after => 318513600, :same_site => :strict, :secure => true} # helpers Sinatra::Streaming register Sinatra::WebDAV @@ -69,10 +69,10 @@ class Node0 < Sinatra::Application set :public_folder, ::GxG::SYSTEM_PATHS[:www_public] set :logging, true set :logger, ::GxG::LOG - secret = ::GxG::uuid_generate.to_s + secret = ::GxG::uuid_generate.to_s + ::GxG::uuid_generate.to_s set :session_secret, secret - use Rack::Session::Pool, {:expire_after => 318513600, :secure => false} - use Rack::Session::Cookie, {:key => 'rack.session', :path => '/', :expire_after => 318513600, :secret => secret, :secure => false} + use Rack::Session::Pool, {:expire_after => 318513600, :secure => true} + use Rack::Session::Cookie, {:key => 'rack.session', :path => '/', :expire_after => 318513600, :secret => secret, :secure => true} end # ### Extend Sinatra Verbs # DAV Class 1 Supports diff --git a/Services/www/www/gxg-www.rb b/Services/www/www/gxg-www.rb index c5a6ec6..39c07c1 100644 --- a/Services/www/www/gxg-www.rb +++ b/Services/www/www/gxg-www.rb @@ -264,7 +264,7 @@ module GxGwww end record[:application_icon] = icon else - cache_entry = GxGwww::CACHE.fetch("/themes/setup/icons/gxg_app.png",GxG::DB[:administrator]) + cache_entry = ::GxGwww::CACHE.fetch("/themes/setup/icons/gxg_app.png",GxG::DB[:administrator]) if cache_entry record[:application_icon_type] = cache_entry[:content_type] record[:application_icon] = cache_entry[:data].to_s.encode64 diff --git a/install.rb b/install.rb index 3f38afd..08aefe6 100755 --- a/install.rb +++ b/install.rb @@ -15,6 +15,7 @@ if RUBY_ENGINE == "jruby" requirements = [] requirements.push({:requirement => "spoon", :gem => "spoon"}) requirements.push({:requirement => "psych", :gem => "psych"}) + requirements.push({:requirement => "rackup", :gem => "rackup"}) requirements.push({:requirement => "sinatra", :gem => "sinatra"}) requirements.push({:requirement => "sinatra-contrib", :gem => "sinatra-contrib"}) requirements.push({:requirement => "webrick", :gem => "webrick"})