Further cleanup of old configuration and rails2 backup files

10 files changed, 3 insertions, 261 deletions

diff --git a/config/environment.rb.rails2 b/config/environment.rb.rails2
deleted file mode 100644
index e416e83..0000000
--- a/config/environment.rb.rails2
+++ /dev/null
@@ -1,52 +0,0 @@
-# Be sure to restart your server when you modify this file
-
-# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.12' unless defined? RAILS_GEM_VERSION
-
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
-Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence over those specified here.
-  # Application configuration should go into files in config/initializers
-  # -- all .rb files in that directory are automatically loaded.
-
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
-  # Specify gems that this application depends on and have them installed with rake gems:install
-  # config.gem "bj"
-  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
-  # config.gem "sqlite3-ruby", :lib => "sqlite3"
-  # config.gem "aws-s3", :lib => "aws/s3"
-  config.gem 'json'
-  config.gem 'mechanize'
-  config.gem 'fastercsv'
-  # actionmailer vendors this gem. uncommented to avoid lots of warnings
-  #  config.gem 'text-format', :lib => 'text/format'
-  config.gem 'diff-lcs', :lib => 'diff/lcs'
-
-  # Only load the plugins named here, in the order given (default is alphabetical).
-  # :all can be used as a placeholder for all plugins not explicitly named
-  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-  # Skip frameworks you're not going to use. To use Rails without a database,
-  # you must remove the Active Record framework.
-  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
-
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names.
-  config.time_zone = 'UTC'
-
-  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
-  config.action_controller.session_store = :active_record_store
-end
-
-GLSAMAKER_VERSION="1.9-git"
-
-require 'digest/md5'
diff --git a/config/environments/development.rb.rails2 b/config/environments/development.rb.rails2
deleted file mode 100644
index f161881..0000000
--- a/config/environments/development.rb.rails2
+++ /dev/null
@@ -1,19 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_view.debug_rjs                         = true
-config.action_controller.perform_caching             = false
-
-config.action_mailer.delivery_method = :sendmail
-
-# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
diff --git a/config/environments/production.rb.rails2 b/config/environments/production.rb.rails2
deleted file mode 100644
index dd0a591..0000000
--- a/config/environments/production.rb.rails2
+++ /dev/null
@@ -1,35 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
-
-# Full error reports are disabled and caching is turned on
-config.action_controller.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
-config.action_view.cache_template_loading            = true
-
-# See everything in the log (default is :info)
-# config.log_level = :debug
-
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-# FIXME: This doesn't work quite yet
-#config.logger = SyslogLogger.new('glsamaker2')
-
-# Use a different cache store in production
-# config.cache_store = :mem_cache_store
-
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host = "http://assets.example.com"
-
-# Disable delivery errors, bad email addresses will be ignored
-# config.action_mailer.raise_delivery_errors = false
-
-# We care about email errors
-config.action_mailer.raise_delivery_errors = true
-config.action_mailer.delivery_method = :sendmail
-config.action_mailer.sendmail_settings = { :location => '/usr/sbin/sendmail', :arguments => '-i -t -f glsamaker@gentoo.org' }
-
-# Enable threaded mode
-#config.threadsafe!
diff --git a/config/initializers/bundler_ext.rb b/config/initializers/bundler_ext.rb
deleted file mode 100644
index 954d9b7..0000000
--- a/config/initializers/bundler_ext.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# module ActionView
-#   module TemplateHandlers
-#     class BuilderOptions
-#       cattr_accessor :margin, :indent
-#     end
-#   end
-# end
-# 
-# module ActionView
-#   module TemplateHandlers
-#     class Builder < TemplateHandler
-# 
-#       def compile(template)
-#         "_set_controller_content_type(Mime::XML);" +
-#           "xml = ::Builder::XmlMarkup.new(" +
-#           ":indent => #{ActionView::TemplateHandlers::BuilderOptions.indent}, " +
-#           ":margin => #{ActionView::TemplateHandlers::BuilderOptions.margin});" +
-#           "self.output_buffer = xml.target!;" +
-#           template.source +
-#           ";xml.target!;"
-#       end
-#     end
-#   end
-# end
-# 
-# ActionView::TemplateHandlers::BuilderOptions.margin = 0
-# ActionView::TemplateHandlers::BuilderOptions.indent = 2
diff --git a/config/initializers/glsamaker-global.rb b/config/initializers/glsamaker-global.rb
index 1fc8450..1131818 100644
--- a/config/initializers/glsamaker-global.rb
+++ b/config/initializers/glsamaker-global.rb
@@ -1,2 +1 @@
-# window stuff needed first
-# ActionView::Helpers::AssetTagHelper::register_javascript_include_default 'modalbox'
+# nothing in here currently
\ No newline at end of file
diff --git a/config/initializers/new_rails_defaults.rb b/config/initializers/new_rails_defaults.rb
deleted file mode 100644
index 4f932c7..0000000
--- a/config/initializers/new_rails_defaults.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# These settings change the behavior of Rails 2 apps and will be defaults
-# for Rails 3. You can remove this initializer when Rails 3 is released.
-
-if defined?(ActiveRecord)
-  # Include Active Record class name as root for JSON serialized output.
-  ActiveRecord::Base.include_root_in_json = true
-
-  # Store the full class name (including module namespace) in STI type column.
-  ActiveRecord::Base.store_full_sti_class = true
-end
-
-# Use ISO 8601 format for JSON serialized times and dates.
-ActiveSupport.use_standard_json_time_format = true
-
-# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
-# if you're including raw json in an HTML page.
-ActiveSupport.escape_html_entities_in_json = false
diff --git a/config/initializers/require_libs.rb b/config/initializers/require_libs.rb
deleted file mode 100644
index 9a9ff8f..0000000
--- a/config/initializers/require_libs.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-unless Rails.env == 'development'
-  require 'lib/authentication'
-  require 'lib/glsamaker'
-  #require 'lib/glsamaker/diff'
-  #require 'lib/glsamaker/portage'
-  require 'lib/glsamaker/helpers'
-  #require 'lib/glsamaker/xml'
-  #require 'lib/glsamaker/http'
-  #require 'lib/glsamaker/bugs'
-  require 'lib/bugzilla'
-  #require 'lib/bugzilla/bug'
-  #require 'lib/bugzilla/history'
-  #require 'lib/bugzilla/comment'
-else
-  require 'lib/glsamaker/bugs'
-end
-
-# vim: ts=2 sw=2 et ft=ruby sts=2 tw=72 nospell:
-
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 6c9bd0a..f833bce 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-Glsamaker::Application.config.session_store :cookie_store, :key => '_glsamaker_session'
+# Glsamaker::Application.config.session_store :cookie_store, :key => '_glsamaker_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rails generate session_migration")
-# Glsamaker::Application.config.session_store :active_record_store
+Glsamaker::Application.config.session_store :active_record_store
diff --git a/config/preinitializer.rb b/config/preinitializer.rb
deleted file mode 100644
index 85399f7..0000000
--- a/config/preinitializer.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-begin
-  require "rubygems"
-  require "bundler"
-rescue LoadError
-  raise "Could not load the bundler gem. Install it with `gem install bundler`."
-end
-
-if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
-  raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
-   "Run `gem install bundler` to upgrade."
-end
-
-begin
-  # Set up load paths for all bundled gems
-  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
-  Bundler.setup
-rescue Bundler::GemNotFound
-  raise RuntimeError, "Bundler couldn't find some gems." +
-    "Did you run `bundle install`?"
-end
\ No newline at end of file
diff --git a/config/routes.rb.rails2 b/config/routes.rb.rails2
deleted file mode 100644
index 9b250f5..0000000
--- a/config/routes.rb.rails2
+++ /dev/null
@@ -1,66 +0,0 @@
-ActionController::Routing::Routes.draw do |map|
-  # The priority is based upon order of creation: first created -> highest priority.
-
-  # Sample of regular route:
-  #   map.connect 'products/:id', :controller => 'catalog', :action => 'view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   map.resources :products
-
-  # Sample resource route with options:
-  #   map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
-
-  # Sample resource route with sub-resources:
-  #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-  
-  # Sample resource route with more complex sub-resources
-  #   map.resources :products do |products|
-  #     products.resources :comments
-  #     products.resources :sales, :collection => { :recent => :get }
-  #   end
-
-  # Sample resource route within a namespace:
-  map.namespace :admin do |admin|
-    admin.resources :users
-  end
-
-  # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
-  map.root :controller => "index"
-
-  # See how all your routes lay out with "rake routes"
-
-  # Install the default routes as the lowest priority.
-  # Note: These default routes make all actions in every controller accessible via GET requests. You should
-  # consider removing the them or commenting them out if you're using named routes and resources.
-  
-  # Bugzilla interface
-  map.bug '/bug/:id', :controller => 'bug', :action => 'bug'
-  map.bughistory '/bug/:id/history', :controller => 'bug', :action => 'history'
-
-  # Adding a comment to a GLSA
-  map.addcomment '/glsa/:id/addcomment', :controller => 'glsa', :action => 'addcomment'
-  map.addcommentsave '/glsa/:id/addcomment/save', :controller => 'glsa', :action => 'addcommentsave'
-  
-  map.requests '/glsa/requests', :controller => 'glsa', :action => 'requests'
-  map.drafts   '/glsa/drafts'  , :controller => 'glsa', :action => 'drafts'
-  map.sent     '/glsa/archive' , :controller => 'glsa', :action => 'archive'
-  
-  map.diff '/glsa/diff/:id/rev/:from/to/:to', :controller => 'glsa', :action => 'diff'
-  
-  map.newglsa '/glsa/new/:what', :controller => 'glsa', :action => 'new'
-  map.showglsa '/glsa/show/:id.:format', :controller => 'glsa', :action => 'show'
-  
-  map.bugzie '/tools/bug/:id/:what', :controller => 'tools', :action => 'bugzie'  
-  
-  map.cve '/cve/list.:format', :controller => 'cve', :action => 'list'
-  
-  map.connect 'admin', :controller => 'admin/index', :action => 'index'
-  
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
-end