Project

General

Profile

« Previous | Next » 

Revision ad8bb0c7

Added by Greg Sutcliffe almost 12 years ago

  • ID ad8bb0c7f0b5f142093a8fcbd6cc64bc8d430fd9

Changes for Ruby 1.8/9 compatibilty, and Debian packaging guidelines

  • Allow proxy to work on both ruby 1.9 and 1.8
  • Require ping gem on ruby1.8
  • Handle public folder changes in Sinatra
  • Don't load rubygems if USE_GEMS=false specified, to comply with Debian guidelines
  • Add USE_GEMS to the initscript

View differences:

bin/smart-proxy
$LOAD_PATH.unshift *Dir["#{File.dirname(__FILE__)}/../lib"]
APP_ROOT = "#{File.dirname(__FILE__)}/.."
require "rubygems"
require "checks"
require "rubygems" if USE_GEMS
require "proxy"
require "sinatra-patch"
require "json"
......
set :root, APP_ROOT
set :views, APP_ROOT + '/views'
set :public, APP_ROOT + '/public'
set :logging, true
set :env, :production
set :run, true
# This changed in later Sinatra versions
if ( Sinatra::VERSION.split('.').map{|s|s.to_i} <=> [1,3,0] ) > 0
set :public_folder, APP_ROOT + '/public'
else
set :public, APP_ROOT + '/public'
end
require "tftp_api" if SETTINGS.tftp
require "puppet_api" if SETTINGS.puppet
require "puppetca_api" if SETTINGS.puppetca

Also available in: Unified diff