summaryrefslogtreecommitdiff
path: root/config/deploy
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2013-07-26 09:25:54 -0700
committermo khan <mo@mokhan.ca>2013-07-26 09:25:54 -0700
commit6dead347a06849a67e87dfdb36ca63efc05e7024 (patch)
tree1831f47cccdc06efc59b6765e901846f7ffde3d4 /config/deploy
parent180f5486575b535de3f56d0a124c95b2f2f4a621 (diff)
parentf6f238c88a0324a3ee60783479e35671b50bdf32 (diff)
Merge pull request #13 from madebyuppercut/ty
run db migrations by default
Diffstat (limited to 'config/deploy')
-rw-r--r--config/deploy/mo.rb9
-rw-r--r--config/deploy/prod.rb (renamed from config/deploy/production.rb)6
-rw-r--r--config/deploy/qa.rb1
3 files changed, 5 insertions, 11 deletions
diff --git a/config/deploy/mo.rb b/config/deploy/mo.rb
index 7a4aa1a..8303ec5 100644
--- a/config/deploy/mo.rb
+++ b/config/deploy/mo.rb
@@ -1,8 +1 @@
-# Your HTTP server, Apache/etc
-role :web, "192.241.151.56"
-# This may be the same as your `Web` server
-role :app, "192.241.151.56"
-# This is where Rails migrations will run
-role :db, "192.241.151.56", primary: true
-
-set :branch, "mo"
+server "192.241.151.56", :web, :app, :db, primary: true
diff --git a/config/deploy/production.rb b/config/deploy/prod.rb
index b4224ee..dbf27dd 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/prod.rb
@@ -1,8 +1,8 @@
# Your HTTP server, Apache/etc
-role :web, "www.parleytool.com"
+role :web, "198.199.118.206"
# This may be the same as your `Web` server
-role :app, "www.parleytool.com"
+role :app, "198.199.118.206"
# This is where Rails migrations will run
-role :db, "www.parleytool.com", primary: true
+role :db, "198.199.118.206", primary: true
#role :db, "your slave db-server here"
diff --git a/config/deploy/qa.rb b/config/deploy/qa.rb
new file mode 100644
index 0000000..1d031f0
--- /dev/null
+++ b/config/deploy/qa.rb
@@ -0,0 +1 @@
+server "192.241.204.27", :web, :app, :db, primary: true