[38266] branches/gsoc08-mpwa
digx at macports.org
digx at macports.org
Sun Jul 13 23:30:59 PDT 2008
Revision: 38266
http://trac.macosforge.org/projects/macports/changeset/38266
Author: digx at macports.org
Date: 2008-07-13 23:30:58 -0700 (Sun, 13 Jul 2008)
Log Message:
-----------
Couple config and deployment updates
Modified Paths:
--------------
branches/gsoc08-mpwa/Rakefile
branches/gsoc08-mpwa/config/environment.rb
branches/gsoc08-mpwa/config/routes.rb
Added Paths:
-----------
branches/gsoc08-mpwa/config/database.yml.example
Removed Paths:
-------------
branches/gsoc08-mpwa/config/database.yml
Property Changed:
----------------
branches/gsoc08-mpwa/config/
Modified: branches/gsoc08-mpwa/Rakefile
===================================================================
--- branches/gsoc08-mpwa/Rakefile 2008-07-14 06:26:57 UTC (rev 38265)
+++ branches/gsoc08-mpwa/Rakefile 2008-07-14 06:30:58 UTC (rev 38266)
@@ -8,3 +8,10 @@
require 'rake/rdoctask'
require 'tasks/rails'
+
+begin
+ require 'vlad'
+ Vlad.load
+rescue LoadError
+ # do nothing
+end
\ No newline at end of file
Property changes on: branches/gsoc08-mpwa/config
___________________________________________________________________
Name: svn:ignore
+ database.yml
Deleted: branches/gsoc08-mpwa/config/database.yml
===================================================================
--- branches/gsoc08-mpwa/config/database.yml 2008-07-14 06:26:57 UTC (rev 38265)
+++ branches/gsoc08-mpwa/config/database.yml 2008-07-14 06:30:58 UTC (rev 38266)
@@ -1,19 +0,0 @@
-# SQLite version 3.x
-# gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
- adapter: sqlite3
- database: db/development.sqlite3
- timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
- adapter: sqlite3
- database: db/test.sqlite3
- timeout: 5000
-
-production:
- adapter: sqlite3
- database: db/production.sqlite3
- timeout: 5000
Copied: branches/gsoc08-mpwa/config/database.yml.example (from rev 38265, branches/gsoc08-mpwa/config/database.yml)
===================================================================
--- branches/gsoc08-mpwa/config/database.yml.example (rev 0)
+++ branches/gsoc08-mpwa/config/database.yml.example 2008-07-14 06:30:58 UTC (rev 38266)
@@ -0,0 +1,19 @@
+# SQLite version 3.x
+# gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+ adapter: sqlite3
+ database: db/development.sqlite3
+ timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+ adapter: sqlite3
+ database: db/test.sqlite3
+ timeout: 5000
+
+production:
+ adapter: sqlite3
+ database: db/production.sqlite3
+ timeout: 5000
Modified: branches/gsoc08-mpwa/config/environment.rb
===================================================================
--- branches/gsoc08-mpwa/config/environment.rb 2008-07-14 06:26:57 UTC (rev 38265)
+++ branches/gsoc08-mpwa/config/environment.rb 2008-07-14 06:30:58 UTC (rev 38266)
@@ -1,67 +1,16 @@
-# Be sure to restart your server when you modify this file
-# Uncomment below to force Rails into production mode when
-# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
-
-# Specifies gem version of Rails to use when vendor/rails is not present
RAILS_GEM_VERSION = '2.1.0' 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.
- # See Rails::Configuration for more options.
- # 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 ]
-
- # Specify gems that this application depends on.
- # They can then be installed with "rake gems:install" on new installations.
- # config.gem "bj"
- # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
- # config.gem "aws-s3", :lib => "aws/s3"
-
- # Only load the plugins named here, in the order given. By default, all plugins
- # in vendor/plugins are loaded in alphabetical order.
- # :all can be used as a placeholder for all plugins not explicitly named
- # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
- # Add additional load paths for your own custom dirs
- # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
- # Force all environments to use the same logger level
- # (by default production uses :info, the others :debug)
- # config.log_level = :debug
-
- # Make Time.zone default to the specified zone, and make Active Record store time values
- # in the database in UTC, and return them converted to the specified local zone.
- # Run "rake -D time" for a list of tasks for finding time zone names. Uncomment to use default local time.
+ # default timezone
config.time_zone = 'UTC'
- # Your secret key for verifying cookie session data integrity.
- # If you change this key, all old sessions will become invalid!
- # Make sure the secret is at least 30 characters and all random,
- # no regular words or you'll be exposed to dictionary attacks.
+ # session config
config.action_controller.session = {
- :session_key => '_mp_session',
+ :session_key => '_macports_session',
:secret => 'd3d3f74c611cc491cc37374031dafd5ff24214cfbf26253109e399c6740f8ebadab3807fa15d6fef0f0b13499a31d9b2b75cac48869d8014d3c60ef5e39edea8'
}
- # 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 "rake db:sessions:create")
- # config.action_controller.session_store = :active_record_store
-
- # Use SQL instead of Active Record's schema dumper when creating the test database.
- # This is necessary if your schema can't be completely dumped by the schema dumper,
- # like if you have constraints or database-specific column types
- # config.active_record.schema_format = :sql
-
- # Activate observers that should always be running
- # config.active_record.observers = :cacher, :garbage_collector
end
Modified: branches/gsoc08-mpwa/config/routes.rb
===================================================================
--- branches/gsoc08-mpwa/config/routes.rb 2008-07-14 06:26:57 UTC (rev 38265)
+++ branches/gsoc08-mpwa/config/routes.rb 2008-07-14 06:30:58 UTC (rev 38266)
@@ -1,49 +1,15 @@
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
-
map.resources :ports, :collection => { :random => :get } do |port|
port.resources :packages
end
map.resources :tags
-
map.resources :people
-
- # 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
+ map.root :controller => "home"
- # 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|
- # # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb)
- # admin.resources :products
- # end
-
- # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
- map.root :controller => "mac_ports"
-
- # See how all your routes lay out with "rake routes"
-
- # Install the default routes as the lowest priority.
map.connect ':controller/:action/:id'
map.connect ':controller/:action/:id.:format'
+
end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080713/e7d287ed/attachment-0001.html
More information about the macports-changes
mailing list