diff --git a/debian.rules b/debian.rules index 953462f..1f0fbb5 100644 --- a/debian.rules +++ b/debian.rules @@ -1,3 +1,11 @@ #!/usr/bin/make -f %: dh $@ --parallel +sudir = usr/lib/sysusers.d +sufile = ${sudir}/system-user-gromox.conf +override_dh_auto_install: + mkdir -p ${sudir} + echo 'g gromox -' >${sufile} + echo 'g gromoxcf -' >>${sufile} + echo 'u gromox - "Gromox services"' >>${sufile} + echo 'm gromox gromoxcf' >>${sufile} diff --git a/debian.system-user-gromox.install b/debian.system-user-gromox.install index 473a0f4..2e6dbc0 100644 --- a/debian.system-user-gromox.install +++ b/debian.system-user-gromox.install @@ -0,0 +1 @@ +usr/ diff --git a/debian.system-user-gromox.postinst b/debian.system-user-gromox.postinst index 0cbf6d4..eed5fa2 100644 --- a/debian.system-user-gromox.postinst +++ b/debian.system-user-gromox.postinst @@ -1,6 +1,14 @@ #!/bin/sh -getent group gromox >/dev/null || addgroup --system gromox -getent group gromoxcf >/dev/null || addgroup --system gromoxcf -getent passwd gromox >/dev/null || \ - adduser --system gromox --home /var/lib/gromox --no-create-home --disabled-password --ingroup gromox -usermod gromox -aG gromoxcf +case "$1" in +configure|reconfigure) + if [ -x /usr/bin/systemd-sysusers ]; then + /usr/bin/systemd-sysusers system-user-gromox.conf + else + getent group gromox >/dev/null || addgroup --system gromox + getent group gromoxcf >/dev/null || addgroup --system gromoxcf + getent passwd gromox >/dev/null || \ + adduser --system gromox --home /var/lib/gromox --no-create-home --disabled-password --ingroup gromox + usermod gromox -aG gromoxcf + fi + ;; +esac diff --git a/system-user-gromox.changes b/system-user-gromox.changes index 9ed4262..e66a6ba 100644 --- a/system-user-gromox.changes +++ b/system-user-gromox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 4 19:28:11 UTC 2024 - Jan Engelhardt + +- Update to release 9 + * Switch to sysusers mechanism on Debian as well + ------------------------------------------------------------------- Tue Jun 4 08:06:05 UTC 2024 - Jan Engelhardt diff --git a/system-user-gromox.dsc b/system-user-gromox.dsc index 15c9111..e716e56 100644 --- a/system-user-gromox.dsc +++ b/system-user-gromox.dsc @@ -1,7 +1,7 @@ Format: 1.0 Source: system-user-gromox Architecture: all -Version: 6 +Version: 9 Maintainer: Gromox Homepage: https://grommunio.com Standards-Version: 3.9.4 diff --git a/system-user-gromox.spec b/system-user-gromox.spec index dffc585..fb3f2d3 100644 --- a/system-user-gromox.spec +++ b/system-user-gromox.spec @@ -17,7 +17,7 @@ Name: system-user-gromox -Version: 7 +Version: 9 Release: 0 Summary: System user and group gromox License: MIT @@ -46,10 +46,6 @@ This package provides: %prep %build -# The conf file is provided by system-user-gromox rather than -# gromox.spec so that e.g. grommunio-admin-api does not grow a -# BuildRequire on gromox (wait times). -# >user.pre %if 0%{?suse_version} %sysusers_generate_pre %_sourcedir/system-user-gromox.conf user system-user-gromox.conf