Minor deployment fixes

This commit is contained in:
Seth Vargo 2015-01-02 16:28:56 -05:00
parent 8015854a74
commit be1b51a88d
2 changed files with 10 additions and 0 deletions

5
Vagrantfile vendored
View File

@ -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

View File

@ -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