-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3074 from gyr/bugfix/issue-3073
fix issue #3073
- Loading branch information
Showing
4 changed files
with
10 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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}/[email protected] | ||
%{_unitdir}/[email protected] | ||
%{_unitdir}/[email protected] | ||
|
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# Type Name ID GECOS [HOME] | ||
u osrt-slsa - "User for openSUSE SLSA release tool" /var/lib/osrt-slsa |