feat: renamed PRIMARY_HOSTNAME to BOX_HOSTNAME

using "primary" to describe the domain of the box / mail server is confusing when working with multiple domains. Usually the box domain is different from the domain you want to host your mail for.
2026-03-25 19:17:22 +01:00 · 2024-12-24 15:36:34 +01:00
parent 230a6dc7bf
commit 93d1055869
33 changed files with 235 additions and 228 deletions
--- a/setup/firstuser.sh
+++ b/setup/firstuser.sh
@@ -34,8 +34,8 @@ if [ -z "$(management/cli.py user)" ]; then
 		# But in a non-interactive shell, just make something up.
 		# This is normally for testing.
 		else
-			# Use me@PRIMARY_HOSTNAME
-			EMAIL_ADDR=me@$PRIMARY_HOSTNAME
+			# Use me@BOX_HOSTNAME
+			EMAIL_ADDR=me@$BOX_HOSTNAME
 			EMAIL_PW=12345678
 			echo
 			echo "Creating a new administrative mail account for $EMAIL_ADDR with password $EMAIL_PW."
@@ -54,5 +54,5 @@ if [ -z "$(management/cli.py user)" ]; then
 	hide_output management/cli.py user make-admin "$EMAIL_ADDR"

 	# Create an alias to which we'll direct all automatically-created administrative aliases.
-	management/cli.py alias add "administrator@$PRIMARY_HOSTNAME" "$EMAIL_ADDR" > /dev/null
+	management/cli.py alias add "administrator@$BOX_HOSTNAME" "$EMAIL_ADDR" > /dev/null
 fi
--- a/setup/mail-dovecot.sh
+++ b/setup/mail-dovecot.sh
@@ -152,7 +152,7 @@ EOF
 # Setting a `postmaster_address` is required or LMTP won't start. An alias
 # will be created automatically by our management daemon.
 tools/editconf.py /etc/dovecot/conf.d/15-lda.conf \
-	"postmaster_address=postmaster@$PRIMARY_HOSTNAME"
+	"postmaster_address=postmaster@$BOX_HOSTNAME"

 # ### Sieve

--- a/setup/mail-postfix.sh
+++ b/setup/mail-postfix.sh
@@ -57,7 +57,7 @@ tools/editconf.py /etc/postfix/main.cf \
 	inet_interfaces=all \
 	smtp_bind_address="$PRIVATE_IP" \
 	smtp_bind_address6="$PRIVATE_IPV6" \
-	myhostname="$PRIMARY_HOSTNAME"\
+	myhostname="$BOX_HOSTNAME"\
 	smtpd_banner="\$myhostname ESMTP Hi, I'm a Mail-in-a-Box (Ubuntu/Postfix; see https://mailinabox.email/)" \
 	mydestination=localhost

@@ -121,7 +121,7 @@ cp conf/postfix_outgoing_mail_header_filters /etc/postfix/outgoing_mail_header_f
 # Modify the `outgoing_mail_header_filters` file to use the local machine name and ip
 # on the first received header line.  This may help reduce the spam score of email by
 # removing the 127.0.0.1 reference.
-sed -i "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" /etc/postfix/outgoing_mail_header_filters
+sed -i "s/BOX_HOSTNAME/$BOX_HOSTNAME/" /etc/postfix/outgoing_mail_header_filters
 sed -i "s/PUBLIC_IP/$PUBLIC_IP/" /etc/postfix/outgoing_mail_header_filters

 # Enable TLS on incoming connections. It is not required on port 25, allowing for opportunistic
--- a/setup/migrate.py
+++ b/setup/migrate.py
@@ -149,36 +149,36 @@ def migration_11(env):

 def migration_12(env):
 	# Upgrading to Carddav Roundcube plugin to version 3+, it requires the carddav_*
