diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2024-03-24 22:52:58 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2024-03-24 22:55:35 -0700 |
| commit | 10e3fa8b58a6d0224cba3d2b2e2df958891879f0 (patch) | |
| tree | e4678f2a2b30547be99bfbae9761d6f25dd1107d | |
| parent | app-admin/fifo-cronolog: fix systemd unit (diff) | |
| download | gentoo-10e3fa8b58a6d0224cba3d2b2e2df958891879f0.tar.gz gentoo-10e3fa8b58a6d0224cba3d2b2e2df958891879f0.tar.bz2 gentoo-10e3fa8b58a6d0224cba3d2b2e2df958891879f0.zip | |
net-misc/sks: match init.d behavior
- support args to systemd service
- ensure paths are correctly owned (/var/lib/sks/{PTree,KDB} must exist)
- sks-recon must start after sks-db
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| -rw-r--r-- | net-misc/sks/files/sks-db.service | 7 | ||||
| -rw-r--r-- | net-misc/sks/files/sks-recon.service | 7 | ||||
| -rw-r--r-- | net-misc/sks/sks-1.1.6_p20200624-r2.ebuild (renamed from net-misc/sks/sks-1.1.6_p20200624-r1.ebuild) | 0 |
3 files changed, 11 insertions, 3 deletions
diff --git a/net-misc/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service index bbc3ba7e2b2d..b48db1add6ff 100644 --- a/net-misc/sks/files/sks-db.service +++ b/net-misc/sks/files/sks-db.service @@ -3,8 +3,13 @@ Description=SKS database thread After=network.target [Service] -ExecStart=/usr/bin/sks db +Environment=SKS_DIR=/var/lib/sks +EnvironmentFile=-/etc/sysconfig/sks +ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} ${SKS_DIR}/SKS ${SKS_DIR}/PTree +ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/* +ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS} User=sks +# WorkingDirectory cannot use a variable WorkingDirectory=/var/lib/sks [Install] diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service index 97ee52ffc0ed..d56731d1c961 100644 --- a/net-misc/sks/files/sks-recon.service +++ b/net-misc/sks/files/sks-recon.service @@ -1,10 +1,13 @@ [Unit] Description=SKS key reconnaissance thread -After=network.target +After=network.target sks-db.service [Service] -ExecStart=/usr/bin/sks recon +Environment=SKS_DIR=/var/lib/sks +EnvironmentFile=-/etc/sysconfig/sks +ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS} User=sks +# WorkingDirectory cannot use a variable WorkingDirectory=/var/lib/sks [Install] diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild index 133ea06cb8e7..133ea06cb8e7 100644 --- a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild +++ b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild |