tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-28 08:04:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix package builds after removal of icinga2-{en,dis}able-feature scripts

Browse Source 
refs #7250
This commit is contained in:
Michael Friedrich 2014-10-14 20:25:53 +02:00
parent 9df1b6bc1c
commit 648f47f931
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/icinga2-common.install vendored
View File

@ -5,7 +5,6 @@ debian/tmp/etc/bash_completion.d
tools/syntax/* usr/share/icinga2-common/syntax tools/syntax/* usr/share/icinga2-common/syntax
usr/bin/icinga2-build* usr/bin/icinga2-build*
usr/bin/icinga2-sign-key usr/bin/icinga2-sign-key
usr/sbin/icinga2-*-feature
usr/sbin/icinga2-list-objects usr/sbin/icinga2-list-objects
usr/sbin/icinga2-*-agent usr/sbin/icinga2-*-agent
usr/sbin/icinga2-list-agents usr/sbin/icinga2-list-agents

11
icinga2.spec
View File

@ -391,7 +391,7 @@ exit 0
%postun ido-mysql %postun ido-mysql
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
# deinstallation of the package - remove feature # deinstallation of the package - remove feature
test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable ido-mysql test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable ido-mysql
fi fi
exit 0 exit 0
@ -408,7 +408,7 @@ exit 0
%postun ido-pgsql %postun ido-pgsql
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
# deinstallation of the package - remove feature # deinstallation of the package - remove feature
test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable ido-pgsql test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable ido-pgsql
fi fi
exit 0 exit 0
@ -425,9 +425,9 @@ exit 0
%postun classicui-config %postun classicui-config
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
# deinstallation of the package - remove feature # deinstallation of the package - remove feature
test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable statusdata test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable statusdata
test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable compatlog test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable compatlog
test -x %{_sbindir}/icinga2 feature disable && %{_sbindir}/icinga2 feature disable command test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable command
fi fi
exit 0 exit 0
@ -483,7 +483,6 @@ exit 0
%{_datadir}/%{name} %{_datadir}/%{name}
%exclude %{_datadir}/%{name}/include %exclude %{_datadir}/%{name}/include
%{_mandir}/man8/%{name}.8.gz %{_mandir}/man8/%{name}.8.gz
%{_mandir}/man8/%{name}-feature enable.8.gz
%{_mandir}/man8/%{name}-build-ca.8.gz %{_mandir}/man8/%{name}-build-ca.8.gz
%{_mandir}/man8/%{name}-build-key.8.gz %{_mandir}/man8/%{name}-build-key.8.gz
%{_mandir}/man8/%{name}-sign-key.8.gz %{_mandir}/man8/%{name}-sign-key.8.gz

2
test/jenkins/livestatus_socket.test
View File

@ -4,7 +4,7 @@ livestatus_path="/var/run/icinga2/cmd/livestatus"
if [ ! -e $livestatus_path ]; if [ ! -e $livestatus_path ];
then then
sudo icinga2-feature enable livestatus 1> /dev/null sudo icinga2 feature enable livestatus 1> /dev/null
sudo service icinga2 restart 1> /dev/null sudo service icinga2 restart 1> /dev/null
sleep 1 sleep 1

2
test/jenkins/statusdata.test
View File

@ -5,7 +5,7 @@ objectscache_path="/var/cache/icinga2/objects.cache"
if [ ! -f $statusdata_path ]; if [ ! -f $statusdata_path ];
then then
sudo icinga2-feature enable statusdata 1> /dev/null sudo icinga2 feature enable statusdata 1> /dev/null
sudo service icinga2 restart 1> /dev/null sudo service icinga2 restart 1> /dev/null
n=0 n=0