Accepting request 1198843 from server:mail

- Update to release 10

OBS-URL: https://build.opensuse.org/request/show/1198843
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/system-user-grommunio?expand=0&rev=3

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1725488890
+commit: ca3fb1fb09c286b35eb1f6680d18f8219545a1b1b08ea99f0ba08efef0d4ad05
+url: https://src.opensuse.org/jengelh/system-user-grommunio
+revision: master

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2229b70186e7b7506f9433189ffe77c8453d8959419b488b9fbc00ff8e850b3f
+size 256

debian.control

@@ -6,11 +6,24 @@ Standards-Version: 4.5.0
 
 Package: system-user-grommunio
 Architecture: all
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: adduser, passwd, ${misc:Pre-Depends}
-Depends: adduser, ${misc:Depends}
+Depends: ${misc:Depends}
-Provides: system-user-groweb
+Provides: system-group-groindex, system-group-grommunio,
+ system-group-groweb, system-group-gromoxcf,
+ system-user-grommunio, system-user-groindex, system-user-groweb
+# gromoxcf provided by more than one package -- intentional
 Replaces: system-user-groweb
-Conflicts: system-user-groweb
+Breaks: system-user-groweb
-Description: System user and group grommunio
+Description: General grommunio system user identities
  .
- This package provides the grommunio account.
+ This package provides identities related to the Grommunio groupware suite:
+ * the "grommunio" user identity for running the Administration API
+   (usually an uwsgi process instance); AAPI needs to read
+   mysql_adaptor.cfg and ldap_adaptor.cfg, so is added to group
+   gromoxcf
+ * the "groweb" user identity for running PHP-FPM workers
+ * the "groweb" group identity for marking data to be consumed by the
+   groweb identity but also created by grommunio-index, e.g. groweb
+   search indexes
+ * the "groindex" user identity for running the indexer service; this
+   needs to read mysql_adaptor.cfg so is added to group gromoxcf

debian.rules

@@ -1,3 +1,13 @@
 #!/usr/bin/make -f
+sudir = usr/lib/sysusers.d
+sufile = ${sudir}/system-user-grommunio.conf
 %:
 	dh $@ --parallel
+override_dh_auto_install:
+	mkdir -p ${sudir}
+	echo 'u grommunio - "user for grommunio administration"' >${sufile}
+	echo 'u groweb - "user for grommunio-web"' >>${sufile}
+	echo 'u groindex - "user for grommunio-index"' >>${sufile}
+	echo 'm grommunio gromoxcf' >>${sufile}
+	echo 'm groindex groweb' >>${sufile}
+	echo 'm groindex gromoxcf' >>${sufile}

debian.system-user-grommunio.install

@@ -0,0 +1 @@
+usr/

debian.system-user-grommunio.postinst

@@ -1,7 +1,16 @@
 #!/bin/sh
-getent group grommunio >/dev/null || addgroup --system grommunio
+case "$1" in
-getent passwd grommunio >/dev/null || \
+configure|reconfigure)
-	adduser --system grommunio --home / --no-create-home --disabled-password --ingroup grommunio
+	if [ -x /usr/bin/systemd-sysusers ]; then
-getent group groweb >/dev/null || addgroup --system groweb
+		/usr/bin/systemd-sysusers system-user-grommunio.conf
-getent passwd groweb >/dev/null || \
+	else
-	adduser --system groweb --home / --no-create-home --disabled-password --ingroup groweb
+		for i in grommunio groweb groindex; do
+			getent group "$i" >/dev/null || addgroup --system "$i"
+			getent passwd "$i" >/dev/null || \
+				adduser --system "$i" --home / --no-create-home --disabled-password --ingroup "$i"
+		done
+		usermod grommunio -aG gromoxcf
+		usermod groindex -aG gromoxcf
+	fi
+	;;
+esac

