From: Remi Gacogne Date: Thu, 29 Jan 2026 15:15:04 +0000 (+0100) Subject: dnsdist: Do not create `dnsdist.yml` in RPM system configuration directory X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b8619b8936a47c0ec869debd68471c3ea9d48a3;p=thirdparty%2Fpdns.git 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 --- diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec index d0da8e3257..61a6519408 100644 --- 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*