From 3af3846800849b597459ba2942a1329990c2d112 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 10 Dec 2015 15:09:11 +0100
Subject: [PATCH] Remove safe defaults for dnsdist packages (is included in the
 binary), fixes the first part of #3015

---
 build-scripts/build-dnsdist-rpm               | 6 +++---
 build-scripts/debian-dnsdist/dnsdist.default  | 1 -
 build-scripts/debian-dnsdist/dnsdist.service  | 4 ++--
 build-scripts/debian-dnsdist/dnsdist.upstart  | 2 +-
 pdns/dnsdistdist/contrib/dnsdist.default      | 2 +-
 pdns/dnsdistdist/contrib/dnsdist.init.centos6 | 6 +++++-
 pdns/dnsdistdist/contrib/dnsdist.service      | 4 ++--
 7 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 build-scripts/debian-dnsdist/dnsdist.default

diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm
index c01f9179c7..aded5f533b 100755
--- a/build-scripts/build-dnsdist-rpm
+++ b/build-scripts/build-dnsdist-rpm
@@ -39,9 +39,9 @@ INIT_BUILDREQUIRES='BuildRequires: systemd'
 INIT_INSTALL='install -d -m 755 %{buildroot}/%{_sysconfdir}/systemd/system/ && install -m 664 contrib/dnsdist.service %{buildroot}/%{_sysconfdir}/systemd/system/dnsdist.service'
 INIT_FILES='%{_sysconfdir}/systemd/system/dnsdist.service'
 
-# These two are the same for sysv and systemd
-DEFAULTS_INSTALL='install -d -m 755 %{buildroot}/%{_sysconfdir}/sysconfig && install -m 644 contrib/dnsdist.default %{buildroot}/%{_sysconfdir}/sysconfig/dnsdist'
-DEFAULTS_FILES='%{_sysconfdir}/sysconfig/dnsdist'
+# These two are the same for sysv and systemd (we don't install defaults files at the moment)
+DEFAULTS_INSTALL=''
+DEFAULTS_FILES=''
 
 # On some older distro's *cough* centos 6 *cough* autosetup fails
 SETUP='%autosetup -n %{name}-%{version}'
diff --git a/build-scripts/debian-dnsdist/dnsdist.default b/build-scripts/debian-dnsdist/dnsdist.default
deleted file mode 100644
index 622ed6850d..0000000000
--- a/build-scripts/debian-dnsdist/dnsdist.default
+++ /dev/null
@@ -1 +0,0 @@
-OPTIONS='-l 127.0.0.1'
diff --git a/build-scripts/debian-dnsdist/dnsdist.service b/build-scripts/debian-dnsdist/dnsdist.service
index 40004acd8d..e0374e843c 100644
--- a/build-scripts/debian-dnsdist/dnsdist.service
+++ b/build-scripts/debian-dnsdist/dnsdist.service
@@ -3,8 +3,8 @@ Description=DNSdist
 After=syslog.target
 
 [Service]
-EnvironmentFile=-/etc/default/dnsdist
-ExecStart=/usr/bin/dnsdist --supervised ${OPTIONS}
+# Keep the --supervised option when modifying the default options
+ExecStart=/usr/bin/dnsdist --supervised
 
 [Install]
 WantedBy=multi-user.target
diff --git a/build-scripts/debian-dnsdist/dnsdist.upstart b/build-scripts/debian-dnsdist/dnsdist.upstart
index 191dab2d9e..0ded50f9ab 100644
--- a/build-scripts/debian-dnsdist/dnsdist.upstart
+++ b/build-scripts/debian-dnsdist/dnsdist.upstart
@@ -6,4 +6,4 @@ stop on runlevel [!2345]
 author "Pieter Lexis <pieter.lexis@powerdns.com>"
 
 # Keep the --supervised option when modifying this
-exec /usr/bin/dnsdist --supervised -l 127.0.0.1
+exec /usr/bin/dnsdist --supervised
diff --git a/pdns/dnsdistdist/contrib/dnsdist.default b/pdns/dnsdistdist/contrib/dnsdist.default
index 4e0e04529f..8e6dc5b9a7 100644
--- a/pdns/dnsdistdist/contrib/dnsdist.default
+++ b/pdns/dnsdistdist/contrib/dnsdist.default
@@ -1 +1 @@
-DNSDIST_OPTIONS='-l 127.0.0.1'
+DNSDIST_OPTIONS=''
diff --git a/pdns/dnsdistdist/contrib/dnsdist.init.centos6 b/pdns/dnsdistdist/contrib/dnsdist.init.centos6
index 613481c88c..071fa0b35a 100644
--- a/pdns/dnsdistdist/contrib/dnsdist.init.centos6
+++ b/pdns/dnsdistdist/contrib/dnsdist.init.centos6
@@ -17,12 +17,16 @@
 PROG=dnsdist
 DNSDIST=/usr/bin/${PROG}
 PIDFILE=/var/run/${PROG}.pid
-DNSDIST_OPTIONS="-l 127.0.0.1:53"
+DNSDIST_OPTIONS=""
 
 if [ -f /etc/default/${PROG} ]; then
   . /etc/default/${PROG}
 fi
 
+if [ -f /etc/sysconfig/${PROG} ]; then
+  . /etc/sysconfig/${PROG}
+fi
+
 RETVAL=0
 
 do_start() {
diff --git a/pdns/dnsdistdist/contrib/dnsdist.service b/pdns/dnsdistdist/contrib/dnsdist.service
index 00a7bfda43..11067dfc8a 100644
--- a/pdns/dnsdistdist/contrib/dnsdist.service
+++ b/pdns/dnsdistdist/contrib/dnsdist.service
@@ -3,8 +3,8 @@ Description=dnsdist
 After=network.target
 
 [Service]
-EnvironmentFile=-/etc/sysconfig/dnsdist
-ExecStart=/usr/bin/dnsdist --supervised $DNSDIST_OPTIONS
+# Keep the --supervised option when changing the default options
+ExecStart=/usr/bin/dnsdist --supervised
 
 [Install]
 WantedBy=multi-user.target
-- 
2.47.2