From be1b51a88d30170d1ffb38c41d043fd0ff90772d Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Fri, 2 Jan 2015 16:28:56 -0500 Subject: [PATCH] Minor deployment fixes --- Vagrantfile | 5 +++++ scripts/website_push.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 101ce30d8c..424a618e00 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -49,7 +49,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define '64bit' do |n1| n1.vm.box = 'chef/ubuntu-10.04' end + config.vm.define '32bit' do |n2| n2.vm.box = 'chef/ubuntu-10.04-i386' end + + config.push.define "www", strategy: "local-exec" do |push| + push.script = "scripts/website_push.sh" + end end diff --git a/scripts/website_push.sh b/scripts/website_push.sh index fafcbd70c1..1371eebb6b 100755 --- a/scripts/website_push.sh +++ b/scripts/website_push.sh @@ -8,5 +8,10 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" # Change into that directory cd $DIR +# Add the git remote if it doesn't exist +git remote | grep heroku || { + git remote add heroku git@heroku.com:consul-www.git +} + # Push the subtree (force) git push heroku `git subtree split --prefix website master`:master --force