From b25facafb97898b3b06fdd3e7c3e446d481c59c2 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 10 Oct 2013 16:43:15 +0200 Subject: [PATCH] spec: Add icinga2-classicui-config package. Conflicts with icinga-gui-config meta package shipped with 1.10 --- etc/icinga/icinga-classic-apache.conf | 4 ++-- icinga2.spec.in | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/etc/icinga/icinga-classic-apache.conf b/etc/icinga/icinga-classic-apache.conf index 5524d2ebf..b337f08d0 100644 --- a/etc/icinga/icinga-classic-apache.conf +++ b/etc/icinga/icinga-classic-apache.conf @@ -18,7 +18,7 @@ ScriptAlias /icinga/cgi-bin "/usr/lib64/icinga/cgi" # Allow from 127.0.0.1 AuthName "Icinga Access" AuthType Basic - AuthUserFile /etc/icinga/htpasswd.users + AuthUserFile /etc/icinga/passwd Require valid-user @@ -35,7 +35,7 @@ Alias /icinga "/usr/share/icinga/" # Allow from 127.0.0.1 AuthName "Icinga Access" AuthType Basic - AuthUserFile /etc/icinga/htpasswd.users + AuthUserFile /etc/icinga/passwd Require valid-user diff --git a/icinga2.spec.in b/icinga2.spec.in index 116851f6d..17fea962c 100644 --- a/icinga2.spec.in +++ b/icinga2.spec.in @@ -4,16 +4,20 @@ %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 apacheconfdir %{_sysconfdir}/httpd/conf.d %endif %if "%{_vendor}" == "suse" %define opensuse_boost_version 1_49_0 %define sles_boost_version 1_54_0 +%define apacheconfdir %{_sysconfdir}/apache2/conf.d %endif %define icinga_user icinga %define icinga_group icinga %define icingacmd_group icingacmd +%define icingaclassicconfdir %{_sysconfdir}/icinga + %define logmsg logger -t %{name}/rpm Summary: network monitoring application @@ -127,6 +131,16 @@ Requires: mysql Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x IDOUtils schema >= 1.10 +%package classicui-config +Summary: Icinga 2 Classic UI Standalone configuration +Group: Applications/System +Provides: icinga-classicui-config +Conflicts: icinga-gui-config + +%description classicui-config +Icinga 1.x Classic UI Standalone configuration with locations +for Icinga 2. + %prep %setup -q -n %{name}-%{version} @@ -146,6 +160,12 @@ make install \ INSTALL_OPTS="" \ COMMAND_OPTS="" +# install classicui config +install -D -m 0644 etc/icinga/icinga-classic.htpasswd %{buildroot}%{icingaclassicconfdir}/passwd +install -D -m 0644 etc/icinga/cgi.cfg %{buildroot}%{icingaclassicconfdir}/cgi.cfg +install -D -m 0644 etc/icinga/icinga-classic-apache.conf %{buildroot}%{apacheconfdir}/icinga.conf + + %clean [ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot} @@ -220,6 +240,11 @@ fi %files ido-mysql %{_libdir}/%{name}/libdb_ido_mysql* +%files classicui-config +%config(noreplace) %{icingaclassicconfdir}/cgi.cfg +%config(noreplace) %{apacheconfdir}/icinga.conf +%attr(0640,root,apache) %config(noreplace) %{icingaclassicconfdir}/passwd + %changelog * Tue Oct 01 2013 Michael Friedrich - 0.0.3-1 -- 2.40.0