diff --git a/Vagrantfile b/Vagrantfile index 8a9098b..5c1ebd0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -22,14 +22,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| if distro == "precise64" config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box" - config.vm.provision "shell", path: "vagrant/ubuntu.sh" elsif distro == "trusty64" config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" - config.vm.provision "shell", path: "vagrant/ubuntu.sh" elsif distro == "centos6.5" config.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box" - config.vm.provision "shell", path: "vagrant/centos.sh" end + + config.vm.provision "shell", keep_color: true, path: 'vagrant/bootstrap.sh' config.vm.provision "shell", privileged: false, keep_color: true, path: "vagrant/provision.sh" config.vm.network :forwarded_port, guest: 8000, host: 8000 # Colab (runserver) diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh new file mode 100644 index 0000000..62fac13 --- /dev/null +++ b/vagrant/bootstrap.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +if [ -d /vagrant/colab ]; then + basedir=/vagrant/colab +else + basedir=/vagrant +fi + +# very simple OS detection +if [ -x /usr/bin/apt-get ]; then + exec sh $basedir/vagrant/ubuntu.sh +fi +if [ -x /usr/bin/yum ]; then + exec sh $basedir/vagrant/centos.sh +fi -- libgit2 0.21.2