From a07de38e80c5f1dfff5425798c339457f6483c68 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Mon, 4 May 2015 10:39:34 +0000 Subject: [PATCH] remove workaround for buggy nsd installation Prior to nsd 4.0.1-1ubuntu0.1, we had to create the nsd user before installing the nsd package. This was our issue #25 (see 4e6037c0e10e24f7f46e84d89a48b16f45017ad0, c7e1e29d) and I reported it upstream at https://bugs.launchpad.net/ubuntu/+source/nsd/+bug/1311886. The new package was published by Ubuntu on 2015-01-15 so this work-around is no longer needed. --- setup/dns.sh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/setup/dns.sh b/setup/dns.sh index ff6abfe2..ebaba90b 100755 --- a/setup/dns.sh +++ b/setup/dns.sh @@ -10,19 +10,7 @@ source setup/functions.sh # load our functions source /etc/mailinabox.conf # load global vars -# Install `nsd`, our DNS server software, and `ldnsutils` which helps -# us sign zones for DNSSEC. - -# ...but first, we have to create the user because the -# current Ubuntu forgets to do so in the .deb -# (see issue #25 and https://bugs.launchpad.net/ubuntu/+source/nsd/+bug/1311886) -if id nsd > /dev/null 2>&1; then - true #echo "nsd user exists... good"; #NODOC -else - useradd nsd; -fi - -# Okay now install the packages. +# Install the packages. # # * nsd: The non-recursive nameserver that publishes our DNS records. # * ldnsutils: Helper utilities for signing DNSSEC zones.