Skip to content

Commit

Permalink
Minor changes:
Browse files Browse the repository at this point in the history
- using bundler in bin/rubycas-server
- bringing config.ru in line with recent main repository changes
- not saving renew parameter in session anymore, its effect is immediate, not delayed, unlike service
  • Loading branch information
Slotos committed Jul 4, 2012
1 parent c863d1a commit b9240e1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
1 change: 1 addition & 0 deletions bin/rubycas-server
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
$KCODE = 'u' if RUBY_VERSION < '1.9'

require 'rubygems'
require 'bundler/setup'

$:.unshift File.dirname(__FILE__) + "/../lib"

Expand Down
11 changes: 1 addition & 10 deletions config.ru
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
require 'rubygems'


# Assume all necessary gems are in place if bundler is not installed.
begin
require 'bundler'
Bundler.require
#require 'bundler/setup'
rescue LoadError => e
raise e unless e.message =~ /no such file to load -- bundler/
end
require 'bundler/setup'

$:.unshift "#{File.dirname(__FILE__)}/lib"
require "casserver"
Expand Down
1 change: 0 additions & 1 deletion lib/casserver/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@ def self.init_database!
@gateway = params['gateway'] == 'true' || params['gateway'] == '1'

session[:service] = @service
session[:renew] = @renew

if tgc = request.cookies['tgt']
tgt, tgt_error = validate_ticket_granting_ticket(tgc)
Expand Down

0 comments on commit b9240e1

Please sign in to comment.