<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>config/example/app_config.yml</filename>
    </added>
    <added>
      <filename>config/example/database.yml</filename>
    </added>
    <added>
      <filename>config/preinitializer.rb</filename>
    </added>
    <added>
      <filename>script/setup</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,6 +2,7 @@ log/*.log
 tmp/restart.txt
 tmp/**/*
 config/database.yml
+config/app_config.yml
 db/*.sqlite3
 index/**
 .DS_Store</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -32,7 +32,7 @@ use a local SQLite database.
 Next, you'll want to actually install the initial content. 
 You can do this by typing in the following command: 
 
-    rake db:rucksack:install
+    script/setup
 
 Next, run it either by pointing Phusion Passenger to the 
 public folder, or run the local server, e.g.:
@@ -54,11 +54,9 @@ The most likely explanation is that the database schema has been updated. You'll
 
 If you are planning on deploying RuckSack in a production environment, *make sure you change the secret session key*. Otherwise unauthorized users will be able to make a fake session (e.g. logged in as the administrator) and compromise your installation.
 
-The relevant line is located in &quot;config/environment.rb&quot;:
+The relevant line is located in &quot;config/app_config.yml&quot;:
 
-    config.action_controller.session = {
-      :session_key =&gt; '_rucksack_session',
-      :secret      =&gt; 'CHANGE THIS TO SOMETHING LONG AND RANDOM'
-    } 
+    session_key: &quot;_rucksack_session&quot;
+    secret: &quot;CHANGE THIS TO SOMETHING LONG AND RANDOM&quot;
 
 Have fun!</diff>
      <filename>README.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -56,13 +56,9 @@ Rails::Initializer.run do |config|
 
   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.
   config.action_controller.session = {
-    :session_key =&gt; '_rucksack_session',
-    :secret      =&gt; 'ccf6416710c9893c2233dd0550a70f074660301de000dc4e2c890bf97faf4e7400647635198a88d5aa89e5e38eafc7ea96fb6bc0bcfd87eac3ce5426dc73ab3b'
+    :session_key =&gt; APP_CONFIG['session'],
+    :secret      =&gt; APP_CONFIG['secret']
   }
 
   # Activate observers that should always be running</diff>
      <filename>config/environment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,2 +1,5 @@
 # ActionMailer stuff
-ActionMailer::Base.delivery_method = :test
\ No newline at end of file
+ActionMailer::Base.delivery_method = APP_CONFIG['email']['delivery'].to_sym
+ActionMailer::Base.smtp_settings = APP_CONFIG['email']['smtp'].symbolize_keys
+ActionMailer::Base.smtp_settings[:authentication] = ActionMailer::Base.smtp_settings[:authentication].to_sym
+ActionMailer::Base.sendmail_settings = APP_CONFIG['email']['sendmail'].symbolize_keys
\ No newline at end of file</diff>
      <filename>config/initializers/email_config.rb</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,6 @@ namespace :db do
 		task :install =&gt; :environment do
 			puts &quot;\nLoading schema...&quot;
 			Rake::Task[&quot;db:schema:load&quot;].invoke
-			Rake::Task[&quot;db:rucksack:load_config_schema&quot;].invoke
 			Rake::Task[&quot;db:rucksack:install_content&quot;].invoke
 		end
 
@@ -21,34 +20,6 @@ namespace :db do
 			load(&quot;db/import_tiddlywiki.rb&quot;)
 		end
 		
-		task :reload_config =&gt; :environment do
-		    puts &quot;\nRe-loading configuration...&quot;
-		    Rake::Task[&quot;db:rucksack:dump_config&quot;].invoke
-		    Rake::Task[&quot;db:rucksack:load_config_schema&quot;].invoke
-		    Rake::Task[&quot;db:rucksack:load_config&quot;].invoke
-		    puts &quot;Done.&quot;
-		end
-		
-		task :load_config_schema =&gt; :environment do
-			puts &quot;\nLoading configuration schema...&quot;
-			#load(&quot;db/default_config.rb&quot;)
-		end
-		
-		task :dump_config =&gt; :environment do
-			puts &quot;Dumping configuration to config/config.yml&quot;
-			#config = OpenStruct.new()
-			#ConfigOption.dump_config(config)
-			#File.open(&quot;#{RAILS_ROOT}/config/config.yml&quot;, 'w') do |file|
-			#	file.puts YAML::dump(config.marshal_dump)
-			#end
-		end
-		
-		task :load_config =&gt; :environment do
-			puts &quot;Loading configuration from config/config.yml&quot;
-			#config = OpenStruct.new(YAML.load_file(&quot;#{RAILS_ROOT}/config/config.yml&quot;))
-			#ConfigOption.load_config(config)
-		end
-				
 		# Courtesy of Retrospectiva, Copyright (C) 2006 Dimitrij Denissenko
 		desc 'Converts mysql tables to use myisam engine.'
 		task :mysql_convert_to_myisam =&gt; :environment do</diff>
      <filename>lib/tasks/schema.rake</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>config/database.example.yml</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>1ddded0aa8a8cbc6740b427cd7c22045bbab1940</id>
    </parent>
  </parents>
  <author>
    <name>jamesu</name>
    <email>jamesu@gmail.com</email>
  </author>
  <url>http://github.com/jamesu/rucksack/commit/46b878e570139b6fc71d602e21442a12632331e9</url>
  <id>46b878e570139b6fc71d602e21442a12632331e9</id>
  <committed-date>2008-11-02T06:06:30-08:00</committed-date>
  <authored-date>2008-11-02T06:06:30-08:00</authored-date>
  <message>Abstracted config and installation to make it a bit more simpler

- Make sure you copy config/example/app_config.yml to config/ (for
  current users)!</message>
  <tree>1a1a9178009dc5a2b83a62ef9a57c8a8a6e7a260</tree>
  <committer>
    <name>jamesu</name>
    <email>jamesu@gmail.com</email>
  </committer>
</commit>
