%define revision 1
+# make sure that _rundir is working on older systems
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
+
%if "%{_vendor}" == "redhat"
-%define el5_boost_version 141
-%define el5_boost_libs %{_libdir}/boost%{el5_boost_version}
-%define el5_boost_includes /usr/include/boost%{el5_boost_version}
%define apachename httpd
%define apacheconfdir %{_sysconfdir}/httpd/conf.d
%define apacheuser apache
%endif
%if "%{_vendor}" == "suse"
+%define apachename apache2
+%define apacheconfdir %{_sysconfdir}/apache2/conf.d
+%define apacheuser wwwrun
+%define apachegroup www
%if 0%{?suse_version} >= 1310
%define use_systemd 1
-%define opensuse_boost_version 1_53_0
%else
%define use_systemd 0
-%define opensuse_boost_version 1_49_0
%endif
-%define sles_boost_version 1_54_0
-%define apachename apache2
-%define apacheconfdir %{_sysconfdir}/apache2/conf.d
-%define apacheuser wwwrun
-%define apachegroup www
%endif
%define icinga_user icinga
Summary: Network monitoring application
Name: icinga2
-Version: 2.0.1
+Version: 2.1.1
Release: %{revision}%{?dist}
License: GPL-2.0+
Group: Applications/System
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
URL: http://www.icinga.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-Requires: %{name}-bin = %{version}
-#Requires: %{name}-ido-mysql = %{version}
-#Requires: %{icingaweb2name} >= %{icingaweb2version}
+Requires: %{name}-bin = %{version}-%{release}
%description
Meta package for Icinga 2 Core, DB IDO and Web.
Group: Applications/System
%if "%{_vendor}" == "suse"
-PreReq: permissions
+PreReq: permissions
+Provides: monitoring_daemon
+Recommends: monitoring-plugins
%endif
BuildRequires: openssl-devel
BuildRequires: gcc-c++
BuildRequires: bison
BuildRequires: make
-# redhat
-%if "%{_vendor}" == "redhat"
-%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
+%if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5")
# el5 requires EPEL
-BuildRequires: boost%{el5_boost_version}-devel
-BuildRequires: boost%{el5_boost_version}
-Requires: boost%{el5_boost_version}-program-options
-Requires: boost%{el5_boost_version}-system
-Requires: boost%{el5_boost_version}-test
-Requires: boost%{el5_boost_version}-thread
-Requires: boost%{el5_boost_version}-regex
+BuildRequires: boost141-devel
%else
BuildRequires: boost-devel >= 1.41
-Requires: boost-program-options >= 1.41
-Requires: boost-system >= 1.41
-Requires: boost-test >= 1.41
-Requires: boost-thread >= 1.41
-Requires: boost-regex >= 1.41
-%endif
-%endif
-#redhat
-
-# suse
-%if "%{_vendor}" == "suse"
-# sles
-# note: sles_version macro is not set in SLES11 anymore
-# note: sles service packs are not under version control
-%if 0%{?suse_version} == 1110
-BuildRequires: gcc-fortran
-BuildRequires: libgfortran43
-BuildRequires: boost-license%{sles_boost_version}
-BuildRequires: boost-devel >= 1.41
-Requires: boost-license%{sles_boost_version}
-Requires: libboost_program_options%{sles_boost_version}
-Requires: libboost_system%{sles_boost_version}
-Requires: libboost_test%{sles_boost_version}
-Requires: libboost_thread%{sles_boost_version}
-Requires: libboost_regex%{sles_boost_version}
-%endif
-# opensuse
-%if 0%{?suse_version} >= 1210
-BuildRequires: boost-devel >= 1.41
-Requires: libboost_program_options%{opensuse_boost_version}
-Requires: libboost_system%{opensuse_boost_version}
-Requires: libboost_test%{opensuse_boost_version}
-Requires: libboost_thread%{opensuse_boost_version}
-Requires: libboost_regex%{opensuse_boost_version}
%endif
-%endif
-# suse
%if 0%{?use_systemd}
BuildRequires: systemd
Requires: systemd
%endif
-Requires: %{name}-common = %{version}
+Requires: %{name}-common = %{version}-%{release}
%description bin
Icinga 2 is a general-purpose network monitoring application.
%if "%{_vendor}" == "suse"
BuildRequires: libmysqlclient-devel
%endif
-%if "%{_vendor}" == "redhat"
-# el5 only provides mysql package
-%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
-BuildRequires: mysql
-%else
-BuildRequires: mysql-libs
-BuildRequires: mysql
-%endif
BuildRequires: mysql-devel
-Requires: mysql
-%endif
Requires: %{name} = %{version}-%{release}
%description ido-mysql
Summary: IDO PostgreSQL database backend for Icinga 2
Group: Applications/System
BuildRequires: postgresql-devel
-Requires: postgresql-libs
Requires: %{name} = %{version}-%{release}
%description ido-pgsql
BuildRequires: %{apachename}
Requires: %{apachename}
Requires: %{name} = %{version}-%{release}
+%if "%{_vendor}" == "suse"
+Recommends: icinga-www
+%endif
Provides: icinga-classicui-config
Conflicts: icinga-gui-config
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DICINGA2_RUNDIR=%{_rundir} \
-DICINGA2_USER=%{icinga_user} \
-DICINGA2_GROUP=%{icinga_group} \
- -DICINGA2_COMMAND_USER=%{icinga_user} \
- -DICINGA2_COMMAND_GROUP=%{icingacmd_group}"
+ -DICINGA2_COMMAND_GROUP=%{icingacmd_group} \
+ -DICINGA2_UNITY_BUILD=TRUE"
%if "%{_vendor}" == "redhat"
%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
# Boost_VERSION 1.41.0 vs 101400 - disable build tests
make %{?_smp_mflags}
-rm -f components/db_ido_*sql/schema/upgrade/.gitignore
%install
-[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
make install \
DESTDIR="%{buildroot}"
%if "%{_vendor}" == "suse"
%verifyscript bin
-%verify_permissions -e /var/run/icinga2/cmd
+%verify_permissions -e %{_rundir}/%{name}/cmd
%endif
%endif
%endif
+%post common
+/usr/share/icinga2/migrate-hosts
# all restart/feature actions belong to icinga2-bin
%post bin
# suse
-%if 0%{?suse_version}
+%if "%{_vendor}" == "suse"
%if 0%{?suse_version} >= 1310
-%set_permissions /var/run/icinga2/cmd
+%set_permissions %{_rundir}/%{name}/cmd
%endif
%if 0%{?use_systemd}
%fillup_only %{name}
%endif
# initial installation, enable default features
-%{_sbindir}/icinga2-enable-feature checker notification mainlog
+%{_sbindir}/icinga2 feature enable checker notification mainlog
exit 0
if [ ${1:-0} -eq 1 ]
then
# initial installation, enable default features
- %{_sbindir}/icinga2-enable-feature checker notification mainlog
+ %{_sbindir}/icinga2 feature enable checker notification mainlog
fi
exit 0
%postun bin
# suse
-%if 0%{?suse_version}
+%if "%{_vendor}" == "suse"
%if 0%{?using_systemd}
%service_del_postun %{name}.service
%else
%preun bin
# suse
-%if 0%{?suse_version}
+%if "%{_vendor}" == "suse"
%if 0%{?use_systemd}
%service_del_preun %{name}.service
if [ ${1:-0} -eq 1 ]
then
# initial installation, enable ido-mysql feature
- %{_sbindir}/icinga2-enable-feature ido-mysql
+ %{_sbindir}/icinga2 feature enable ido-mysql
fi
exit 0
%postun ido-mysql
if [ "$1" = "0" ]; then
# deinstallation of the package - remove feature
- test -x %{_sbindir}/icinga2-disable-feature && %{_sbindir}/icinga2-disable-feature ido-mysql
+ test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable ido-mysql
fi
exit 0
if [ ${1:-0} -eq 1 ]
then
# initial installation, enable ido-pgsql feature
- %{_sbindir}/icinga2-enable-feature ido-pgsql
+ %{_sbindir}/icinga2 feature enable ido-pgsql
fi
exit 0
%postun ido-pgsql
if [ "$1" = "0" ]; then
# deinstallation of the package - remove feature
- test -x %{_sbindir}/icinga2-disable-feature && %{_sbindir}/icinga2-disable-feature ido-pgsql
+ test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable ido-pgsql
fi
exit 0
if [ ${1:-0} -eq 1 ]
then
# initial installation, enable features
- %{_sbindir}/icinga2-enable-feature statusdata compatlog command
+ %{_sbindir}/icinga2 feature enable statusdata compatlog command
fi
exit 0
%postun classicui-config
if [ "$1" = "0" ]; then
# deinstallation of the package - remove feature
- test -x %{_sbindir}/icinga2-disable-feature && %{_sbindir}/icinga2-disable-feature statusdata
- test -x %{_sbindir}/icinga2-disable-feature && %{_sbindir}/icinga2-disable-feature compatlog
- test -x %{_sbindir}/icinga2-disable-feature && %{_sbindir}/icinga2-disable-feature command
+ test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable statusdata
+ test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable compatlog
+ test -x %{_sbindir}/icinga2 && %{_sbindir}/icinga2 feature disable command
fi
exit 0
%files bin
%defattr(-,root,root,-)
-%doc COPYING COPYING.Exceptions README NEWS AUTHORS ChangeLog
+%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
%if 0%{?use_systemd}
%attr(644,root,root) %{_unitdir}/%{name}.service
%else
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/conf.d/hosts/localhost
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-available
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-enabled
+%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/repository.d
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/scripts
+%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/repository.d
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/zones.d
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/init.conf
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/constants.conf
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.conf
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/*.conf
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/hosts/*.conf
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/hosts/localhost/*.conf
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/*.conf
+%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/repository.d/*
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.d/*
%config(noreplace) %{_sysconfdir}/%{name}/scripts/*
%{_sbindir}/%{name}
-%{_bindir}/%{name}-build-ca
-%{_bindir}/%{name}-build-key
-%{_bindir}/%{name}-sign-key
-%{_sbindir}/%{name}-enable-feature
-%{_sbindir}/%{name}-disable-feature
%{_sbindir}/%{name}-prepare-dirs
%exclude %{_libdir}/%{name}/libdb_ido_mysql*
%exclude %{_libdir}/%{name}/libdb_ido_pgsql*
%{_libdir}/%{name}
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/include
+%exclude %{_datadir}/%{name}/migrate-hosts
%{_mandir}/man8/%{name}.8.gz
-%{_mandir}/man8/%{name}-enable-feature.8.gz
-%{_mandir}/man8/%{name}-disable-feature.8.gz
-%{_mandir}/man8/%{name}-build-ca.8.gz
-%{_mandir}/man8/%{name}-build-key.8.gz
-%{_mandir}/man8/%{name}-sign-key.8.gz
%{_mandir}/man8/%{name}-prepare-dirs.8.gz
-%attr(0755,%{icinga_user},%{icinga_group}) %{_localstatedir}/cache/%{name}
-%attr(0755,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}
-%attr(0755,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}/compat
-%attr(0755,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}/compat/archives
-%attr(0755,%{icinga_user},%{icinga_group}) %ghost %{_localstatedir}/run/%{name}
+%attr(0750,%{icinga_user},%{icingacmd_group}) %{_localstatedir}/cache/%{name}
+%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}
+%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat
+%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat/archives
%attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/lib/%{name}
-%attr(2755,%{icinga_user},%{icingacmd_group}) %ghost %{_localstatedir}/run/icinga2/cmd
+%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}
+%attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd
%files common
%defattr(-,root,root,-)
-%doc COPYING COPYING.Exceptions README NEWS AUTHORS ChangeLog tools/syntax
-%attr(0755,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}
+%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog tools/syntax
+%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%{_sysconfdir}/bash_completion.d/%{name}
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include
%{_datadir}/%{name}/include
+%{_datadir}/%{name}/migrate-hosts
%files doc
%defattr(-,root,root,-)
%files ido-mysql
%defattr(-,root,root,-)
-%doc components/db_ido_mysql/schema COPYING COPYING.Exceptions README NEWS AUTHORS ChangeLog
+%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
%{_libdir}/%{name}/libdb_ido_mysql*
+%{_datadir}/icinga2-ido-mysql
%files ido-pgsql
%defattr(-,root,root,-)
-%doc components/db_ido_pgsql/schema COPYING COPYING.Exceptions README NEWS AUTHORS ChangeLog
+%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
%{_libdir}/%{name}/libdb_ido_pgsql*
+%{_datadir}/icinga2-ido-pgsql
%files classicui-config
%defattr(-,root,root,-)
%config(noreplace) %{apacheconfdir}/icinga.conf
%config(noreplace) %attr(0640,root,%{apachegroup}) %{icingaclassicconfdir}/passwd
-
%changelog
projects / icinga2 / blobdiff