fix:error dlg

[pettanr/pettanr.git] / config / environments / production.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
index a063e94..7d4ebc2 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,7 +1,6 @@
-#require 'RMagick'
-require 'DMagick'
 Pettanr::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
+config.assets.precompile += %w( *.css *.js )
 
   # Code is not reloaded between requests
   config.cache_classes = true
@@ -11,7 +10,10 @@ Pettanr::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+
+# assets files can't find at production mode
+# http://blog.livedoor.jp/maru_tak/archives/51247889.html
+#config.serve_static_assets = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
@@ -59,18 +61,6 @@ Pettanr::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-end
-require 'aws/s3'
-require 'yaml'
-
-y = YAML.load(open(Rails.root + 'config/aws.yaml').read)
-AWS::S3::Base.establish_connection!(
-  :access_key_id => y["access_key_id"], 
-  :secret_access_key => y["secret_access_key"]
-)
-require 's3_picture'
-PictureIO.setup do |config|
-  config.original_picture_io = PictureIO::S3Picture.new 'pettanr-original'
-  config.resource_picture_io = PictureIO::S3Picture.new 'pettanr-stable'
-  config.system_picture_io = PictureIO::S3Picture.new  'pettanr-system'
+config.eager_load = true
+config.active_record.migration_error = :page_load
 end