summaryrefslogtreecommitdiffstats
path: root/distro
diff options
context:
space:
mode:
authorAleš Mrázek <ales.mrazek@nic.cz>2023-07-18 10:17:03 +0200
committerVladimír Čunát <vladimir.cunat@nic.cz>2023-07-23 11:00:13 +0200
commit1b9c68a7fe2e365fb37998d90b6b08aaae9dc564 (patch)
treede1b2cbfbf1cffe53ad9da4280b385308f3493e8 /distro
parentMerge !1429: datamodel: local-data: render ttl and nodata (diff)
downloadknot-resolver-1b9c68a7fe2e365fb37998d90b6b08aaae9dc564.tar.xz
knot-resolver-1b9c68a7fe2e365fb37998d90b6b08aaae9dc564.zip
manager: use .yaml suffix for config files
Diffstat (limited to 'distro')
-rw-r--r--distro/pkg/deb/knot-resolver-manager.install2
-rwxr-xr-xdistro/pkg/deb/rules2
-rw-r--r--distro/pkg/rpm/knot-resolver.spec4
3 files changed, 4 insertions, 4 deletions
diff --git a/distro/pkg/deb/knot-resolver-manager.install b/distro/pkg/deb/knot-resolver-manager.install
index 3ec23ee1..91068501 100644
--- a/distro/pkg/deb/knot-resolver-manager.install
+++ b/distro/pkg/deb/knot-resolver-manager.install
@@ -1,4 +1,4 @@
-etc/knot-resolver/config.yml
+etc/knot-resolver/config.yaml
usr/lib/systemd/system/knot-resolver.service
usr/share/bash-completion/completions/kresctl
usr/share/fish/completions/kresctl.fish
diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 6f052681..b707c4a3 100755
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -42,7 +42,7 @@ override_dh_auto_build:
override_dh_auto_install:
DESTDIR="${PWD}/debian/tmp" ninja -v -C build_deb install
dh_auto_install --buildsystem=pybuild --sourcedirectory manager
- install -m 644 -D manager/etc/knot-resolver/config.yml debian/tmp/etc/knot-resolver/config.yml
+ install -m 644 -D manager/etc/knot-resolver/config.yaml debian/tmp/etc/knot-resolver/config.yaml
install -m 644 -D manager/shell-completion/client.bash debian/tmp/usr/share/bash-completion/completions/kresctl
install -m 644 -D manager/shell-completion/client.fish debian/tmp/usr/share/fish/completions/kresctl.fish
diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index 1c92b481..548ae65b 100644
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -228,7 +228,7 @@ mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_pkgdocdir}/
# install knot-resolver-manager
pushd manager
%py3_install
-install -m 644 -D etc/knot-resolver/config.yml %{buildroot}%{_sysconfdir}/knot-resolver/config.yml
+install -m 644 -D etc/knot-resolver/config.yaml %{buildroot}%{_sysconfdir}/knot-resolver/config.yaml
install -m 644 -D shell-completion/client.bash %{buildroot}%{_datarootdir}/bash-completion/completions/kresctl
install -m 644 -D shell-completion/client.fish %{buildroot}%{_datarootdir}/fish/completions/kresctl.fish
@@ -330,7 +330,7 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
%files -n knot-resolver-manager
%{python3_sitearch}/knot_resolver_manager*
-%{_sysconfdir}/knot-resolver/config.yml
+%{_sysconfdir}/knot-resolver/config.yaml
%{_unitdir}/knot-resolver.service
%{_bindir}/kresctl
%{_bindir}/knot-resolver