write configuration info to /etc/mailinabox.conf; other cleanup

This commit is contained in:
Joshua Tauberer 2013-08-31 14:46:10 +00:00
parent 2d8ee99393
commit 981d162f19
3 changed files with 7 additions and 3 deletions

View file

@ -10,6 +10,6 @@ if [ -z "$EMAIL_PW" ]; then
read -e -p "Email Password: " EMAIL_PW
fi
echo "INSERT INTO users (email, password) VALUES ('$EMAIL_ADDR', '`sudo doveadm pw -s SHA512-CRYPT -p $EMAIL_PW`');" \
echo "INSERT INTO users (email, password) VALUES ('$EMAIL_ADDR', '`doveadm pw -s SHA512-CRYPT -p $EMAIL_PW`');" \
| sqlite3 $STORAGE_ROOT/mail/users.sqlite

View file

@ -17,6 +17,7 @@ if [ -z "$PUBLIC_HOSTNAME" ]; then
echo "We've guessed a value. Just backspace it if it's wrong."
echo "Josh uses box.occams.info as his hostname. Yours should"
echo "be similar."
echo
read -e -i "`hostname`" -p "Hostname: " PUBLIC_HOSTNAME
fi
@ -25,6 +26,7 @@ if [ -z "$PUBLIC_IP" ]; then
echo "Enter the public IP address of this machine, as given to"
echo "you by your ISP. We've guessed a value, but just backspace"
echo "it if it's wrong."
echo
read -e -i "`hostname -i`" -p "Public IP: " PUBLIC_IP
fi
@ -34,6 +36,10 @@ if [ -z "$STORAGE_ROOT" ]; then
mkdir -p $STORAGE_ROOT
fi
cat > /etc/mailinabox.conf << EOF;
STORAGE_ROOT=$STORAGE_ROOT
EOF
. scripts/system.sh
. scripts/dns.sh
. scripts/mail.sh

View file

@ -20,5 +20,3 @@ if [ -z "$DISABLE_FIREWALL" ]; then
ufw --force enable;
fi