Commit 61105b1e authored by wsteitz's avatar wsteitz Committed by Joshua Tauberer

remove all references to justtesting.email (#1003) (#1005)

parent b6f90e10
...@@ -15,13 +15,11 @@ Vagrant.configure("2") do |config| ...@@ -15,13 +15,11 @@ Vagrant.configure("2") do |config|
config.vm.provision :shell, :inline => <<-SH config.vm.provision :shell, :inline => <<-SH
# Set environment variables so that the setup script does # Set environment variables so that the setup script does
# not ask any questions during provisioning. We'll let the # not ask any questions during provisioning. We'll let the
# machine figure out its own public IP and it'll take a # machine figure out its own public IP.
# subdomain on our justtesting.email domain so we can get
# started quickly.
export NONINTERACTIVE=1 export NONINTERACTIVE=1
export PUBLIC_IP=auto export PUBLIC_IP=auto
export PUBLIC_IPV6=auto export PUBLIC_IPV6=auto
export PRIMARY_HOSTNAME=auto-easy export PRIMARY_HOSTNAME=auto
#export SKIP_NETWORK_CHECKS=1 #export SKIP_NETWORK_CHECKS=1
# Start the setup script. # Start the setup script.
......
...@@ -180,9 +180,6 @@ if [ "$PUBLIC_IPV6" = "auto" ]; then ...@@ -180,9 +180,6 @@ if [ "$PUBLIC_IPV6" = "auto" ]; then
fi fi
if [ "$PRIMARY_HOSTNAME" = "auto" ]; then if [ "$PRIMARY_HOSTNAME" = "auto" ]; then
PRIMARY_HOSTNAME=$(get_default_hostname) PRIMARY_HOSTNAME=$(get_default_hostname)
elif [ "$PRIMARY_HOSTNAME" = "auto-easy" ]; then
# Generate a probably-unique subdomain under our justtesting.email domain.
PRIMARY_HOSTNAME=`echo $PUBLIC_IP | sha1sum | cut -c1-5`.justtesting.email
fi fi
# Set STORAGE_USER and STORAGE_ROOT to default values (user-data and /home/user-data), unless # Set STORAGE_USER and STORAGE_ROOT to default values (user-data and /home/user-data), unless
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment