icinga2: Fix systemd limit config location

This commit is contained in:
Markus Frosch 2017-10-02 11:04:24 +02:00
parent f0e2af1c62
commit 3366a4cb04

View File

@ -417,8 +417,8 @@ install -D -m 0644 etc/icinga/icinga-classic-apache.conf %{buildroot}%{apachecon
# install custom limits.conf for systemd # install custom limits.conf for systemd
%if 0%{?configure_systemd_limits} %if 0%{?configure_systemd_limits}
# for > 2.8 or > 2.7.2 # for > 2.8 or > 2.7.2
#install -D -m 0644 etc/initsystem/icinga2.service.limits.conf %%{buildroot}%%{_userunitdir}/%%{name}.service.d/limits.conf #install -D -m 0644 etc/initsystem/icinga2.service.limits.conf %%{buildroot}/etc/systemd/system/%%{name}.service.d/limits.conf
install -D -m 0644 %{SOURCE1} %{buildroot}%{_userunitdir}/%{name}.service.d/limits.conf install -D -m 0644 %{SOURCE1} %{buildroot}/etc/systemd/system/%{name}.service.d/limits.conf
%endif %endif
# remove features-enabled symlinks # remove features-enabled symlinks
@ -739,7 +739,7 @@ fi
%if 0%{?use_systemd} %if 0%{?use_systemd}
%attr(644,root,root) %{_unitdir}/%{name}.service %attr(644,root,root) %{_unitdir}/%{name}.service
%if 0%{?configure_systemd_limits} %if 0%{?configure_systemd_limits}
%attr(644,root,root) %{_userunitdir}/%{name}.service.d/limits.conf %attr(644,root,root) /etc/systemd/system/%{name}.service.d/limits.conf
%endif %endif
%else %else
%attr(755,root,root) %{_sysconfdir}/init.d/%{name} %attr(755,root,root) %{_sysconfdir}/init.d/%{name}