tyler.durden
/
rpm-icingaweb2
mirror of https://git.icinga.com/packaging/rpm-icingaweb2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rpm/snapshot' into rpm/icingaweb2-fix-apache-fpm-config

This commit is contained in:
Markus Frosch 2017-11-28 13:43:59 +01:00 committed by GitHub
parent fb9d3258a4 f782f0f49e
commit f09d2c5d46
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
icingaweb2.spec
View File

@ -259,7 +259,7 @@ cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completi
cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules
cp -prv library/Icinga %{buildroot}/%{phpdir}
cp -prv library/vendor/{dompdf,HTMLPurifier*,JShrink,lessphp,Parsedown,Zend} %{buildroot}/%{basedir}/library/vendor
cp -prv public/{css,font,img,js,error_norewrite.html} %{buildroot}/%{basedir}/public
cp -prv public/{css,font,img,js,error_norewrite.html,error_unavailable.html} %{buildroot}/%{basedir}/public
%if 0%{?php_fpm:1}
cp -pv packages/files/apache/icingaweb2.fpm.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf
%else
@ -415,6 +415,7 @@ fi
%changelog
* Tue Nov 28 2017 Eric Lippmann <eric.lippmann@icinga.com> 2.5.0-1
- Install error_unavailable.html
- Add patch to fix Apache FPM config
* Mon Nov 27 2017 Markus Frosch <markus.frosch@icinga.com> 2.5.0-1