From 071d61bcc8dc0e3d49648bd87a0e00685ad66603 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 23 Sep 2021 23:50:14 -0700 Subject: [PATCH] *: Move all systemd service files from /lib to /usr This is now the preferred location in Debian. See: https://lintian.debian.org/tags/systemd-service-in-odd-location https://bugs.debian.org/992465 https://bugs.debian.org/987989 https://salsa.debian.org/debian/debhelper/-/commit/d70caa69c64b124e3611c967cfab93aef48346d8 https://lists.debian.org/debian-devel/2021/08/msg00275.html Tests: - Lintian no longer shows errors: E: freedombox: systemd-service-in-odd-location lib/.../calibre-server-freedombox.service - Comparing the old .deb and newly generated .deb with these changes. All the systemd files show that they are moved from /lib to /usr/lib/systemd. - After upgrading the deb from older version to a version these changes, services installed by the package are available (tested after restart with wordpress and claibre). Services tweaked by the package have the changed configuration reflected as shown by systemctl show {service-name}.service (tested after restart with quassel). Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- data/{ => usr}/lib/systemd/system/plinth.service | 0 debian/freedombox.install | 1 - .../{ => usr}/lib/systemd/system/bind9.service.d/freedombox.conf | 0 .../lib/systemd/system/calibre-server-freedombox.service | 0 .../lib/systemd/system/zramswap.service.d/freedombox.conf | 0 .../lib/systemd/system/coturn.service.d/freedombox.conf | 0 .../lib/systemd/system/deluged.service.d/freedombox.conf | 0 .../lib/systemd/system/matrix-synapse.service.d/freedombox.conf | 0 .../lib/systemd/system/mldonkey-server.service.d/freedombox.conf | 0 .../lib/systemd/system/quasselcore.service.d/freedombox.conf | 0 .../system/shadowsocks-libev-local@.service.d/freedombox.conf | 0 .../systemd/system/syncthing@syncthing.service.d/freedombox.conf | 0 .../systemd/system/transmission-daemon.service.d/freedombox.conf | 0 .../lib/systemd/system/freedombox-manual-upgrade.service | 0 .../{ => usr}/lib/systemd/system/wordpress-freedombox.service | 0 .../data/{ => usr}/lib/systemd/system/wordpress-freedombox.timer | 0 16 files changed, 1 deletion(-) rename data/{ => usr}/lib/systemd/system/plinth.service (100%) rename plinth/modules/bind/data/{ => usr}/lib/systemd/system/bind9.service.d/freedombox.conf (100%) rename plinth/modules/calibre/data/{ => usr}/lib/systemd/system/calibre-server-freedombox.service (100%) rename plinth/modules/config/data/{ => usr}/lib/systemd/system/zramswap.service.d/freedombox.conf (100%) rename plinth/modules/coturn/data/{ => usr}/lib/systemd/system/coturn.service.d/freedombox.conf (100%) rename plinth/modules/deluge/data/{ => usr}/lib/systemd/system/deluged.service.d/freedombox.conf (100%) rename plinth/modules/matrixsynapse/data/{ => usr}/lib/systemd/system/matrix-synapse.service.d/freedombox.conf (100%) rename plinth/modules/mldonkey/data/{ => usr}/lib/systemd/system/mldonkey-server.service.d/freedombox.conf (100%) rename plinth/modules/quassel/data/{ => usr}/lib/systemd/system/quasselcore.service.d/freedombox.conf (100%) rename plinth/modules/shadowsocks/data/{ => usr}/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf (100%) rename plinth/modules/syncthing/data/{ => usr}/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf (100%) rename plinth/modules/transmission/data/{ => usr}/lib/systemd/system/transmission-daemon.service.d/freedombox.conf (100%) rename plinth/modules/upgrades/data/{ => usr}/lib/systemd/system/freedombox-manual-upgrade.service (100%) rename plinth/modules/wordpress/data/{ => usr}/lib/systemd/system/wordpress-freedombox.service (100%) rename plinth/modules/wordpress/data/{ => usr}/lib/systemd/system/wordpress-freedombox.timer (100%) diff --git a/data/lib/systemd/system/plinth.service b/data/usr/lib/systemd/system/plinth.service similarity index 100% rename from data/lib/systemd/system/plinth.service rename to data/usr/lib/systemd/system/plinth.service diff --git a/debian/freedombox.install b/debian/freedombox.install index d853deb19..feda023b2 100644 --- a/debian/freedombox.install +++ b/debian/freedombox.install @@ -1,5 +1,4 @@ etc -lib usr/bin usr/lib usr/share/augeas diff --git a/plinth/modules/bind/data/lib/systemd/system/bind9.service.d/freedombox.conf b/plinth/modules/bind/data/usr/lib/systemd/system/bind9.service.d/freedombox.conf similarity index 100% rename from plinth/modules/bind/data/lib/systemd/system/bind9.service.d/freedombox.conf rename to plinth/modules/bind/data/usr/lib/systemd/system/bind9.service.d/freedombox.conf diff --git a/plinth/modules/calibre/data/lib/systemd/system/calibre-server-freedombox.service b/plinth/modules/calibre/data/usr/lib/systemd/system/calibre-server-freedombox.service similarity index 100% rename from plinth/modules/calibre/data/lib/systemd/system/calibre-server-freedombox.service rename to plinth/modules/calibre/data/usr/lib/systemd/system/calibre-server-freedombox.service diff --git a/plinth/modules/config/data/lib/systemd/system/zramswap.service.d/freedombox.conf b/plinth/modules/config/data/usr/lib/systemd/system/zramswap.service.d/freedombox.conf similarity index 100% rename from plinth/modules/config/data/lib/systemd/system/zramswap.service.d/freedombox.conf rename to plinth/modules/config/data/usr/lib/systemd/system/zramswap.service.d/freedombox.conf diff --git a/plinth/modules/coturn/data/lib/systemd/system/coturn.service.d/freedombox.conf b/plinth/modules/coturn/data/usr/lib/systemd/system/coturn.service.d/freedombox.conf similarity index 100% rename from plinth/modules/coturn/data/lib/systemd/system/coturn.service.d/freedombox.conf rename to plinth/modules/coturn/data/usr/lib/systemd/system/coturn.service.d/freedombox.conf diff --git a/plinth/modules/deluge/data/lib/systemd/system/deluged.service.d/freedombox.conf b/plinth/modules/deluge/data/usr/lib/systemd/system/deluged.service.d/freedombox.conf similarity index 100% rename from plinth/modules/deluge/data/lib/systemd/system/deluged.service.d/freedombox.conf rename to plinth/modules/deluge/data/usr/lib/systemd/system/deluged.service.d/freedombox.conf diff --git a/plinth/modules/matrixsynapse/data/lib/systemd/system/matrix-synapse.service.d/freedombox.conf b/plinth/modules/matrixsynapse/data/usr/lib/systemd/system/matrix-synapse.service.d/freedombox.conf similarity index 100% rename from plinth/modules/matrixsynapse/data/lib/systemd/system/matrix-synapse.service.d/freedombox.conf rename to plinth/modules/matrixsynapse/data/usr/lib/systemd/system/matrix-synapse.service.d/freedombox.conf diff --git a/plinth/modules/mldonkey/data/lib/systemd/system/mldonkey-server.service.d/freedombox.conf b/plinth/modules/mldonkey/data/usr/lib/systemd/system/mldonkey-server.service.d/freedombox.conf similarity index 100% rename from plinth/modules/mldonkey/data/lib/systemd/system/mldonkey-server.service.d/freedombox.conf rename to plinth/modules/mldonkey/data/usr/lib/systemd/system/mldonkey-server.service.d/freedombox.conf diff --git a/plinth/modules/quassel/data/lib/systemd/system/quasselcore.service.d/freedombox.conf b/plinth/modules/quassel/data/usr/lib/systemd/system/quasselcore.service.d/freedombox.conf similarity index 100% rename from plinth/modules/quassel/data/lib/systemd/system/quasselcore.service.d/freedombox.conf rename to plinth/modules/quassel/data/usr/lib/systemd/system/quasselcore.service.d/freedombox.conf diff --git a/plinth/modules/shadowsocks/data/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf b/plinth/modules/shadowsocks/data/usr/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf similarity index 100% rename from plinth/modules/shadowsocks/data/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf rename to plinth/modules/shadowsocks/data/usr/lib/systemd/system/shadowsocks-libev-local@.service.d/freedombox.conf diff --git a/plinth/modules/syncthing/data/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf b/plinth/modules/syncthing/data/usr/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf similarity index 100% rename from plinth/modules/syncthing/data/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf rename to plinth/modules/syncthing/data/usr/lib/systemd/system/syncthing@syncthing.service.d/freedombox.conf diff --git a/plinth/modules/transmission/data/lib/systemd/system/transmission-daemon.service.d/freedombox.conf b/plinth/modules/transmission/data/usr/lib/systemd/system/transmission-daemon.service.d/freedombox.conf similarity index 100% rename from plinth/modules/transmission/data/lib/systemd/system/transmission-daemon.service.d/freedombox.conf rename to plinth/modules/transmission/data/usr/lib/systemd/system/transmission-daemon.service.d/freedombox.conf diff --git a/plinth/modules/upgrades/data/lib/systemd/system/freedombox-manual-upgrade.service b/plinth/modules/upgrades/data/usr/lib/systemd/system/freedombox-manual-upgrade.service similarity index 100% rename from plinth/modules/upgrades/data/lib/systemd/system/freedombox-manual-upgrade.service rename to plinth/modules/upgrades/data/usr/lib/systemd/system/freedombox-manual-upgrade.service diff --git a/plinth/modules/wordpress/data/lib/systemd/system/wordpress-freedombox.service b/plinth/modules/wordpress/data/usr/lib/systemd/system/wordpress-freedombox.service similarity index 100% rename from plinth/modules/wordpress/data/lib/systemd/system/wordpress-freedombox.service rename to plinth/modules/wordpress/data/usr/lib/systemd/system/wordpress-freedombox.service diff --git a/plinth/modules/wordpress/data/lib/systemd/system/wordpress-freedombox.timer b/plinth/modules/wordpress/data/usr/lib/systemd/system/wordpress-freedombox.timer similarity index 100% rename from plinth/modules/wordpress/data/lib/systemd/system/wordpress-freedombox.timer rename to plinth/modules/wordpress/data/usr/lib/systemd/system/wordpress-freedombox.timer