diff options
| author | Luc Donnet | 2014-01-23 10:23:00 +0100 |
|---|---|---|
| committer | Luc Donnet | 2014-01-23 10:23:00 +0100 |
| commit | 7f1678dd84d533dddffa4c6645685c3eb398f12b (patch) | |
| tree | 78871dc5aa58cca7bf6214afd63efb3f2d21cfc4 | |
| parent | 580e0973f773048390236f03219b2d21800eec3a (diff) | |
| download | chouette-core-7f1678dd84d533dddffa4c6645685c3eb398f12b.tar.bz2 | |
Update configuration for capistrano unstable
| -rw-r--r-- | config/deploy.rb | 7 | ||||
| -rw-r--r-- | config/deploy/production.rb | 3 | ||||
| -rw-r--r-- | config/deploy/unstable.rb | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index 3ef80bc8a..c3dbb5db5 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -3,7 +3,6 @@ require './config/boot' set :stages, %w(sandbox unstable staging production) set :application, "chouette2" -set :user, "mflorisson" set :scm, :git set :repository, "https://github.com/afimb/chouette2.git" set :deploy_to, "/var/www/chouette2" @@ -13,6 +12,12 @@ set :group_writable, true set :rake, "bundle exec rake" set :keep_releases, 4 set :rails_env, "production" #added for delayed job +set :user, "mflorisson" +set :deploy_via, :copy +set :copy_via, :scp +set :copy_exclude, ".git/*" +ssh_options[:forward_agent] = true +ssh_options[:keys] = [File.join(ENV["HOME"], ".ssh", "id_rsa")] after "deploy:update", "deploy:cleanup", "deploy:group_writable" after "deploy:update_code", "deploy:symlink_shared", "deploy:chouette_command", "deploy:gems" diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 43a1351cb..d342580f4 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,5 +1,2 @@ server "chouette.cityway.fr", :app, :web, :db, :primary => true -set :copy_exclude, ".git/*" set :branch, "V2_1_0" -ssh_options[:forward_agent] = true -ssh_options[:keys] = [File.join(ENV["HOME"], ".ssh", "id_rsa")] diff --git a/config/deploy/unstable.rb b/config/deploy/unstable.rb index 1eecaf323..82b4724db 100644 --- a/config/deploy/unstable.rb +++ b/config/deploy/unstable.rb @@ -1 +1,2 @@ -server "chouette-int.cityway.fr", :app, :web, :db, :primary => true +server "chouette-p.aix.cityway.fr", :app, :web, :db, :primary => true +set :branch, "master" |