Changeset 78

Timestamp:

02/07/08 13:04:52 (10 months ago)

Author:

jweiss

Message:

Moved ActionController? session key to webistrano_config.rb

Location:

trunk

Files:

• CHANGELOG.txt (modified) (1 diff)
• config/environment.rb (modified) (3 diffs)
• config/webistrano_config.rb.sample (modified) (1 diff)

trunk/CHANGELOG.txt

@@ -1 +1 @@
 
 * SVN *
+
+* Moved ActionController session key to webistrano_config.rb
 
 * Used template naming conventions of Rails 2.x: Provided by kosmas.schuetz@gmx.com

trunk/config/environment.rb

@@ -10 +10 @@
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
+
+# load Webistrano configuration
+require "#{RAILS_ROOT}/config/webistrano_config"
 
 Rails::Initializer.run do |config|
@@ -39 +42 @@
   config.action_controller.session = {
     :session_key => '_webistrano_session',
-    :secret      => '4a850072e0e38kvi8#e3abcbf3e0702f0c0cfab35c7e29cbee5e6f267cd8b652ffa24jkasjdh78jk3-0a9:~&@90fb7759e073f0f6ba4b0607bc10324c'
+    :secret      => WebistranoConfig[:session_secret]
   }
 
@@ -83 +86 @@
 require 'syntax/convertors/html'
 
-# load Webistrano configuration
-require "#{RAILS_ROOT}/config/webistrano_config"
-
 ActionMailer::Base.delivery_method = WebistranoConfig[:smtp_delivery_method] 
 ActionMailer::Base.smtp_settings = WebistranoConfig[:smtp_settings] 

trunk/config/webistrano_config.rb.sample

@@ -5 +5 @@
 #
 WebistranoConfig = {
+
+  # secret password for session HMAC
+  :session_secret => 'please choose a long random string, min. 30 characters'
   
   # SMTP settings for outgoing email