Linux: Don't create user for systemd units use DynamicUser

Signed-off-by: Björn Bidar <[email protected]>

davmail.spec

@@ -132,10 +132,11 @@ install -m 0644 src/appstream/org.davmail.DavMail.appdata.xml $RPM_BUILD_ROOT%{_
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+%if 0%{!?systemd_macros:1}
 /usr/sbin/groupadd -f -r davmail > /dev/null 2>&1 || :
 /usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/davmail -M \
                   -g davmail davmail > /dev/null 2>&1 || :
-%if %systemd_macros
+%else
 %service_add_pre davmail.service
 %endif
 
@@ -230,6 +231,7 @@ fi
 - Create initial log file with systemd-tmpfiles
 - Harden systemd service
 - Add systemd system sevice template unit
+- Don't create user for systemd units use DynamicUser
 
 * Wed Jul 07 2021 Michal Suchanek <[email protected]>
 - Tumbleweed no longer supports init.d services and fails build when installed

src/init/davmail.service

@@ -8,6 +8,7 @@ After=network.target
 [Service]
 Type=simple
 User=davmail
+DynamicUser=yes
 PermissionsStartOnly=true
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 ExecStart=/usr/bin/davmail -server /etc/davmail.properties

src/init/davmail@.service

@@ -8,6 +8,7 @@ After=network.target
 [Service]
 Type=simple
 User=davmail
+DynamicUser=yes
 PermissionsStartOnly=true
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 ExecStart=/usr/bin/davmail -server /etc/davmail/%i.properties