Merge pull request #3074 from gyr/bugfix/issue-3073

fix issue #3073

Makefile

@@ -24,8 +24,7 @@ install:
 	ln -s $(pkgdatadir)/metrics/access/aggregate.php $(DESTDIR)$(bindir)/osrt-metrics-access-aggregate
 	ln -s $(pkgdatadir)/metrics/access/ingest.php $(DESTDIR)$(bindir)/osrt-metrics-access-ingest
 	cp -R config/* $(DESTDIR)$(sysconfdir)/$(package_name)
-	rm $(DESTDIR)$(sysconfdir)/$(package_name)/logrotate
-	install -Dpm0644 config/logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/$(package_name)
+	install -Dpm0644 slsa/logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/$(package_name)
 	for dir in dashboards datasources ; do ln -s $(pkgdatadir)/metrics/grafana/provisioning/$$dir.yaml \
 	  $(DESTDIR)$(grafana_provisioning_dir)/$$dir/$(package_name).yaml ; done
 	sed -i "s|OSRT_DATA_DIR|$(pkgdatadir)|" \

dist/package/openSUSE-release-tools.spec

@@ -319,13 +319,19 @@ OSC plugin for the staging workflow, see `osc staging --help`.
 
 %build
 %make_build
+%sysusers_generate_pre slsa/osrt-slsa-user.conf %{name} %{name}.conf
 
 %install
 %make_install \
   grafana_provisioning_dir="%{_sysconfdir}/grafana/provisioning" \
   oscplugindir="%{osc_plugin_dir}" \
   VERSION="%{version}"
 
+install -Dpm0644 slsa/osrt-slsa-user.conf %{buildroot}%{_sysusersdir}/%{name}.conf
+
+%pre -f %{name}.pre
+%service_add_pre %{name}.service
+
 %pre announcer
 getent passwd osrt-announcer > /dev/null || \
   useradd -r -m -s /sbin/nologin -c "user for openSUSE-release-tools-announcer" osrt-announcer
@@ -370,9 +376,6 @@ exit 0
 
 %pre slsa-build-service
 %service_add_pre %{services}
-getent passwd osrt-slsa > /dev/null || \
-  useradd -r -d /var/lib/osrt-slsa -s /sbin/nologin -c "user for openSUSE-release-tools-slsa-build-service" osrt-slsa
-exit 0
 
 %post slsa-build-service
 %service_add_post %{services}
@@ -469,6 +472,7 @@ exit 0
 %{_datadir}/%{source_dir}/verify-build-and-generatelists
 %{_datadir}/%{source_dir}/verify-repo-built-successful.py
 %{_sysconfdir}/openSUSE-release-tools/ibsapi
+%{_sysusersdir}/%{name}.conf
 %{_unitdir}/osrt-pkglistgen@.service
 %{_unitdir}/osrt-pkglistgen@.timer
 %{_unitdir}/osrt-relpkggen@.service

slsa/osrt-slsa-user.conf

@@ -0,0 +1,2 @@
+# Type Name ID GECOS [HOME]
+u osrt-slsa - "User for openSUSE SLSA release tool" /var/lib/osrt-slsa