@@ -17,11 +17,14 @@ class BackupFu erb_config = ERB.new(raw_config).result fu_conf = YAML.load(erb_config) @fu_conf = fu_conf[RAILS_ENV].symbolize_keys - - @s3_conf = YAML.load_file(File.join(RAILS_ROOT, 'config', 'amazon_s3.yml'))[RAILS_ENV].symbolize_keys - @fu_conf[:s3_bucket] ||= @s3_conf[:bucket_name] - @fu_conf[:aws_access_key_id] ||= @s3_conf[:access_key_id] - @fu_conf[:aws_secret_access_key] ||= @s3_conf[:secret_access_key] + + s3_config_file = File.join( RAILS_ROOT, 'config', 'amazon_s3.yml' ) + s3_conf = if File.exists?( s3_config_file ) + YAML.load_file( s3_config_file )[RAILS_ENV].symbolize_keys + @fu_conf[:s3_bucket] ||= s3_conf[:bucket_name] + @fu_conf[:aws_access_key_id] ||= s3_conf[:access_key_id] + @fu_conf[:aws_secret_access_key] ||= s3_conf[:secret_access_key] + end @fu_conf[:mysqldump_options] ||= '--complete-insert --skip-extended-insert' @verbose = !@fu_conf[:verbose].nil? lib/backup_fu.rb 10b65aebf6b73e83b707b851cc53951f8c5dfeb1 Dave Woodward dave@futuremint.com http://github.com/futuremint/backup_fu/commit/4c0672103382b1c9c3ee8f303871f4913a52de54 4c0672103382b1c9c3ee8f303871f4913a52de54 2009-10-13T14:20:59-07:00 2009-10-13T14:20:59-07:00 Ignoring amazon_s3.yml file if it doesn't exist as its redundant with some backup.yml fields. 6d710203b3af70ae81245fe0425a92baba5d2500 Dave Woodward dave@futuremint.com