From 2f5deb0c0130e5191ee948592708834220c6ecd4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 23 Oct 2016 16:53:23 +0100
Subject: [PATCH] Set mailname at the same time as hostname
---
src/freedombone-base-email | 2 --
src/freedombone-utils-dns | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 78eadb3c..63e6a606 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -671,8 +671,6 @@ function install_email {
return
fi
- echo "$DEFAULT_DOMAIN_NAME" > /etc/mailname
-
apt-get -y remove postfix
apt-get -y install exim4 sasl2-bin swaks libnet-ssleay-perl procmail xinetd
diff --git a/src/freedombone-utils-dns b/src/freedombone-utils-dns
index 9dcee072..7bda0864 100755
--- a/src/freedombone-utils-dns
+++ b/src/freedombone-utils-dns
@@ -184,6 +184,7 @@ function set_hostname {
echo "$DEFAULT_DOMAIN_NAME" > /etc/hostname
hostname $DEFAULT_DOMAIN_NAME
+ echo "$DEFAULT_DOMAIN_NAME" > /etc/mailname
if grep -q "127.0.1.1" /etc/hosts; then
sed -i "s/127.0.1.1.*/127.0.1.1 $DEFAULT_DOMAIN_NAME/g" /etc/hosts