CascadiaDigitalCollective/gxg-server
CascadiaDigitalCollective/gxg-server
2
0
Fork 0
mirror of https://github.com/mistergibson/gxg-server.git synced 2026-08-15 02:15:59 -07:00
Code Issues Projects 1 Releases Packages Wiki Activity Actions

bug fixes

Browse source
This commit is contained in:
G. Gibson 2024-04-28 14:47:21 -07:00
parent aa2b17fc70
commit 74b120416d
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Services/www/www.rb
View file

@ -69,10 +69,10 @@ class Node0 < Sinatra::Application
set :public_folder, ::GxG::SYSTEM_PATHS[:www_public] set :public_folder, ::GxG::SYSTEM_PATHS[:www_public]
set :logging, true set :logging, true
set :logger, ::GxG::LOG 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 set :session_secret, secret
use Rack::Session::Pool, {:expire_after => 318513600, :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 => false} use Rack::Session::Cookie, {:key => 'rack.session', :path => '/', :expire_after => 318513600, :secret => secret, :secure => true}
end end
# ### Extend Sinatra Verbs # ### Extend Sinatra Verbs
# DAV Class 1 Supports # DAV Class 1 Supports

2
Services/www/www/gxg-www.rb
View file

@ -264,7 +264,7 @@ module GxGwww
end end
record[:application_icon] = icon record[:application_icon] = icon
else 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 if cache_entry
record[:application_icon_type] = cache_entry[:content_type] record[:application_icon_type] = cache_entry[:content_type]
record[:application_icon] = cache_entry[:data].to_s.encode64 record[:application_icon] = cache_entry[:data].to_s.encode64

1
install.rb
View file

@ -15,6 +15,7 @@ if RUBY_ENGINE == "jruby"
requirements = [] requirements = []
requirements.push({:requirement => "spoon", :gem => "spoon"}) requirements.push({:requirement => "spoon", :gem => "spoon"})
requirements.push({:requirement => "psych", :gem => "psych"}) requirements.push({:requirement => "psych", :gem => "psych"})
requirements.push({:requirement => "rackup", :gem => "rackup"})
requirements.push({:requirement => "sinatra", :gem => "sinatra"}) requirements.push({:requirement => "sinatra", :gem => "sinatra"})
requirements.push({:requirement => "sinatra-contrib", :gem => "sinatra-contrib"}) requirements.push({:requirement => "sinatra-contrib", :gem => "sinatra-contrib"})
requirements.push({:requirement => "webrick", :gem => "webrick"}) requirements.push({:requirement => "webrick", :gem => "webrick"})