-        # tables to be dropped.
-        # Checking that the roundcube database already exists.
-        if os.path.exists(os.path.join(env["STORAGE_ROOT"], "mail/roundcube/roundcube.sqlite")):
-            import sqlite3
-            conn = sqlite3.connect(os.path.join(env["STORAGE_ROOT"], "mail/roundcube/roundcube.sqlite"))
-            c = conn.cursor()
-            # Get a list of all the tables that begin with 'carddav_'
-            c.execute("SELECT name FROM sqlite_master WHERE type = ? AND name LIKE ?", ('table', 'carddav_%'))
-            carddav_tables = c.fetchall()
-            # If there were tables that begin with 'carddav_', drop them
-            if carddav_tables:
-                for table in carddav_tables:
-                    try:
-                        table = table[0]
-                        c = conn.cursor()
-                        dropcmd = "DROP TABLE %s" % table
-                        c.execute(dropcmd)
-                    except:
-                        print("Failed to drop table", table)
-            # Save.
-            conn.commit()
-            conn.close()
+	# tables to be dropped.
+	# Checking that the roundcube database already exists.
+	if os.path.exists(os.path.join(env["STORAGE_ROOT"], "mail/roundcube/roundcube.sqlite")):
+		import sqlite3
+		conn = sqlite3.connect(os.path.join(env["STORAGE_ROOT"], "mail/roundcube/roundcube.sqlite"))
+		c = conn.cursor()
+		# Get a list of all the tables that begin with 'carddav_'
+		c.execute("SELECT name FROM sqlite_master WHERE type = ? AND name LIKE ?", ('table', 'carddav_%'))
+		carddav_tables = c.fetchall()
+		# If there were tables that begin with 'carddav_', drop them
+		if carddav_tables:
+			for table in carddav_tables:
+				try:
+					table = table[0]
+					c = conn.cursor()
+					dropcmd = "DROP TABLE %s" % table
+					c.execute(dropcmd)
+				except:
+					print("Failed to drop table", table)
+		# Save.
+		conn.commit()
+		conn.close()

-            # Delete all sessions, requiring users to login again to recreate carddav_*
-            # databases
-            conn = sqlite3.connect(os.path.join(env["STORAGE_ROOT"], "mail/roundcube/roundcube.sqlite"))
-            c = conn.cursor()
-            c.execute("delete from session;")
-            conn.commit()
-            conn.close()
+		# Delete all sessions, requiring users to login again to recreate carddav_*
+		# databases
+		conn = sqlite3.connect(os.path.join(env["STORAGE_ROOT"], "mail/roundcube/roundcube.sqlite"))
+		c = conn.cursor()
+		c.execute("delete from session;")
+		conn.commit()
+		conn.close()

 def migration_13(env):
 	# Add the "mfa" table for configuring MFA for login to the control panel.
@@ -190,6 +190,13 @@ def migration_14(env):
 	db = os.path.join(env["STORAGE_ROOT"], 'mail/users.sqlite')
 	shell("check_call", ["sqlite3", db, "CREATE TABLE auto_aliases (id INTEGER PRIMARY KEY AUTOINCREMENT, source TEXT NOT NULL UNIQUE, destination TEXT NOT NULL, permitted_senders TEXT);"])

+def migration_15(env):
+	# Replace PRIMARY_HOSTNAME with BOX_HOSTNAME in mailinabox.conf
+	shell("check_call", ["sed", "-i", "s/PRIMARY_HOSTNAME/BOX_HOSTNAME/g", "/etc/mailinabox.conf"])
+	env["BOX_HOSTNAME"] = env.get("PRIMARY_HOSTNAME", env.get("BOX_HOSTNAME"))
+	env["PRIMARY_HOSTNAME"] = None
+	del env["PRIMARY_HOSTNAME"]
+
 ###########################################################

 def get_current_migration():
--- a/setup/munin.sh
+++ b/setup/munin.sh
@@ -24,12 +24,12 @@ includedir /etc/munin/munin-conf.d
 cgiurl_graph /admin/munin/cgi-graph

 # a simple host tree
-[$PRIMARY_HOSTNAME]
+[$BOX_HOSTNAME]
 address 127.0.0.1

 # send alerts to the following address
 contacts admin
