Merge commit 'b0d6473c3c6748a68f4845324fee13f3153bc18f' into usedialog

Conflicts:
	setup/start.sh (changes are in questions.sh now)

conf/nginx-top.conf

@@ -1,6 +1,10 @@
 ## NOTE: This file is automatically generated by Mail-in-a-Box.
-##       Do not edit this file. It will be replaced each time
+##       Do not edit this file. It is continually updated by
-##       Mail-in-a-Box needs to update the web configuration.
+##       Mail-in-a-Box and your changes will be lost.
+##
+##       Mail-in-a-Box machines are not meant to be modified.
+##       If you modify any system configuration you are on
+##       your own --- please do not ask for help from us.
 
 upstream php-fpm {
 	server unix:/var/run/php5-fpm.sock;

setup/management.sh

@@ -2,7 +2,7 @@
 
 source setup/functions.sh
 
-apt_install python3-flask links duplicity libyaml-dev python3-dnspython unattended-upgrades
+apt_install python3-flask links duplicity libyaml-dev python3-dnspython
 hide_output pip3 install rtyaml
 
 # Create a backup directory and a random key for encrypting backups.
@@ -21,14 +21,6 @@ rm -f /etc/init.d/mailinabox
 ln -s $(pwd)/conf/management-initscript /etc/init.d/mailinabox
 hide_output update-rc.d mailinabox defaults
 
-# Allow apt to install system updates automatically every day.
-cat > /etc/apt/apt.conf.d/02periodic <<EOF;
-APT::Periodic::MaxAge "7";
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Unattended-Upgrade "1";
-APT::Periodic::Verbose "1";
-EOF
-
 # Perform a daily backup.
 cat > /etc/cron.daily/mailinabox-backup << EOF;
 #!/bin/bash

setup/questions.sh

@@ -14,6 +14,12 @@ fi
 # The box needs a name.
 if [ -z "$PRIMARY_HOSTNAME" ]; then
 	if [ -z "$DEFAULT_PRIMARY_HOSTNAME" ]; then
+		# We recommend to use box.example.com as this hosts name. The
+		# domain the user possibly wants to use is example.com then.
+		# We strip the string "box." from the hostname to get the mail
+		# domain. If the hostname differs, nothing happens here.
+		DEFAULT_DOMAIN_GUESS=$(echo $(get_default_hostname) | sed -e 's/^box\.//')
+
 		# This is the first run. Ask the user for his email address so we can
 		# provide the best default for the box's hostname.
 		input_box "Your Email Address" \
@@ -25,7 +31,7 @@ or subdomains you control).
 \n\nWe've guessed an email address. Backspace it and type in what
 you really want.
 \n\nEmail Address:" \
-			me@`get_default_hostname` \
+			"me@$DEFAULT_DOMAIN_GUESS" \
 			EMAIL_ADDR
 
 		if [ -z "$EMAIL_ADDR" ]; then

setup/system.sh

@@ -11,18 +11,22 @@ hide_output apt-get -y upgrade
 #	haveged: Provides extra entropy to /dev/random so it doesn't stall
 #	         when generating random numbers for private keys (e.g. during
 #	         ldns-keygen).
-
+#	unattended-upgrades: Apt tool to install security updates automatically.
-apt_install python3 python3-pip wget curl bind9-host haveged
-
-# Turn on basic services:
-#
 #   	ntp: keeps the system time correct
-#
 #   	fail2ban: scans log files for repeated failed login attempts and blocks the remote IP at the firewall
-#
-# These services don't need further configuration and are started immediately after installation.
 
-apt_install ntp fail2ban
+apt_install python3 python3-pip \
+	wget curl bind9-host \
+	haveged unattended-upgrades ntp fail2ban
+
+# Allow apt to install system updates automatically every day.
+
+cat > /etc/apt/apt.conf.d/02periodic <<EOF;
+APT::Periodic::MaxAge "7";
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Unattended-Upgrade "1";
+APT::Periodic::Verbose "1";
+EOF
 
 if [ -z "$DISABLE_FIREWALL" ]; then
 	# Turn on the firewall. First allow incoming SSH, then turn on the firewall.

setup/zpush.sh

@@ -41,7 +41,7 @@ if [ $needs_update == 1 ]; then
 fi
 
 # Configure default config.
-sed -i "s/define('TIMEZONE', .*/define('TIMEZONE', 'Etc\/UTC');/" /usr/local/lib/z-push/config.php
+sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/config.php
 sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php
 
 # Configure BACKEND