yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create SLSA user (osrt-slsa) on specfile like others osrt-* users

Browse Source 
and remove logrotate file
This commit is contained in:
Gustavo Yokoyama Ribeiro 2024-02-16 18:35:08 -03:00
parent 33d56465c9
commit d380b44f52
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -10,9 +10,6 @@ VERSION = "build-$(shell date +%F)"
all:
build:
%sysusers_generate_pre config/sysusers $(package_name) $(package_name).conf
install:
install -d -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(unitdir) $(DESTDIR)$(oscplugindir) $(DESTDIR)$(sysconfdir)/$(package_name) $(DESTDIR)$(grafana_provisioning_dir)/dashboards $(DESTDIR)$(grafana_provisioning_dir)/datasources $(DESTDIR)$(logdir)/$(package_name) $(DESTDIR)$(varlibdir)/osrt-slsa/pkglistgen $(DESTDIR)$(varlibdir)/osrt-slsa/relpkggen
for i in $(pkgdata_SCRIPTS); do install -m 755 $$i $(DESTDIR)$(pkgdatadir); done
@ -27,8 +24,8 @@ 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 config/$(package_name).conf $(DESTDIR)$(sysusersdir)/$(package_name).conf
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)|" \

1
Makefile.common
View File

@ -11,4 +11,3 @@ apachevhostsdir=$(sysconfdir)/apache2/vhosts.d
tmpfilesdir=$(prefix)/lib/tmpfiles.d
logdir=/var/log
varlibdir=/var/lib
sysusersdir=$(prefixi)/lib/sysusers.d

2
config/sysusers
View File

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

7
dist/package/openSUSE-release-tools.spec vendored
View File

@ -326,9 +326,6 @@ OSC plugin for the staging workflow, see `osc staging --help`.
oscplugindir="%{osc_plugin_dir}" \
VERSION="%{version}"
%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
@ -373,6 +370,9 @@ 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,7 +469,6 @@ 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