-contact.admin.command mail -s "Munin notification \${var:host}" administrator@$PRIMARY_HOSTNAME
+contact.admin.command mail -s "Munin notification \${var:host}" administrator@$BOX_HOSTNAME
 contact.admin.always_send warning critical
 EOF

@@ -40,7 +40,7 @@ chown munin /var/log/munin/munin-cgi-graph.log
 # ensure munin-node knows the name of this machine
 # and reduce logging level to warning
 tools/editconf.py /etc/munin/munin-node.conf -s \
-	host_name="$PRIMARY_HOSTNAME" \
+	host_name="$BOX_HOSTNAME" \
 	log_level=1

 # Update the activated plugins through munin's autoconfiguration.
--- a/setup/network-checks.sh
+++ b/setup/network-checks.sh
@@ -3,15 +3,15 @@
 # the rest of the system setup so we may not yet have things installed.
 apt_get_quiet install bind9-host sed netcat-openbsd

-# Stop if the PRIMARY_HOSTNAME is listed in the Spamhaus Domain Block List.
+# Stop if the BOX_HOSTNAME is listed in the Spamhaus Domain Block List.
 # The user might have chosen a name that was previously in use by a spammer
 # and will not be able to reliably send mail. Do this after any automatic
 # choices made above.
-if host "$PRIMARY_HOSTNAME.dbl.spamhaus.org" > /dev/null; then
+if host "$BOX_HOSTNAME.dbl.spamhaus.org" > /dev/null; then
 	echo
-	echo "The hostname you chose '$PRIMARY_HOSTNAME' is listed in the"
+	echo "The hostname you chose '$BOX_HOSTNAME' is listed in the"
 	echo "Spamhaus Domain Block List. See http://www.spamhaus.org/dbl/"
-	echo "and http://www.spamhaus.org/query/domain/$PRIMARY_HOSTNAME."
+	echo "and http://www.spamhaus.org/query/domain/$BOX_HOSTNAME."
 	echo
 	echo "You will not be able to send mail using this domain name, so"
 	echo "setup cannot continue."
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -253,7 +253,7 @@ if [ ! -f "$STORAGE_ROOT/owncloud/owncloud.db" ]; then
 	mkdir -p "$STORAGE_ROOT/owncloud"

 	# Create an initial configuration file.
-	instanceid=oc$(echo "$PRIMARY_HOSTNAME" | sha1sum | fold -w 10 | head -n 1)
+	instanceid=oc$(echo "$BOX_HOSTNAME" | sha1sum | fold -w 10 | head -n 1)
 	cat > "$STORAGE_ROOT/owncloud/config.php" <<EOF;
 <?php
 \$CONFIG = array (
@@ -308,7 +308,7 @@ fi

 # Update config.php.
 # * trusted_domains is reset to localhost by autoconfig starting with ownCloud 8.1.1,
-#   so set it here. It also can change if the box's PRIMARY_HOSTNAME changes, so
+#   so set it here. It also can change if the box's BOX_HOSTNAME changes, so
 #   this will make sure it has the right value.
 # * Some settings weren't included in previous versions of Mail-in-a-Box.
 # * We need to set the timezone to the system timezone to allow fail2ban to ban
@@ -325,10 +325,10 @@ include("$STORAGE_ROOT/owncloud/config.php");

 \$CONFIG['config_is_read_only'] = false;

-\$CONFIG['trusted_domains'] = array('$PRIMARY_HOSTNAME');
+\$CONFIG['trusted_domains'] = array('$BOX_HOSTNAME');

 \$CONFIG['memcache.local'] = '\OC\Memcache\APCu';
-\$CONFIG['overwrite.cli.url'] = 'https://${PRIMARY_HOSTNAME}/cloud';
+\$CONFIG['overwrite.cli.url'] = 'https://${BOX_HOSTNAME}/cloud';

 \$CONFIG['logtimezone'] = '$TIMEZONE';
 \$CONFIG['logdateformat'] = 'Y-m-d H:i:s';
@@ -342,8 +342,8 @@ include("$STORAGE_ROOT/owncloud/config.php");
  ),
 );

