allow for network checks to be skips in setup while testing using SKIP_NETWORK_CHECKS=1

This commit is contained in:
Joshua Tauberer 2014-07-29 19:09:08 -04:00
parent 6619239280
commit c74bef12d2
2 changed files with 4 additions and 1 deletions

1
Vagrantfile vendored
View File

@ -22,6 +22,7 @@ Vagrant.configure("2") do |config|
export PUBLIC_IPV6=auto
export PRIMARY_HOSTNAME=auto-easy
export CSR_COUNTRY=US
#export SKIP_NETWORK_CHECKS=1
# Start the setup script.
cd /vagrant

View File

@ -178,7 +178,9 @@ if [ "$PRIMARY_HOSTNAME" = "auto-easy" ]; then
fi
# Run some network checks to make sure setup on this machine makes sense.
. setup/network-checks.sh
if [ -z "$SKIP_NETWORK_CHECKS" ]; then
. setup/network-checks.sh
fi
# Create the user named "user-data" and store all persistent user
# data (mailboxes, etc.) in that user's home directory.