Update icinga2 and icingaweb2

Also add diff scripts
This commit is contained in:
Markus Frosch 2017-05-23 17:00:24 +02:00
parent fd860466be
commit bc59dc757c
2 changed files with 15 additions and 5 deletions

7
diff Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
set -e
curl -LsS --output icinga2.spec~ "https://raw.githubusercontent.com/Icinga/icinga2/master/icinga2.spec"
diff -Nau icinga2.spec{,~}

View File

@ -393,7 +393,7 @@ do
done
cd -
#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
%endif
%if 0%{?fedora}
@ -469,10 +469,13 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s
%fillup_and_insserv %{name}
%endif
# initial installation, enable default features
for feature in checker notification mainlog; do
ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
done
if [ ${1:-0} -eq 1 ]
then
# initial installation, enable default features
for feature in checker notification mainlog; do
ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
done
fi
exit 0