-\$CONFIG['mail_domain'] = '$PRIMARY_HOSTNAME';
-\$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches the required administrator alias on mail_domain/$PRIMARY_HOSTNAME
+\$CONFIG['mail_domain'] = '$BOX_HOSTNAME';
+\$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches the required administrator alias on mail_domain/$BOX_HOSTNAME
 \$CONFIG['mail_smtpmode'] = 'sendmail';
 \$CONFIG['mail_smtpauth'] = true; # if smtpmode is smtp
 \$CONFIG['mail_smtphost'] = '127.0.0.1'; # if smtpmode is smtp
--- a/setup/questions.sh
+++ b/setup/questions.sh
@@ -26,8 +26,8 @@ if [ -z "${NONINTERACTIVE:-}" ]; then
 fi

 # The box needs a name.
-if [ -z "${PRIMARY_HOSTNAME:-}" ]; then
-	if [ -z "${DEFAULT_PRIMARY_HOSTNAME:-}" ]; then
+if [ -z "${BOX_HOSTNAME:-}" ]; then
+	if [ -z "${DEFAULT_BOX_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
@@ -66,19 +66,19 @@ you really want.

 		# Take the part after the @-sign as the user's domain name, and add
 		# 'box.' to the beginning to create a default hostname for this machine.
-		DEFAULT_PRIMARY_HOSTNAME=box.$(echo "$EMAIL_ADDR" | sed 's/.*@//')
+		DEFAULT_BOX_HOSTNAME=box.$(echo "$EMAIL_ADDR" | sed 's/.*@//')
 	fi

 	input_box "Hostname" \
 "This box needs a name, called a 'hostname'. The name will form a part of the box's web address.
 \n\nWe recommend that the name be a subdomain of the domain in your email
-address, so we're suggesting $DEFAULT_PRIMARY_HOSTNAME.
+address, so we're suggesting $DEFAULT_BOX_HOSTNAME.
 \n\nYou can change it, but we recommend you don't.
 \n\nHostname:" \
-		"$DEFAULT_PRIMARY_HOSTNAME" \
-		PRIMARY_HOSTNAME
+		"$DEFAULT_BOX_HOSTNAME" \
+		BOX_HOSTNAME

-	if [ -z "$PRIMARY_HOSTNAME" ]; then
+	if [ -z "$BOX_HOSTNAME" ]; then
 		# user hit ESC/cancel
 		exit
 	fi
@@ -181,8 +181,8 @@ if [ "$PUBLIC_IPV6" = "auto" ]; then
 	# Use a public API to get our public IPv6 address, or fall back to local network configuration.
 	PUBLIC_IPV6=$(get_publicip_from_web_service 6 || get_default_privateip 6)
 fi
-if [ "$PRIMARY_HOSTNAME" = "auto" ]; then
-	PRIMARY_HOSTNAME=$(get_default_hostname)
+if [ "$BOX_HOSTNAME" = "auto" ]; then
+	BOX_HOSTNAME=$(get_default_hostname)
 fi

 # Set STORAGE_USER and STORAGE_ROOT to default values (user-data and /home/user-data), unless
@@ -196,7 +196,7 @@ fi

 # Show the configuration, since the user may have not entered it manually.
 echo
-echo "Primary Hostname: $PRIMARY_HOSTNAME"
+echo "Box Hostname: $BOX_HOSTNAME"
 echo "Public IP Address: $PUBLIC_IP"
 if [ -n "$PUBLIC_IPV6" ]; then
 	echo "Public IPv6 Address: $PUBLIC_IPV6"
--- a/setup/spamassassin.sh
+++ b/setup/spamassassin.sh
@@ -77,42 +77,42 @@ tools/editconf.py /etc/spamassassin/local.cf -s \
 # Our custom rules are added to their own file so that an update to the deb package config
 # does not remove our changes.
 #
-# We need to escape period's in $PRIMARY_HOSTNAME since spamassassin config uses regex.
+# We need to escape period's in $BOX_HOSTNAME since spamassassin config uses regex.

-escapedprimaryhostname="${PRIMARY_HOSTNAME//./\\.}"
+escapedboxhostname="${BOX_HOSTNAME//./\\.}"

 cat > /etc/spamassassin/miab_spf_dmarc.cf << EOF
 # Evaluate DMARC Authentication-Results
-header DMARC_PASS Authentication-Results =~ /$escapedprimaryhostname; dmarc=pass/
+header DMARC_PASS Authentication-Results =~ /$escapedboxhostname; dmarc=pass/
 describe DMARC_PASS DMARC check passed
 score DMARC_PASS -0.1

-header DMARC_NONE Authentication-Results =~ /$escapedprimaryhostname; dmarc=none/
+header DMARC_NONE Authentication-Results =~ /$escapedboxhostname; dmarc=none/
 describe DMARC_NONE DMARC record not found
 score DMARC_NONE 0.1

-header DMARC_FAIL_NONE Authentication-Results =~ /$escapedprimaryhostname; dmarc=fail \(p=none/
+header DMARC_FAIL_NONE Authentication-Results =~ /$escapedboxhostname; dmarc=fail \(p=none/
 describe DMARC_FAIL_NONE DMARC check failed (p=none)
 score DMARC_FAIL_NONE 2.0

-header DMARC_FAIL_QUARANTINE Authentication-Results =~ /$escapedprimaryhostname; dmarc=fail \(p=quarantine/
+header DMARC_FAIL_QUARANTINE Authentication-Results =~ /$escapedboxhostname; dmarc=fail \(p=quarantine/
 describe DMARC_FAIL_QUARANTINE DMARC check failed (p=quarantine)
 score DMARC_FAIL_QUARANTINE 5.0

-header DMARC_FAIL_REJECT Authentication-Results =~ /$escapedprimaryhostname; dmarc=fail \(p=reject/
+header DMARC_FAIL_REJECT Authentication-Results =~ /$escapedboxhostname; dmarc=fail \(p=reject/
 describe DMARC_FAIL_REJECT DMARC check failed (p=reject)
 score DMARC_FAIL_REJECT 10.0

 # Evaluate SPF Authentication-Results
-header SPF_PASS Authentication-Results =~ /$escapedprimaryhostname; spf=pass/
+header SPF_PASS Authentication-Results =~ /$escapedboxhostname; spf=pass/
 describe SPF_PASS SPF check passed
 score SPF_PASS -0.1

-header SPF_NONE Authentication-Results =~ /$escapedprimaryhostname; spf=none/
+header SPF_NONE Authentication-Results =~ /$escapedboxhostname; spf=none/
 describe SPF_NONE SPF record not found
 score SPF_NONE 2.0

-header SPF_FAIL Authentication-Results =~ /$escapedprimaryhostname; spf=fail/
+header SPF_FAIL Authentication-Results =~ /$escapedboxhostname; spf=fail/
 describe SPF_FAIL SPF check failed
 score SPF_FAIL 5.0
 EOF
--- a/setup/ssl.sh
+++ b/setup/ssl.sh
@@ -13,7 +13,7 @@
 #  * SMTP (opportunistic TLS for port 25 and submission on ports 465/587)
 #  * HTTPS
 #
-# The certificate is created with its CN set to the PRIMARY_HOSTNAME. It is
+# The certificate is created with its CN set to the BOX_HOSTNAME. It is
 # also used for other domains served over HTTPS until the user installs a
 # better certificate for those domains.
 #
@@ -74,10 +74,10 @@ if [ ! -f "$STORAGE_ROOT/ssl/ssl_certificate.pem" ]; then
 	CSR=/tmp/ssl_cert_sign_req-$$.csr
 	hide_output \
 	openssl req -new -key "$STORAGE_ROOT/ssl/ssl_private_key.pem" -out $CSR \
-	  -sha256 -subj "/CN=$PRIMARY_HOSTNAME"
+	  -sha256 -subj "/CN=$BOX_HOSTNAME"

 	# Generate the self-signed certificate.
-	CERT=$STORAGE_ROOT/ssl/$PRIMARY_HOSTNAME-selfsigned-$(date --rfc-3339=date | sed s/-//g).pem
+	CERT=$STORAGE_ROOT/ssl/$BOX_HOSTNAME-selfsigned-$(date --rfc-3339=date | sed s/-//g).pem
 	hide_output \
 	openssl x509 -req -days 365 \
 	  -in $CSR -signkey "$STORAGE_ROOT/ssl/ssl_private_key.pem" -out "$CERT"
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -51,7 +51,7 @@ source setup/start.sh
 EOF
 chmod +x /usr/local/bin/mailinabox

-# Ask the user for the PRIMARY_HOSTNAME, PUBLIC_IP, and PUBLIC_IPV6,
+# Ask the user for the BOX_HOSTNAME, PUBLIC_IP, and PUBLIC_IPV6,
 # if values have not already been set in environment variables. When running
 # non-interactively, be sure to set values for all! Also sets STORAGE_USER and
 # STORAGE_ROOT.
@@ -60,7 +60,7 @@ source setup/questions.sh
 # Run some network checks to make sure setup on this machine makes sense.
 # Skip on existing installs since we don't want this to block the ability to
 # upgrade, and these checks are also in the control panel status checks.
-if [ -z "${DEFAULT_PRIMARY_HOSTNAME:-}" ]; then
+if [ -z "${DEFAULT_BOX_HOSTNAME:-}" ]; then
 if [ -z "${SKIP_NETWORK_CHECKS:-}" ]; then
 	source setup/network-checks.sh
 fi
@@ -95,7 +95,7 @@ fi
 cat > /etc/mailinabox.conf << EOF;
 STORAGE_USER=$STORAGE_USER
 STORAGE_ROOT=$STORAGE_ROOT
-PRIMARY_HOSTNAME=$PRIMARY_HOSTNAME
+BOX_HOSTNAME=$BOX_HOSTNAME
 PUBLIC_IP=$PUBLIC_IP
 PUBLIC_IPV6=$PUBLIC_IPV6
 PRIVATE_IP=$PRIVATE_IP
@@ -160,9 +160,9 @@ echo "Your Mail-in-a-Box is running."
 echo
 echo "Please log in to the control panel for further instructions at:"
 echo
-if management/status_checks.py --check-primary-hostname; then
+if management/status_checks.py --check-box-hostname; then
 	# Show the nice URL if it appears to be resolving and has a valid certificate.
-	echo "https://$PRIMARY_HOSTNAME/admin"
+	echo "https://$BOX_HOSTNAME/admin"
 	echo
 	echo "If you have a DNS problem put the box's IP address in the URL"
 	echo "(https://$PUBLIC_IP/admin) but then check the TLS fingerprint:"
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -12,8 +12,8 @@ source setup/functions.sh # load our functions
 #
 # First set the hostname in the configuration file, then activate the setting

-echo "$PRIMARY_HOSTNAME" > /etc/hostname
-hostname "$PRIMARY_HOSTNAME"
+echo "$BOX_HOSTNAME" > /etc/hostname
+hostname "$BOX_HOSTNAME"

 # ### Fix permissions

--- a/setup/web.sh
+++ b/setup/web.sh
@@ -104,7 +104,7 @@ fi
 mkdir -p /var/lib/mailinabox
 chmod a+rx /var/lib/mailinabox
 cat conf/ios-profile.xml \
-	| sed "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" \
+	| sed "s/BOX_HOSTNAME/$BOX_HOSTNAME/" \
 	| sed "s/UUID1/$(cat /proc/sys/kernel/random/uuid)/" \
 	| sed "s/UUID2/$(cat /proc/sys/kernel/random/uuid)/" \
 	| sed "s/UUID3/$(cat /proc/sys/kernel/random/uuid)/" \
@@ -118,7 +118,7 @@ chmod a+r /var/lib/mailinabox/mobileconfig.xml
 # https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
 # and https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration/FileFormat/HowTo.
 cat conf/mozilla-autoconfig.xml \
-	| sed "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" \
+	| sed "s/BOX_HOSTNAME/$BOX_HOSTNAME/" \
 	 > /var/lib/mailinabox/mozilla-autoconfig.xml
 chmod a+r /var/lib/mailinabox/mozilla-autoconfig.xml

@@ -130,10 +130,10 @@ chmod a+r /var/lib/mailinabox/mozilla-autoconfig.xml
 # "MTA_STS_MODE=testing" which means "Messages will be delivered
 # as though there was no failure but a report will be sent if
 # TLS-RPT is configured" if you are not sure you want this yet. Or "none".
-PUNY_PRIMARY_HOSTNAME=$(echo "$PRIMARY_HOSTNAME" | idn2)
+PUNY_BOX_HOSTNAME=$(echo "$BOX_HOSTNAME" | idn2)
 cat conf/mta-sts.txt \
        | sed "s/MODE/${MTA_STS_MODE}/" \
-        | sed "s/PRIMARY_HOSTNAME/$PUNY_PRIMARY_HOSTNAME/" \
+        | sed "s/BOX_HOSTNAME/$PUNY_BOX_HOSTNAME/" \
         > /var/lib/mailinabox/mta-sts.txt
 chmod a+r /var/lib/mailinabox/mta-sts.txt

--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -132,7 +132,7 @@ cat > $RCM_CONFIG <<EOF;
   ),
 );
 \$config['support_url'] = 'https://mailinabox.email/';
-\$config['product_name'] = '$PRIMARY_HOSTNAME Webmail';
+\$config['product_name'] = '$BOX_HOSTNAME Webmail';
 \$config['cipher_method'] = 'AES-256-CBC'; # persistent login cookie and potentially other things
 \$config['des_key'] = '$SECRET_KEY'; # 37 characters -> ~256 bits for AES-256, see above
 \$config['plugins'] = array('html5_notifier', 'archive', 'zipdownload', 'password', 'managesieve', 'jqueryui', 'persistent_login', 'carddav');
@@ -158,7 +158,7 @@ cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php <<EOF;
 	 'name'         =>  'ownCloud',
 	 'username'     =>  '%u', // login username
 	 'password'     =>  '%p', // login password
-	 'url'          =>  'https://${PRIMARY_HOSTNAME}/cloud/remote.php/dav/addressbooks/users/%u/contacts/',
+	 'url'          =>  'https://${BOX_HOSTNAME}/cloud/remote.php/dav/addressbooks/users/%u/contacts/',
 	 'active'       =>  true,
 	 'readonly'     =>  false,
 	 'refresh_time' => '02:00:00',
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -41,7 +41,7 @@ if [ $needs_update == 1 ]; then
 	mv /tmp/z-push/*/src /usr/local/lib/z-push
 	rm -rf /tmp/z-push.zip /tmp/z-push

-	# Create admin and top scripts with PHP_VER  
+	# Create admin and top scripts with PHP_VER
 	rm -f /usr/sbin/z-push-{admin,top}
    echo '#!/bin/bash' > /usr/sbin/z-push-admin
    echo php"$PHP_VER" /usr/local/lib/z-push/z-push-admin.php '"$@"' >> /usr/sbin/z-push-admin
@@ -49,7 +49,7 @@ if [ $needs_update == 1 ]; then
    echo '#!/bin/bash' > /usr/sbin/z-push-top
    echo php"$PHP_VER" /usr/local/lib/z-push/z-push-top.php '"$@"' >> /usr/sbin/z-push-top
    chmod 755 /usr/sbin/z-push-top
-	
+
 	echo $VERSION > /usr/local/lib/z-push/version
 fi

@@ -79,7 +79,7 @@ cp conf/zpush/backend_caldav.php /usr/local/lib/z-push/backend/caldav/config.php
 # Configure Autodiscover
 rm -f /usr/local/lib/z-push/autodiscover/config.php
 cp conf/zpush/autodiscover_config.php /usr/local/lib/z-push/autodiscover/config.php
-sed -i "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" /usr/local/lib/z-push/autodiscover/config.php
+sed -i "s/BOX_HOSTNAME/$BOX_HOSTNAME/" /usr/local/lib/z-push/autodiscover/config.php
 sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/autodiscover/config.php

 # Some directories it will use.