Commit 3fdcbe54 authored by Joshua Tauberer's avatar Joshua Tauberer

don't ask the user to create an email account if the shell is non-interactive...

don't ask the user to create an email account if the shell is non-interactive and provide a better default for the domain name
parent 89bb5da9
...@@ -62,14 +62,15 @@ EOF ...@@ -62,14 +62,15 @@ EOF
. scripts/web.sh . scripts/web.sh
. scripts/webmail.sh . scripts/webmail.sh
if [ -t 0 ]; then # are we in an interactive shell?
if [ -z "`tools/mail.py user`" ]; then if [ -z "`tools/mail.py user`" ]; then
# The outut of "tools/mail.py user" is a list of mail users. If there # The outut of "tools/mail.py user" is a list of mail users. If there
# are none configured, ask the user to configure one. # are none configured, ask the user to configure one.
echo echo
echo "Let's create your first mail user." echo "Let's create your first mail user."
read -e -i "user@`hostname`" -p "Email Address: " EMAIL_ADDR read -e -i "user@$PUBLIC_HOSTNAME" -p "Email Address: " EMAIL_ADDR
tools/mail.py user add $EMAIL_ADDR # will ask for password tools/mail.py user add $EMAIL_ADDR # will ask for password
tools/mail.py alias add hostmaster@$PUBLIC_HOSTNAME $EMAIL_ADDR tools/mail.py alias add hostmaster@$PUBLIC_HOSTNAME $EMAIL_ADDR
tools/mail.py alias add postmaster@$PUBLIC_HOSTNAME $EMAIL_ADDR tools/mail.py alias add postmaster@$PUBLIC_HOSTNAME $EMAIL_ADDR
fi fi
fi
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