diff --git a/.gitignore b/.gitignore
index f613cca334eeeb84b9c5a7133558bee83f7e2fdd..66acf991a792ea9218d15193f73a9fdb426dbb7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,18 +65,18 @@ version.h
src/libknot/libknot.h
# Binaries
-/src/kdig
-/src/khost
/src/kcatalogprint
+/src/kdig
/src/keymgr
+/src/khost
/src/kjournalprint
/src/knotc
/src/knotd
/src/knsec3hash
/src/knsupdate
-/src/kzonesign
-/src/kzonecheck
/src/kxdpgun
+/src/kzonecheck
+/src/kzonesign
# Generated tarballs
/knot-*.tar.xz
diff --git a/distro/deb/knot.install b/distro/deb/knot.install
index baefcabe0065c8c60460a1561b0f02b27f34268d..5e239a44a834b8617e5a7f5f8f6945adb87c71a8 100644
--- a/distro/deb/knot.install
+++ b/distro/deb/knot.install
@@ -2,18 +2,18 @@ debian/ufw/knot etc/ufw/applications.d/
etc/knot/knot.conf
usr/bin/knsec3hash
usr/bin/kzonecheck
+usr/bin/kzonesign
usr/sbin/kcatalogprint
usr/sbin/keymgr
usr/sbin/kjournalprint
usr/sbin/knotc
usr/sbin/knotd
-usr/sbin/kzonesign
usr/share/man/man1/knsec3hash.1
usr/share/man/man1/kzonecheck.1
+usr/share/man/man1/kzonesign.1
usr/share/man/man5/knot.conf.5
usr/share/man/man8/kcatalogprint.8
usr/share/man/man8/keymgr.8
usr/share/man/man8/kjournalprint.8
usr/share/man/man8/knotc.8
usr/share/man/man8/knotd.8
-usr/share/man/man8/kzonesign.8
diff --git a/distro/rpm/knot.spec b/distro/rpm/knot.spec
index 24ccdc81c55adcca4fa025df7837b2bbf95d0196..76c15bad317fd60c657c8b20d33ebc6e2e36493a 100644
--- a/distro/rpm/knot.spec
+++ b/distro/rpm/knot.spec
@@ -225,6 +225,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || :
%{_unitdir}/knot.service
%{_tmpfilesdir}/%{name}.conf
%{_bindir}/kzonecheck
+%{_bindir}/kzonesign
%{_sbindir}/kcatalogprint
%{_sbindir}/kjournalprint
%{_sbindir}/keymgr
@@ -234,6 +235,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/knot.conf &>/dev/null || :
%{_sbindir}/rcknot
%endif
%{_mandir}/man1/kzonecheck.*
+%{_mandir}/man1/kzonesign.*
%{_mandir}/man5/knot.conf.*
%{_mandir}/man8/kcatalogprint.*
%{_mandir}/man8/kjournalprint.*
diff --git a/doc/.gitignore b/doc/.gitignore
index 6a07e11e0d18338f256da9444927c1f95c7ee63e..da5fa820079c64c7722cd20fb5d4ea927e516a2f 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -5,16 +5,15 @@
# sphinx-build manpages
/man/knot.conf.5
-/man/knotc.8
-/man/knotd.8
/man/kcatalogprint.8
/man/keymgr.8
/man/kjournalprint.8
+/man/knotc.8
+/man/knotd.8
/man/kdig.1
/man/khost.1
-/man/knot1to2.1
/man/knsec3hash.1
/man/knsupdate.1
-/man/kzonesign.8
/man/kzonecheck.1
+/man/kzonesign.1
/man/kxdpgun.8
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8340ba792438d09d8edc6b15ff0e9ffc6ec79c90..9003067b4b659f41e75a2a3565b51a62cf5ecf46 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,8 +9,8 @@ MANPAGES_IN = \
man/khost.1in \
man/knsupdate.1in \
man/knsec3hash.1in \
- man/kzonesign.8in \
man/kzonecheck.1in \
+ man/kzonesign.1in \
man/kxdpgun.8in
MANPAGES_RST = \
@@ -23,8 +23,8 @@ MANPAGES_RST = \
man_khost.rst \
man_knsupdate.rst \
man_knsec3hash.rst \
- man_kzonesign.rst \
man_kzonecheck.rst \
+ man_kzonesign.rst \
man_kxdpgun.rst
EXTRA_DIST = \
@@ -99,8 +99,8 @@ man_MANS += \
man/kcatalogprint.8 \
man/keymgr.8 \
man/kjournalprint.8 \
- man/kzonesign.8 \
- man/kzonecheck.1
+ man/kzonecheck.1 \
+ man/kzonesign.1
endif # HAVE_DAEMON
man_MANS += \
@@ -124,8 +124,8 @@ man/kdig.1: man/kdig.1in
man/khost.1: man/khost.1in
man/knsupdate.1: man/knsupdate.1in
man/knsec3hash.1: man/knsec3hash.1in
-man/kzonesign.8: man/kzonesign.8in
man/kzonecheck.1: man/kzonecheck.1in
+man/kzonesign.1: man/kzonesign.1in
man/kxdpgun.8: man/kxdpgun.8in
man_SUBST = $(AM_V_GEN)mkdir -p man; \
diff --git a/doc/conf.py b/doc/conf.py
index 86d37b72ba1efd19766b2c96a2a889cda68d3b00..e4c137db4d122e6dbdfbb16dd24d95fb7441534f 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -233,8 +233,8 @@ man_pages = [
('man_khost', 'khost', 'Simple DNS lookup utility', author, 1),
('man_knsec3hash', 'knsec3hash', 'Simple utility to compute NSEC3 hash', author, 1),
('man_knsupdate', 'knsupdate', 'Dynamic DNS update utility', author, 1),
- ('man_kzonesign', 'kzonesign', 'DNSSEC signing utility', author, 8),
('man_kzonecheck', 'kzonecheck', 'Knot DNS zone check tool', author, 1),
+ ('man_kzonesign', 'kzonesign', 'DNSSEC signing utility', author, 1),
('man_kxdpgun', 'kxdpgun', 'XDP-powered DNS benchmarking tool', author, 8),
]
diff --git a/doc/man/kzonesign.8in b/doc/man/kzonesign.1in
similarity index 96%
rename from doc/man/kzonesign.8in
rename to doc/man/kzonesign.1in
index 0867de308f35cd603d9b8e4851043a8eb4d31f0f..4c54f4dd2d02adb44838ba6d182c9840b52911b0 100644
--- a/doc/man/kzonesign.8in
+++ b/doc/man/kzonesign.1in
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "KZONESIGN" "8" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
+.TH "KZONESIGN" "1" "@RELEASE_DATE@" "@VERSION@" "Knot DNS"
.SH NAME
kzonesign \- DNSSEC signing utility
.
diff --git a/doc/utilities.rst b/doc/utilities.rst
index 7b3ec7c72f27186334560b6ddf4f000762a5cbcc..392115d6e7d71b80626ec4fa837547bfacb87b53 100644
--- a/doc/utilities.rst
+++ b/doc/utilities.rst
@@ -16,9 +16,9 @@ the server. This section collects manual pages for all provided binaries:
man_kjournalprint
man_kcatalogprint
man_kzonecheck
+ man_kzonesign
man_kdig
man_khost
man_knsec3hash
man_knsupdate
- man_kzonesign
man_kxdpgun
diff --git a/src/utils/Makefile.inc b/src/utils/Makefile.inc
index 70f8787f608f8f07908dca984d4542c83f3d8b5b..e0ed426cc2f932fbe8e90e6389bae543d8b4cce3 100644
--- a/src/utils/Makefile.inc
+++ b/src/utils/Makefile.inc
@@ -129,8 +129,8 @@ knotd_LDADD = $(malloc_LIBS) libcontrib.la libknotd.la $(liburcu_LIBS
knotd_LDFLAGS = $(AM_LDFLAGS) -rdynamic
if HAVE_UTILS
-bin_PROGRAMS += kzonecheck
-sbin_PROGRAMS += keymgr kjournalprint kcatalogprint kzonesign
+bin_PROGRAMS += kzonecheck kzonesign
+sbin_PROGRAMS += keymgr kjournalprint kcatalogprint
kzonecheck_SOURCES = \
utils/kzonecheck/main.c \
@@ -157,9 +157,8 @@ kcatalogprint_SOURCES = \
kzonecheck_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
kzonecheck_LDADD = libcontrib.la libknotd.la
-kzonesign_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS) $(lmdb_CFLAGS)
-kzonesign_LDADD = libcontrib.la libknotd.la libknotus.la libdnssec.la \
- libzscanner.la
+kzonesign_CPPFLAGS = $(AM_CPPFLAGS) $(lmdb_CFLAGS)
+kzonesign_LDADD = libcontrib.la libknotd.la
keymgr_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS) $(lmdb_CFLAGS)
keymgr_LDADD = libcontrib.la libknotd.la libknotus.la libdnssec.la \
libzscanner.la