Commit 981d162f authored by Joshua Tauberer's avatar Joshua Tauberer

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

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