external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-19 18:17:22 +01:00
Code Issues Releases Wiki Activity

add comments to the new get_default_hostname etc. functions, and simplify the logic in the Vagrantfile and start.sh so that we always call into the same two functions

Browse Source
This commit is contained in:
Joshua Tauberer
2014-06-07 14:55:57 -04:00
parent 43ef49c737
commit b60ca25e53
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup/start.sh
View File

@@ -71,18 +71,13 @@ fi
# Automatic configuration, e.g. as used in our Vagrant configuration.
if [ "$PUBLIC_IP" == "auto" ]; then
# Assume `get_publicip_from_dns` gives the correct public IP address for the machine.
PUBLIC_IP=`get_publicip_from_dns`
echo "IP Address: $PUBLIC_IP"
fi
if [ "$PUBLIC_IP" == "auto-web" ]; then
# Use a public API to get our public IP address.
PUBLIC_IP=`get_publicip_from_web_service`
PUBLIC_IP=`get_default_publicip`
echo "IP Address: $PUBLIC_IP"
fi
if [ "$PUBLIC_HOSTNAME" == "auto-easy" ]; then
# Generate a probably-unique subdomain under our justtesting.email domain.
PUBLIC_HOSTNAME=m`get_publicip_from_dns | sha1sum | cut -c1-5`.justtesting.email
PUBLIC_HOSTNAME=m`get_default_publicip | sha1sum | cut -c1-5`.justtesting.email
echo "Public Hostname: $PUBLIC_HOSTNAME"
fi