config/config.example.yml lib/tasks/heroku.rake @@ -1,10 +1,12 @@ .DS_Store -/log/*.log /tmp/**/* +/log/* +*.log /tmp/restart.txt +/config/amazon_s3.yml +/config/config.yml /config/database.yml /config/smtp.yml -/config/amazon_s3.yml /config/deploy.rb /db/*.sqlite3 /public/avatars/* .gitignore @@ -1,12 +1,12 @@ class Mailer < ActionMailer::Base - default_url_options[:host] = DOMAIN + default_url_options[:host] = CONFIG['domain'].gsub('http://', '').gsub('https://', '') def subscription(subscribers, topic, post) subject "New post in #{topic}" - recipients MAILER + recipients CONFIG['mailer'] bcc subscribers.map(&:email).join(', ') - from MAILER + from CONFIG['mailer'] sent_on Time.now.utc body :topic => topic, :post => post end app/models/mailer.rb @@ -2,19 +2,16 @@ development: adapter: sqlite3 database: db/development.sqlite3 timeout: 5000 - domain: example.com - mailer: Example <noreply@example.com> - session_key: eldorado_development - session_secret: YrDOFOmYJyFg2tTZykCbZjWYQUbKBt + # adapter: mysql + # database: eldorado_development + # username: + # password: + # host: localhost test: adapter: sqlite3 database: db/test.sqlite3 timeout: 5000 - domain: example.com - mailer: Example <noreply@example.com> - session_key: eldorado_test - session_secret: Pl8qJNFc8mo1yt1xtHOmfUGHOPEutu production: adapter: @@ -22,7 +19,3 @@ production: username: password: host: - domain: - mailer: - session_key: - secret: config/database.example.yml @@ -13,7 +13,7 @@ role :web, "000.00.00.000" role :db, "000.00.00.000", :primary => true before 'deploy:update_code', 'deploy:web:disable' -after 'deploy:update_code', 'deploy:config_database' +after 'deploy:update_code', 'deploy:upload_config_files' after 'deploy:update_code', 'deploy:create_symlinks' after 'deploy:restart', 'deploy:cleanup' after 'deploy:restart', 'deploy:web:enable' @@ -22,10 +22,12 @@ namespace :deploy do task :restart, :roles => :app do run "touch #{current_path}/tmp/restart.txt" end - task :config_database do + task :upload_config_files do + put(File.read('config/config.yml'), "#{release_path}/config/config.yml", :mode => 0444) put(File.read('config/database.yml'), "#{release_path}/config/database.yml", :mode => 0444) - # For security consider uploading a production-only database.yml to your server and using this instead: - # run "cp #{shared_path}/config/database.yml #{release_path}/config/database.yml" + # For security consider uploading a production-only configs to your server and using this instead: + # run "ln -nfs #{shared_path}/config/config.yml #{release_path}/config/config.yml" + # run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" end task :create_symlinks do require 'yaml' config/deploy.example.rb @@ -9,16 +9,12 @@ Rails::Initializer.run do |config| config.i18n.default_locale = :en config.active_record.partial_updates = true config.frameworks -= [ :active_resource ] - # config.gem 'fiveruns_tuneup' - # The session_key and secret (for verifying session data integrity) are set in config/database.yml - CONFIG = YAML.load_file('config/database.yml')[RAILS_ENV] + CONFIG = (YAML.load_file('config/config.yml')[RAILS_ENV] rescue {}).merge(ENV) # support yaml and heroku config + config.action_controller.session = { :key => CONFIG['session_key'], - :secret => CONFIG['session_secret'] || CONFIG['secret'] # TODO deprecate 'secret' + :secret => CONFIG['session_secret'] } - - MAILER = CONFIG['mailer'] || 'noreply@example.com' # TODO require in config - DOMAIN = CONFIG['domain'] || 'example.com' # TODO require in config - + end config/environment.rb config/smtp.example.yml d3bba5b6322646db684cde2c9e3b3e9e3cd56ae0 Trevor Turk trevorturk@yahoo.com http://github.com/trevorturk/eldorado/commit/8af62d1875ec1091ef1202c3f8c6c58c932076d7 8af62d1875ec1091ef1202c3f8c6c58c932076d7 2009-06-23T19:45:46-07:00 2009-06-23T19:45:46-07:00 config/database.yml->config/config.yml, working on heroku compatibility 094cac4081b1925ce2ffc50b249b39f1efece130 Trevor Turk trevorturk@yahoo.com