WEBDIENSTE/NLnetLabs-krill
1
0
Fork 0
mirror of https://github.com/NLnetLabs/krill.git synced 2026-10-01 22:04:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not include systemd unit files in krillta and krillup (#1313)

Browse Source 
This PR prevents older versions of deb packages from including systemd-unit
files.

Because of the way Krill is set up, this requires both Ubuntu 20.04 and
Debian 11 to have usrmerge (which both have by default, only if upgraded
from an older version it might be missing).
This commit is contained in:
Koen van Hove
2025-08-11 13:55:32 +02:00
committed by GitHub
parent 26dabddea5
commit 321d384a54
10 changed files with 9 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
-8
View File
@@ -236,16 +236,9 @@ assets = [
# OpenSSL >= 1.1.0.
# b) uses a simpler systemd service unit file because Ubuntu 16.04 doesn't
# support newer features supported by Ubuntu 18.04 and 20.04.
[package.metadata.deb.variants.ubuntu-focal]
systemd-units = { unit-name = "krill", unit-scripts = "pkg/common", enable = false, usr-merge = false }
[package.metadata.deb.variants.ubuntu-jammy]
systemd-units = { unit-name = "krill", unit-scripts = "pkg/common", enable = false, usr-merge = false }
depends = "$auto, passwd, libssl3"
[package.metadata.deb.variants.debian-bullseye]
systemd-units = { unit-name = "krill", unit-scripts = "pkg/common", enable = false, usr-merge = false }
[package.metadata.deb.variants.debian-bookworm]
depends = "$auto, passwd, libssl3"
@@ -260,7 +253,6 @@ depends = "$auto, passwd, libssl3"
# on the target platform and so it cannot determine the dependencies correctly
# for us.
[package.metadata.deb.variants.debian-bullseye-armv7-unknown-linux-gnueabihf]
systemd-units = { unit-name = "krill", unit-scripts = "pkg/common", enable = false, usr-merge = false }
depends = "adduser, passwd, libc6 (>= 2.28), libssl1.1"
# END DEBIAN PACKAGING
pkg/common/krill-debian-buster-aarch64-unknown-linux-gnu.krill.service
-1
View File
@@ -1 +0,0 @@
krill-debian-buster.krill.service
pkg/common/krill-debian-buster-arm-unknown-linux-gnueabihf.krill.service
-1
View File
@@ -1 +0,0 @@
krill-debian-buster.krill.service
pkg/common/krill-debian-buster.krill.service
-1
View File
@@ -1 +0,0 @@
krill-ubuntu-bionic.krill.service
pkg/common/krill-debian-stretch.krill.service
-1
View File
@@ -1 +0,0 @@
krill-ubuntu-xenial.krill.service
pkg/common/krill-debian-trixie-x86_64.krill.service
Symlink
+1
View File
@@ -0,0 +1 @@
krill-ubuntu-focal.krill.service
pkg/common/krill-ubuntu-bionic.krill.service
-34
View File
@@ -1,34 +0,0 @@
[Unit]
Description=Krill
Documentation=man:krill(1)
After=network.target
[Service]
ExecStart=/usr/bin/krill --config=/etc/krill.conf
Type=simple
Restart=on-failure
User=krill
AmbientCapabilities=CAP_NET_BIND_SERVICE
CapabilityBoundingSet=CAP_NET_BIND_SERVICE
LockPersonality=yes
MemoryDenyWriteExecute=yes
PrivateDevices=yes
PrivateTmp=yes
ProtectControlGroups=yes
ProtectHome=yes
ProtectKernelModules=yes
ProtectKernelTunables=yes
ProtectSystem=strict
ReadWritePaths=/var/lib/krill/
RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
RestrictNamespaces=yes
RestrictRealtime=yes
StateDirectory=krill
SystemCallArchitectures=native
SystemCallErrorNumber=EPERM
RestartSec=10
StartLimitInterval=10m
StartLimitBurst=5
[Install]
WantedBy=multi-user.target
pkg/common/krill-ubuntu-xenial.krill.service
-17
View File
@@ -1,17 +0,0 @@
[Unit]
Description=Krill
Documentation=man:krill(1)
After=network.target
[Service]
ExecStart=/usr/bin/krill --config=/etc/krill.conf
Type=simple
Restart=on-failure
User=krill
RestartSec=10
StartLimitInterval=10m
StartLimitBurst=5
WorkingDirectory=/var/lib/krill
[Install]
WantedBy=multi-user.target
pkg/rules/packages-to-build.yml
+8 -17
View File
@@ -39,29 +39,20 @@ include:
- image: "almalinux:10"
rpm_systemd_service_unit_file: "pkg/common/krill-ubuntu-focal.krill.service"
- image: "debian:bullseye"
deb_extra_lintian_args: "--suppress-tags systemd-service-file-outside-lib"
- image: "ubuntu:focal"
deb_extra_lintian_args: "--suppress-tags systemd-service-file-outside-lib"
# package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bullseye upon which
# Raspbian 11 is based.
- pkg: "krill"
image: "debian:bullseye"
target: "armv7-unknown-linux-gnueabihf"
deb_extra_lintian_args: "--suppress-tags systemd-service-file-outside-lib"
- pkg: "krillup"
image: "debian:bullseye"
target: "armv7-unknown-linux-gnueabihf"
deb_extra_lintian_args: "--suppress-tags systemd-service-file-outside-lib"
# package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
# Raspbian 10 is based.
- pkg: "krill"
image: "debian:buster"
target: "arm-unknown-linux-gnueabihf"
- pkg: "krillup"
image: "debian:buster"
target: "arm-unknown-linux-gnueabihf"
# package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is
# based.
- pkg: "krill"
image: "debian:buster"
target: "aarch64-unknown-linux-gnu"
- pkg: "krillup"
image: "debian:buster"
target: "aarch64-unknown-linux-gnu"
pkg/rules/packages-to-test.yml
-18
View File
@@ -48,24 +48,6 @@ include:
image: "debian:bullseye"
target: "armv7-unknown-linux-gnueabihf"
# package for the Raspberry Pi 1b as an ARMv6 cross compiled variant of the Debian Buster upon which
# Raspbian 10 is based.
- pkg: "krill"
image: "debian:buster"
target: "arm-unknown-linux-gnueabihf"
- pkg: "krillup"
image: "debian:buster"
target: "arm-unknown-linux-gnueabihf"
# package for the ROCK64 as an AARCH64 cross compiled variant of Debian Buster upon which Armbian 21 is
# based.
- pkg: "krill"
image: "debian:buster"
target: "aarch64-unknown-linux-gnu"
- pkg: "krillup"
image: "debian:buster"
target: "aarch64-unknown-linux-gnu"
# Exclude upgrade testing on Ubuntu Noble as no prior released versions exist to upgrade from.
exclude:
- image: "almalinux:9"