aboutsummaryrefslogtreecommitdiffstats
path: root/config/deploy
diff options
context:
space:
mode:
authorMichel Etienne2014-11-13 17:05:49 +0100
committerMichel Etienne2014-11-13 17:05:49 +0100
commitab46893445585fcd2ebee469c8c2065cecd5963d (patch)
treed414b0c0a5865501b6dc57d94f20f1305435463d /config/deploy
parent0350755d84ca7c19398799f48914cd1ae2ede23d (diff)
parentfbd4c5a9de723136d78c1e8cd37598fc465f1be4 (diff)
downloadchouette-core-ab46893445585fcd2ebee469c8c2065cecd5963d.tar.bz2
Merge branch 'sismo' into gtfs_v2
Diffstat (limited to 'config/deploy')
-rw-r--r--config/deploy/sismo.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/deploy/sismo.rb b/config/deploy/sismo.rb
new file mode 100644
index 000000000..a8cb59006
--- /dev/null
+++ b/config/deploy/sismo.rb
@@ -0,0 +1,2 @@
+server "chouette-sismo.marseille.cityway.fr", :app, :web, :db, :primary => true
+set :branch, "V2_5"