dnsdist: Do not create `dnsdist.yml` in RPM system configuration directory

DNSdist now looks for a `dnsdist.yml` file first, which means that any
existing `dnsdist.conf` would no longer be taken into account if we create
a default `dnsdist.yml`. Let's install a sample YAML configuration file
in `dnsdist.yml-dist` instead.

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index d0da8e3257d83b5b330cc5515bedcc1a8f23782b..61a6519408570cb2a0a517409ba6908a0987272f 100644 (file)
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -145,8 +145,7 @@ install -d %{buildroot}/%{_sysconfdir}/dnsdist
 install -Dm644 %{_libdir}/libdnsdist-quiche.so %{buildroot}/%{_libdir}/libdnsdist-quiche.so
 %{__mv} %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf-dist %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.conf
 chmod 0640 %{buildroot}/%{_sysconfdir}/dnsdist/dnsdist.conf
-%{__mv} %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.yml-dist %{buildroot}%{_sysconfdir}/dnsdist/dnsdist.yml
-chmod 0640 %{buildroot}/%{_sysconfdir}/dnsdist/dnsdist.yml
+chmod 0640 %{buildroot}/%{_sysconfdir}/dnsdist/dnsdist.yml-dist
 
 %{__install } -d %{buildroot}/%{_sharedstatedir}/%{name}
 
@@ -189,6 +188,6 @@ systemctl daemon-reload ||:
 %{_mandir}/man1/*
 %dir %{_sysconfdir}/dnsdist
 %attr(-, root, dnsdist) %config(noreplace) %{_sysconfdir}/%{name}/dnsdist.conf
-%attr(-, root, dnsdist) %config(noreplace) %{_sysconfdir}/%{name}/dnsdist.yml
+%attr(-, root, dnsdist) %config(noreplace) %{_sysconfdir}/%{name}/dnsdist.yml-dist
 %dir %attr(-,dnsdist,dnsdist) %{_sharedstatedir}/%{name}
 %{_unitdir}/dnsdist*