diff --git a/service/coturn/Containerfile b/service/coturn/Containerfile index 12e04a2..aeb0c05 100644 --- a/service/coturn/Containerfile +++ b/service/coturn/Containerfile @@ -1,5 +1,5 @@ -FROM debian:bullseye-slim -ARG VERSION=4.5.2 +FROM debian:bookworm-slim +ARG VERSION=4.6.1 RUN apt-get update -y && apt-get upgrade -y && \ apt-get install -y --no-install-recommends coturn=${VERSION}* gettext ca-certificates diff --git a/service/coturn/quadlet/coturn.container b/service/coturn/quadlet/coturn.container new file mode 100644 index 0000000..c45e892 --- /dev/null +++ b/service/coturn/quadlet/coturn.container @@ -0,0 +1,28 @@ +[Unit] +Description=Coturn TURN/STUN server +Wants=container-build@%N.service container-volume@%N.service +After=container-build@%N.service container-volume@%N.service + +[Container] +ContainerName=%N +EnvironmentFile=%E/coreos-home-server/%N/%N.env +Image=localhost/%N:latest +PublishPort=3478:3478 +PublishPort=3478:3478/udp +PublishPort=3479:3479 +PublishPort=3479:3479/udp +PublishPort=5349:5349 +PublishPort=5349:5349/udp +PublishPort=5350:5350 +PublishPort=5350:5350/udp +PodmanArgs=--publish ${COTURN_RELAY_PORT_MIN}-${COTURN_RELAY_PORT_MAX}:${COTURN_RELAY_PORT_MIN}-${COTURN_RELAY_PORT_MAX}/udp +Volume=%N:/var/lib/%N:z +Volume=letsencrypt:/etc/ssl/private:z,ro + +[Service] +EnvironmentFile=%E/coreos-home-server/%N/%N.env +ExecReload=/bin/podman exec %N sh -c 'kill -USR2 $(pidof turnserver)' +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/service/coturn/spec.bu b/service/coturn/spec.bu index b70f81c..88db3c5 100644 --- a/service/coturn/spec.bu +++ b/service/coturn/spec.bu @@ -4,9 +4,5 @@ storage: trees: - path: /etc/coreos-home-server/coturn local: service/coturn/ - - path: /etc/systemd/system - local: service/coturn/systemd/ -systemd: - units: - - name: coturn.service - enabled: true + - path: /etc/containers/systemd + local: service/coturn/quadlet/ diff --git a/service/coturn/systemd/coturn.service b/service/coturn/systemd/coturn.service deleted file mode 100644 index 22c1d58..0000000 --- a/service/coturn/systemd/coturn.service +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=Coturn TURN/STUN server -Wants=container-build@%N.service container-volume@%N.service -After=container-build@%N.service container-volume@%N.service - -[Service] -Type=notify -NotifyAccess=all -SyslogIdentifier=%N -Restart=on-failure -Environment=PODMAN_SYSTEMD_UNIT=%n -EnvironmentFile=%E/coreos-home-server/%N/%N.env -ExecStart=/bin/podman run --replace --name %N --sdnotify=conmon \ - --env-file %E/coreos-home-server/%N/%N.env \ - --publish 3478:3478 --publish 3478:3478/udp --publish 5349:5349 --publish 5349:5349/udp \ - --publish 3479:3479 --publish 3479:3479/udp --publish 5350:5350 --publish 5350:5350/udp \ - --publish ${COTURN_RELAY_PORT_MIN}-${COTURN_RELAY_PORT_MAX}:${COTURN_RELAY_PORT_MIN}-${COTURN_RELAY_PORT_MAX}/udp \ - --volume %N:/var/lib/%N:z \ - --volume letsencrypt:/etc/ssl/private:z,ro \ - localhost/%N:latest -ExecStop=/bin/podman stop --ignore --time 10 %N -ExecStopPost=/bin/podman rm --ignore --force %N -ExecReload=/bin/podman exec %N sh -c 'kill -USR2 $(pidof turnserver)' - -[Install] -WantedBy=multi-user.target