distro: move systemd unit files

diff --git a/distro/arch/PKGBUILD b/distro/arch/PKGBUILD
index c30cc944ad177975d8794056ad86012139372569..26644b20c65bf6d213b79c134795422a5f700d02 100644 (file)
--- a/distro/arch/PKGBUILD
+++ b/distro/arch/PKGBUILD
@@ -45,10 +45,10 @@ package() {
        cd "${srcdir}/${pkgname}-${pkgver}"
 
        make ${_makevars} DESTDIR="${pkgdir}" install
-       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd.socket" "${pkgdir}/usr/lib/systemd/system/kresd.socket"
-       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-control@.socket" "${pkgdir}/usr/lib/systemd/system/kresd-control@.socket"
-       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd-tls.socket" "${pkgdir}/usr/lib/systemd/system/kresd-tls.socket"
-       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/kresd@.service" "${pkgdir}/usr/lib/systemd/system/kresd@.service"
+       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd.socket" "${pkgdir}/usr/lib/systemd/system/kresd.socket"
+       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd-control@.socket" "${pkgdir}/usr/lib/systemd/system/kresd-control@.socket"
+       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd-tls.socket" "${pkgdir}/usr/lib/systemd/system/kresd-tls.socket"
+       install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd@.service" "${pkgdir}/usr/lib/systemd/system/kresd@.service"
        install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/systemd/kresd.systemd.7" "${pkgdir}/usr/share/man/man7/kresd.systemd.7"
        install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/distro/common/tmpfiles/knot-resolver.conf" "${pkgdir}/usr/lib/tmpfiles.d/knot-resolver.conf"
        install -dm 0775 "${pkgdir}/etc/knot-resolver"

diff --git a/systemd/README.md b/distro/common/systemd/README.md
similarity index 100%
rename from systemd/README.md
rename to distro/common/systemd/README.md

diff --git a/systemd/drop-in/listen-tls.conf b/distro/common/systemd/drop-in/listen-tls.conf
similarity index 100%
rename from systemd/drop-in/listen-tls.conf
rename to distro/common/systemd/drop-in/listen-tls.conf

diff --git a/systemd/drop-in/listen-udp-tcp.conf b/distro/common/systemd/drop-in/listen-udp-tcp.conf
similarity index 100%
rename from systemd/drop-in/listen-udp-tcp.conf
rename to distro/common/systemd/drop-in/listen-udp-tcp.conf

diff --git a/systemd/drop-in/systemd-compat.conf b/distro/common/systemd/drop-in/systemd-compat.conf
similarity index 100%
rename from systemd/drop-in/systemd-compat.conf
rename to distro/common/systemd/drop-in/systemd-compat.conf

diff --git a/systemd/kresd-control@.socket b/distro/common/systemd/kresd-control@.socket
similarity index 100%
rename from systemd/kresd-control@.socket
rename to distro/common/systemd/kresd-control@.socket

diff --git a/systemd/kresd-tls.socket b/distro/common/systemd/kresd-tls.socket
similarity index 100%
rename from systemd/kresd-tls.socket
rename to distro/common/systemd/kresd-tls.socket

diff --git a/systemd/kresd.socket b/distro/common/systemd/kresd.socket
similarity index 100%
rename from systemd/kresd.socket
rename to distro/common/systemd/kresd.socket

diff --git a/systemd/kresd@.service b/distro/common/systemd/kresd@.service
similarity index 100%
rename from systemd/kresd@.service
rename to distro/common/systemd/kresd@.service

diff --git a/distro/deb/debian/knot-resolver.install b/distro/deb/debian/knot-resolver.install
index 0b893eff9d0c4dc4dd10bfa76945dfebda6017a7..a78583aef7d774ca28c4dd6f51e04252decd1b8c 100644 (file)
--- a/distro/deb/debian/knot-resolver.install
+++ b/distro/deb/debian/knot-resolver.install
@@ -1,10 +1,10 @@
 debian/init-d-script usr/lib/knot-resolver/
 debian/kresd.conf etc/knot-resolver/
 etc/knot-resolver/config.* /usr/share/doc/knot-resolver/examples/
-systemd/kresd-control@.socket lib/systemd/system/
-systemd/kresd-tls.socket lib/systemd/system/
-systemd/kresd.socket lib/systemd/system/
-systemd/kresd@.service lib/systemd/system/
+distro/common/systemd/kresd-control@.socket lib/systemd/system/
+distro/common/systemd/kresd-tls.socket lib/systemd/system/
+distro/common/systemd/kresd.socket lib/systemd/system/
+distro/common/systemd/kresd@.service lib/systemd/system/
 distro/common/tmpfiles/knot-resolver.conf usr/lib/tmpfiles.d/
 usr/lib/knot-resolver/*.so
 usr/lib/knot-resolver/daf.lua

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 2c2c1c3cdfe55132b29c60836ba6721208e7cb01..791dea8752a5a372f6425fd070dc7bfa42c01620 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -138,19 +138,19 @@ install -m 0664 -p %SOURCE3 %{buildroot}%{_sysconfdir}/knot-resolver/root.keys
 
 # install systemd units and doc
 mkdir -p %{buildroot}%{_unitdir}
-install -m 0644 -p %{repodir}/systemd/kresd@.service %{buildroot}%{_unitdir}/kresd@.service
+install -m 0644 -p %{repodir}/distro/common/systemd/kresd@.service %{buildroot}%{_unitdir}/kresd@.service
 mkdir -p %{buildroot}%{_mandir}/man7
 install -m 0644 -p %{repodir}/distro/common/systemd/kresd.systemd.7 %{buildroot}%{_mandir}/man7/kresd.systemd.7
 
 %if 0%{?rhel}
 # no socket activation for CentOS 7 (requires systemd.227)
 mkdir -p %{buildroot}%{_unitdir}/kresd@.service.d
-install -m 0644 -p %{repodir}/systemd/drop-in/systemd-compat.conf %{buildroot}%{_unitdir}/kresd@.service.d/override.conf
+install -m 0644 -p %{repodir}/distro/common/systemd/drop-in/systemd-compat.conf %{buildroot}%{_unitdir}/kresd@.service.d/override.conf
 %endif
 %if 0%{?fedora}
-install -m 0644 -p %{repodir}/systemd/kresd.socket %{buildroot}%{_unitdir}/kresd.socket
-install -m 0644 -p %{repodir}/systemd/kresd-control@.socket %{buildroot}%{_unitdir}/kresd-control@.socket
-install -m 0644 -p %{repodir}/systemd/kresd-tls.socket %{buildroot}%{_unitdir}/kresd-tls.socket
+install -m 0644 -p %{repodir}/distro/common/systemd/kresd.socket %{buildroot}%{_unitdir}/kresd.socket
+install -m 0644 -p %{repodir}/distro/common/systemd/kresd-control@.socket %{buildroot}%{_unitdir}/kresd-control@.socket
+install -m 0644 -p %{repodir}/distro/common/systemd/kresd-tls.socket %{buildroot}%{_unitdir}/kresd-tls.socket
 %endif
 
 # install tmpfiles.d