mirror of
https://github.com/openSUSE/osem.git
synced 2026-08-13 19:54:02 +00:00
Update rails to address CVE-2014-3514. Fix the deployment
This commit is contained in:
parent
3581edf58c
commit
f2bbb68ad9
3 changed files with 32 additions and 27 deletions
3
Gemfile
3
Gemfile
|
|
@ -102,6 +102,9 @@ gem 'activeuuid'
|
|||
# We use whenever for recurring jobs
|
||||
gem 'whenever', :require => false
|
||||
|
||||
# We use daemons to run scripts
|
||||
gem 'daemons'
|
||||
|
||||
# Use guard and spring for testing in development
|
||||
group :development do
|
||||
# rspec Guard rules
|
||||
|
|
|
|||
52
Gemfile.lock
52
Gemfile.lock
|
|
@ -1,29 +1,29 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
actionmailer (4.1.5)
|
||||
actionpack (= 4.1.5)
|
||||
actionview (= 4.1.5)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
actionpack (4.1.5)
|
||||
actionview (= 4.1.5)
|
||||
activesupport (= 4.1.5)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
actionview (4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
actionview (4.1.5)
|
||||
activesupport (= 4.1.5)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
active_model_serializers (0.8.1)
|
||||
activemodel (>= 3.0)
|
||||
activemodel (4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
activemodel (4.1.5)
|
||||
activesupport (= 4.1.5)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.4)
|
||||
activemodel (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
activerecord (4.1.5)
|
||||
activemodel (= 4.1.5)
|
||||
activesupport (= 4.1.5)
|
||||
arel (~> 5.0.0)
|
||||
activesupport (4.1.4)
|
||||
activesupport (4.1.5)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
|
|
@ -104,6 +104,7 @@ GEM
|
|||
thor
|
||||
d3_rails (3.4.6)
|
||||
railties (>= 3.1.0)
|
||||
daemons (1.1.9)
|
||||
database_cleaner (1.3.0)
|
||||
debugger-linecache (1.2.0)
|
||||
delayed_job (4.0.2)
|
||||
|
|
@ -267,21 +268,21 @@ GEM
|
|||
ruby-openid (>= 2.1.8)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.1.4)
|
||||
actionmailer (= 4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
activemodel (= 4.1.4)
|
||||
activerecord (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
rails (4.1.5)
|
||||
actionmailer (= 4.1.5)
|
||||
actionpack (= 4.1.5)
|
||||
actionview (= 4.1.5)
|
||||
activemodel (= 4.1.5)
|
||||
activerecord (= 4.1.5)
|
||||
activesupport (= 4.1.5)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.1.4)
|
||||
railties (= 4.1.5)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-observers (0.1.2)
|
||||
activemodel (~> 4.0)
|
||||
railties (4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
railties (4.1.5)
|
||||
actionpack (= 4.1.5)
|
||||
activesupport (= 4.1.5)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.0.0)
|
||||
|
|
@ -417,6 +418,7 @@ DEPENDENCIES
|
|||
cocoon
|
||||
coveralls
|
||||
d3_rails
|
||||
daemons
|
||||
database_cleaner
|
||||
delayed_job_active_record
|
||||
devise
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ end
|
|||
desc 'Deploys the current version to the server.'
|
||||
task deploy: :environment do
|
||||
to :prepare do
|
||||
queue "cd #{deploy_to}/current && RAILS_ENV=production script/delayed_job stop"
|
||||
queue "cd #{deploy_to}/current && RAILS_ENV=production bin/delayed_job stop"
|
||||
end
|
||||
|
||||
deploy do
|
||||
|
|
@ -42,7 +42,7 @@ task deploy: :environment do
|
|||
|
||||
to :launch do
|
||||
queue "sudo /etc/init.d/apache2 restart"
|
||||
queue "cd #{deploy_to}/current && RAILS_ENV=production script/delayed_job start"
|
||||
queue "cd #{deploy_to}/current && RAILS_ENV=production bin/delayed_job start"
|
||||
end
|
||||
|
||||
invoke :'deploy:cleanup'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue