From e6eb65fbd5492f703fc121d6e971ccbb9861a331 Mon Sep 17 00:00:00 2001 From: Robert Hafner Date: Wed, 4 Dec 2013 21:57:51 -0800 Subject: [PATCH] Shuffled testing scripts out of Vagrant folder and into their own space. --- tests/{vagrant => resources/Scripts}/Postfix.sh | 0 tests/{vagrant => resources/Scripts}/Provision.sh | 2 +- tests/{vagrant => resources/Scripts}/ResetMail.sh | 0 tests/vagrant/Initialize.sh | 3 +++ tests/vagrant/Vagrantfile | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) rename tests/{vagrant => resources/Scripts}/Postfix.sh (100%) rename tests/{vagrant => resources/Scripts}/Provision.sh (94%) rename tests/{vagrant => resources/Scripts}/ResetMail.sh (100%) create mode 100644 tests/vagrant/Initialize.sh diff --git a/tests/vagrant/Postfix.sh b/tests/resources/Scripts/Postfix.sh similarity index 100% rename from tests/vagrant/Postfix.sh rename to tests/resources/Scripts/Postfix.sh diff --git a/tests/vagrant/Provision.sh b/tests/resources/Scripts/Provision.sh similarity index 94% rename from tests/vagrant/Provision.sh rename to tests/resources/Scripts/Provision.sh index 550c7f5..b6f151a 100644 --- a/tests/vagrant/Provision.sh +++ b/tests/resources/Scripts/Provision.sh @@ -29,7 +29,7 @@ fi # Setup Email -/bin/bash /vagrant/ResetMail.sh +/bin/bash /resources/Scripts/ResetMail.sh echo 'Environment has been provisioned' \ No newline at end of file diff --git a/tests/vagrant/ResetMail.sh b/tests/resources/Scripts/ResetMail.sh similarity index 100% rename from tests/vagrant/ResetMail.sh rename to tests/resources/Scripts/ResetMail.sh diff --git a/tests/vagrant/Initialize.sh b/tests/vagrant/Initialize.sh new file mode 100644 index 0000000..490ca56 --- /dev/null +++ b/tests/vagrant/Initialize.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/bin/bash /resources/Scripts/Provision.sh \ No newline at end of file diff --git a/tests/vagrant/Vagrantfile b/tests/vagrant/Vagrantfile index d587227..65e7d0c 100644 --- a/tests/vagrant/Vagrantfile +++ b/tests/vagrant/Vagrantfile @@ -8,7 +8,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = "precise64" config.vm.box_url = "http://files.vagrantup.com/precise64.box" - config.vm.provision "shell", path: "Provision.sh" + config.vm.provision "shell", path: "Initialize.sh" config.vm.hostname = "tedivm.com" config.vm.network :private_network, ip: "172.31.1.2" config.vm.synced_folder "../resources", "/resources"