Permalink
Browse files

The app generator sets a session key in application.rb so apps runnin…

…g on the same host may distinguish their cookies. Closes #2967.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4328 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jeremy committed May 7, 2006
1 parent d08d89c commit 0adcd811f945603a8037febaa158bbc1ffaba9d1
View
@@ -1,5 +1,7 @@
*SVN*
+* The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 [rcoder, rails-bug@owl.me.uk]
+
* Distinguish the spawners for different processes [DHH]
* Added -n/--process to script/process/spawner name the process pid (default is dispatch) [DHH]
@@ -1,4 +1,10 @@
-# Filters added to this controller will be run for all controllers in the application.
+# Filters added to this controller apply to all controllers in the application.
# Likewise, all the methods added will be available for all controllers.
+
class ApplicationController < ActionController::Base
-end
+ # Pick a unique cookie name to distinguish our session data from others'.
+ session :session_key => '_<%= app_name %>_session_id'
+
+ # Or disable sessions entirely.
+ #session :off
+end
@@ -14,6 +14,7 @@ def initialize(runtime_args, runtime_options = {})
usage if args.empty?
usage("Databases supported for preconfiguration are: #{DATABASES.join(", ")}") if (options[:db] && !DATABASES.include?(options[:db]))
@destination_root = args.shift
+ @app_name = File.basename(File.expand_path(@destination_root))
end
def manifest
@@ -31,13 +32,13 @@ def manifest
m.file "README", "README"
# Application
- m.template "helpers/application.rb", "app/controllers/application.rb"
+ m.template "helpers/application.rb", "app/controllers/application.rb", :assigns => { :app_name => @app_name }
m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb"
m.template "helpers/test_helper.rb", "test/test_helper.rb"
# database.yml and .htaccess
m.template "configs/databases/#{options[:db]}.yml", "config/database.yml", :assigns => {
- :app_name => File.basename(File.expand_path(@destination_root)),
+ :app_name => @app_name,
:socket => options[:db] == "mysql" ? mysql_socket_location : nil
}
m.template "configs/routes.rb", "config/routes.rb"

0 comments on commit 0adcd81

Please sign in to comment.