system-user-grommunio.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep  4 19:24:10 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 10
+  * Switch to sysusers mechanism
+
+-------------------------------------------------------------------
+Tue Jun  4 08:03:16 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7
+  * New "groindex" user. Updated package descriptions.
+
 -------------------------------------------------------------------
 Tue Jan 17 15:45:41 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

system-user-grommunio.conf

@@ -0,0 +1,7 @@
+u grommunio - "user for grommunio administration"
+u groweb - "user for grommunio-web"
+u groindex - "user for grommunio-index"
+g gromoxcf
+m grommunio gromoxcf
+m groindex groweb
+m groindex gromoxcf

system-user-grommunio.dsc

@@ -1,7 +1,7 @@
 Format: 1.0
 Source: system-user-grommunio
 Architecture: all
-Version: 3
+Version: 9
 Maintainer: Grommunio <null@grommunio.com>
 Homepage: https://grommunio.com
 Standards-Version: 3.9.4

system-user-grommunio.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package system-user-grommunio
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,14 @@
 
 
 Name:           system-user-grommunio
-Version:        3
+Version:        10
 Release:        0
-Summary:        System users and groups for grommunio
+Summary:        General grommunio system user identities
 License:        MIT
 Group:          System/Fhs
 URL:            https://grommunio.com/
-Source:         dummy_for_debtransform.tgz
+Source:         system-user-grommunio.conf
+Source2:        dummy_for_debtransform.tgz
 BuildArch:      noarch
 BuildRequires:  systemd-rpm-macros
 Obsoletes:      system-user-groweb < %version-%release
@@ -32,39 +33,37 @@ Provides:       system-user-groweb = %version-%release
 BuildRequires:  sysuser-tools
 %sysusers_requires
 %else
-Provides:       group(grommunio)
-Provides:       group(groweb)
-Provides:       user(grommunio)
-Provides:       user(groweb)
 Requires(pre):  /usr/sbin/useradd
 Requires(pre):  /usr/sbin/groupadd
 %endif
 
 %description
-This package provides the system accounts for grommunio.
+This package provides identities related to the Grommunio groupware suite:
+* the "grommunio" user identity for running the Administration API
+  (usually an uwsgi process instance); AAPI needs to read
+  mysql_adaptor.cfg and ldap_adaptor.cfg, so is added to group
+  gromoxcf
+* the "groweb" user identity for running PHP-FPM workers
+* the "groweb" group identity for marking data to be consumed by the
+  groweb identity but also created by grommunio-index, e.g. groweb
+  search indexes
+* the "groindex" user identity for running the indexer service; this
+  needs to read mysql_adaptor.cfg so is added to group gromoxcf
 
 %prep
 
 %build
-echo 'u grommunio - "user for grommunio administration"' >u.conf
-echo 'u groweb - "user for grommunio-web"' >>u.conf
-%if 0%{?suse_version}
-%sysusers_generate_pre u.conf user system-user-grommunio.conf
-%else
 >user.pre
+%if 0%{?suse_version}
+%sysusers_generate_pre %_sourcedir/system-user-grommunio.conf user system-user-grommunio.conf
 %endif
 
 %install
-install -Dpm0644 u.conf "%buildroot/%_sysusersdir/system-user-grommunio.conf"
+install -Dpm0644 %_sourcedir/system-user-grommunio.conf "%buildroot/%_sysusersdir/system-user-grommunio.conf"
 
 %pre -f user.pre
-%if !0%{?suse_version}
+%if 0%{?rhel} || 0%{?fedora_version}
-getent group grommunio >/dev/null || %_sbindir/groupadd -r grommunio
+%sysusers_create_compat %_sourcedir/system-user-grommunio.conf
-getent passwd grommunio >/dev/null || %_sbindir/useradd -g grommunio -s /sbin/nologin \
-	-r -c "user for grommunio administration" -d / grommunio
-getent group groweb >/dev/null || %_sbindir/groupadd -r groweb
-getent passwd groweb >/dev/null || %_sbindir/useradd -g groweb -s /sbin/nologin \
-	-r -c "user for grommunio-web" -d / groweb
 %endif
 
 %files