From 0568bcc5d392504afd31fae30452a84c126b36f6 Mon Sep 17 00:00:00 2001
From: David Duque <david.f.s.duque@tecnico.ulisboa.pt>
Date: Sun, 12 Apr 2020 00:44:19 +0100
Subject: [PATCH] Early configuration of the nsd service

---
 setup/dns.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/setup/dns.sh b/setup/dns.sh
index 5d86227a..48453d21 100755
--- a/setup/dns.sh
+++ b/setup/dns.sh
@@ -16,11 +16,14 @@ source /etc/mailinabox.conf # load global vars
 # * ldnsutils: Helper utilities for signing DNSSEC zones.
 # * openssh-client: Provides ssh-keyscan which we use to create SSHFP records.
 echo "Installing nsd (DNS server)..."
-apt_install nsd ldnsutils openssh-client
+apt_install ldnsutils openssh-client
 
 # Prepare nsd's configuration.
 
 mkdir -p /var/run/nsd
+mkdir -p /etc/nsd
+mkdir -p /etc/nsd/zones
+touch /etc/nsd/nsd.conf
 
 cat > /etc/nsd/nsd.conf << EOF;
 # Do not edit. Overwritten by Mail-in-a-Box setup.
@@ -64,6 +67,9 @@ done
 
 echo "include: /etc/nsd/zones.conf" >> /etc/nsd/nsd.conf;
 
+# Attempting a late install of nsd (after configuration)
+apt_install nsd
+
 # Create DNSSEC signing keys.
 
 mkdir -p "$STORAGE_ROOT/dns/dnssec";