github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use delayed_job by default on bushi.do

Browse Source
This commit is contained in:
did 2011-04-28 17:17:15 +02:00
parent a01e204d29
commit 820d55a83c
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/initializers/locomotive.rb
View File

@ -38,9 +38,11 @@ Locomotive.configure do |config|
# :password => '<your_heroku_password>' # :password => '<your_heroku_password>'
# } # }
# Locomotive uses the DelayedJob gem for the theme import module. # Locomotive uses the DelayedJob gem for the site import module.
# In case you want to deploy to Heroku, you will have to pay for an extra dyno. # In case you want to deploy to Heroku, you will have to pay for an extra dyno.
# If you do not mind about importing theme without DelayedJob, disable it. # If you do not mind about importing theme without DelayedJob, disable it.
#
# Warning: this option is not used if you deploy on bushi.do and we set automatically the value to true.
config.delayed_job = false config.delayed_job = false
# configure how many items we display in sub menu in the "Contents" section. # configure how many items we display in sub menu in the "Contents" section.

4
lib/generators/locomotive/install/templates/locomotive.rb
View File

@ -36,9 +36,11 @@ Locomotive.configure do |config|
# :password => '<your_heroku_password>' # :password => '<your_heroku_password>'
# } # }
# Locomotive uses the DelayedJob gem for the theme import module. # Locomotive uses the DelayedJob gem for the site import module.
# In case you want to deploy to Heroku, you will have to pay for an extra dyno. # In case you want to deploy to Heroku, you will have to pay for an extra dyno.
# If you do not mind about importing theme without DelayedJob, disable it. # If you do not mind about importing theme without DelayedJob, disable it.
#
# Warning: this option is not used if you deploy on bushi.do and we set automatically the value to true.
config.delayed_job = false config.delayed_job = false
# configure how many items we display in sub menu in the "Contents" section. # configure how many items we display in sub menu in the "Contents" section.

2
lib/locomotive/configuration.rb
View File

@ -11,7 +11,7 @@ module Locomotive
:cookie_key => '_locomotive_session', :cookie_key => '_locomotive_session',
:enable_logs => false, :enable_logs => false,
:hosting => :auto, :hosting => :auto,
:delayed_job => true, :delayed_job => false,
:default_locale => :en, :default_locale => :en,
:mailer_sender => 'support', #support@example.com' :mailer_sender => 'support', #support@example.com'
:manage_subdomain => false, :manage_subdomain => false,

2
lib/locomotive/hosting/bushido.rb
View File

@ -29,6 +29,8 @@ module Locomotive
self.setup_smtp_settings self.setup_smtp_settings
self.config.delayed_job = true # force the use of delayed_job
self.bushido_domains = ::Bushido::App.domains self.bushido_domains = ::Bushido::App.domains
self.bushido_subdomain = ::Bushido::App.subdomain self.bushido_subdomain = ::Bushido::App.subdomain
end end