From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 26 Jan 2023 16:30:29 +0000 (+0100)
Subject: dnsdist: Set up a default configuration file
X-Git-Tag: dnsdist-1.8.0-rc1~68^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0b6aac58a9e37b51d4963700cbdab3d1143c2df;p=thirdparty%2Fpdns.git

dnsdist: Set up a default configuration file
---

diff --git a/builder-support/debian/dnsdist/debian-buster/rules b/builder-support/debian/dnsdist/debian-buster/rules
index 13e18f15d6..31c5833f34 100755
--- a/builder-support/debian/dnsdist/debian-buster/rules
+++ b/builder-support/debian/dnsdist/debian-buster/rules
@@ -74,7 +74,7 @@ else
 endif
 
 override_dh_installexamples:
-	cp dnsdistconf.lua dnsdist.conf
+	cp dnsdist.conf-dist dnsdist.conf
 	dh_installexamples
 	rm -f dnsdist.conf
 
diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 2192c0373d..0a75a9b8d5 100644
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -99,7 +99,6 @@ export LDFLAGS=-L/usr/lib64/boost169
 %endif
 
 make %{?_smp_mflags}
-mv dnsdistconf.lua dnsdist.conf.sample
 
 %check
 make %{?_smp_mflags} check || (cat test-suite.log && false)
@@ -107,6 +106,8 @@ make %{?_smp_mflags} check || (cat test-suite.log && false)
 %install
 %make_install
 install -d %{buildroot}/%{_sysconfdir}/dnsdist
+%{__mv} %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf-dist %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf
+chmod 0640 %{buildroot}/%{_sysconfdir}/dnsdist/dnsdist.conf
 sed -i "s,/^\(ExecStart.*\)dnsdist\(.*\)\$,\1dnsdist -u dnsdist -g dnsdist\2," %{buildroot}/lib/systemd/system/dnsdist.service
 sed -i "s,/^\(ExecStart.*\)dnsdist\(.*\)\$,\1dnsdist -u dnsdist -g dnsdist\2," %{buildroot}/lib/systemd/system/dnsdist@.service
 
@@ -149,4 +150,5 @@ systemctl daemon-reload ||:
 %{_bindir}/*
 %{_mandir}/man1/*
 %dir %{_sysconfdir}/dnsdist
+%config(noreplace) %{_sysconfdir}/%{name}/dnsdist.conf
 /lib/systemd/system/dnsdist*
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index c374d555f9..2e21021b03 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -21,6 +21,8 @@ CLEANFILES = \
 	htmlfiles.h \
 	dnsdist-lua-ffi-interface.inc
 
+sysconf_DATA = dnsdist.conf-dist
+
 dnslabeltext.cc: dnslabeltext.rl
 	$(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
 
@@ -84,7 +86,7 @@ endif
 
 EXTRA_DIST=COPYING \
 	   dnslabeltext.rl \
-	   dnsdistconf.lua \
+	   dnsdist.conf-dist \
 	   dnsmessage.proto \
 	   dnstap.proto \
 	   README.md \
diff --git a/pdns/dnsdistdist/dnsdistconf.lua b/pdns/dnsdistdist/dnsdist.conf-dist
similarity index 100%
rename from pdns/dnsdistdist/dnsdistconf.lua
rename to pdns/dnsdistdist/dnsdist.conf-dist