From 0b09234607d898d247797d5c581cd9d19609ebc1 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 21 May 2021 14:10:01 +0200 Subject: [PATCH] Ensure `/var/lib/icingaweb2` is available --- icingaweb2.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/icingaweb2.spec b/icingaweb2.spec index d24061c..878806d 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -88,6 +88,7 @@ Requires: %{name}-vendor-Parsedown = %{version}-%{release} %define basedir %{_datadir}/%{name} %define bindir %{_bindir} +%define storagedir %{_sharedstatedir}/%{name} %define configdir %{_sysconfdir}/%{name} %define logdir %{_localstatedir}/log/%{name} %define phpdir %{_datadir}/php @@ -256,7 +257,7 @@ cd - %install rm -rf %{buildroot} -mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}} +mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules,%{storagedir},%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}} cp -prv application doc %{buildroot}/%{basedir} cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules @@ -316,6 +317,7 @@ rm -rf %{buildroot} %dir %{wwwconfigdir} %endif %config(noreplace) %{wwwconfigdir}/icingaweb2.conf +%attr(2770,root,%{icingawebgroup}) %dir %{storagedir} %attr(2775,root,%{icingawebgroup}) %dir %{logdir} %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup %attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup/config.ini @@ -366,6 +368,8 @@ done %{_sbindir}/restorecon -R %{basedir} &> /dev/null || : %{_sbindir}/restorecon -R %{configdir} &> /dev/null || : %{_sbindir}/restorecon -R %{logdir} &> /dev/null || : +%{_sbindir}/restorecon -R %{storagedir} &> /dev/null || : + %postun selinux if [ $1 -eq 0 ] ; then @@ -376,6 +380,7 @@ if [ $1 -eq 0 ] ; then [ -d %{basedir} ] && %{_sbindir}/restorecon -R %{basedir} &> /dev/null || : [ -d %{configdir} ] && %{_sbindir}/restorecon -R %{configdir} &> /dev/null || : [ -d %{logdir} ] && %{_sbindir}/restorecon -R %{logdir} &> /dev/null || : + [ -d %{storagedir} ] && %{_sbindir}/restorecon -R %{storagedir} &> /dev/null || : fi %files selinux