DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Guillaume Lazzara 2016-06-07 10:34:19 +02:00
commit 11f1c68116
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/uploaders/cerfa_uploader.rb
View file

@ -19,7 +19,11 @@ class CerfaUploader < CarrierWave::Uploader::Base
end end
def cache_dir def cache_dir
'/tmp/tps-cache' if Rails.env.production?
'/tmp/tps-cache'
else
'/tmp/tps-dev-cache'
end
end end
# Add a white list of extensions which are allowed to be uploaded. # Add a white list of extensions which are allowed to be uploaded.

6
app/uploaders/piece_justificative_uploader.rb
View file

@ -19,7 +19,11 @@ class PieceJustificativeUploader < CarrierWave::Uploader::Base
end end
def cache_dir def cache_dir
'/tmp/tps-cache' if Rails.env.production?
'/tmp/tps-cache'
else
'/tmp/tps-dev-cache'
end
end end
# Add a white list of extensions which are allowed to be uploaded. # Add a white list of extensions which are allowed to be uploaded.

6
app/uploaders/procedure_logo_uploader.rb
View file

@ -22,7 +22,11 @@ class ProcedureLogoUploader < CarrierWave::Uploader::Base
end end
def cache_dir def cache_dir
'/tmp/tps-cache' if Rails.env.production?
'/tmp/tps-cache'
else
'/tmp/tps-dev-cache'
end
end end
# Add a white list of extensions which are allowed to be uploaded. # Add a white list of extensions which are allowed to be uploaded.

3
config/deploy.rb
View file

@ -63,6 +63,7 @@ set :shared_paths, [
'public/system', 'public/system',
'public/uploads', 'public/uploads',
'config/database.yml', 'config/database.yml',
"config/fog_credentials.yml",
'config/initializers/secret_token.rb', 'config/initializers/secret_token.rb',
"config/environments/#{ENV['to']}.rb", "config/environments/#{ENV['to']}.rb",
"config/initializers/token.rb", "config/initializers/token.rb",
@ -132,7 +133,7 @@ task :deploy => :environment do
to :launch do to :launch do
queue "/etc/init.d/#{user} upgrade " queue "/etc/init.d/#{user} upgrade "
queue "cd #{deploy_to}/#{current_path}/" queue "cd #{deploy_to}/#{current_path}/"
queue "bundle exec rake db:seed RAILS_ENV=#{rails_env}" queue "bundle exec rake db:seed RAILS_ENV=#{rails_env}"
queue %[echo "-----> Rake Seeding Completed."] queue %[echo "-----> Rake Seeding Completed."]