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 13e18f15d6ffdf5867161a90d6d16cf2af930174..31c5833f3445c8ade6fc5bd433b3e2cb9c97d851 100755 (executable)
--- 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 2192c0373d9440f93cc5a38b68506c5a46826e5d..0a75a9b8d5cb0d921b6288c4371361a69459bc67 100644 (file)
--- 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 c374d555f9cebb05c0549749c1abc6a7139231d7..2e21021b03ab8761eb1e3c7f85b9a6dde598e506 100644 (file)
--- 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