spec: Add icinga2-classicui-config package.

Conflicts with icinga-gui-config meta package shipped with 1.10

diff --git a/etc/icinga/icinga-classic-apache.conf b/etc/icinga/icinga-classic-apache.conf
index 5524d2ebf9ec5ce56a7abd7de17a57b2dbc045ba..b337f08d0e6ff540266d6df11144e636708169c7 100644 (file)
--- 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
 </Directory>
 
@@ -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
 </Directory>
 

diff --git a/icinga2.spec.in b/icinga2.spec.in
index 116851f6d2f2045bd6fc903f5ead6b09e75ec8dd..17fea962c30d8b8ffb0acafe42ee03c8990c9557 100644 (file)
--- 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 <michael.friedrich@netways.de> - 0.0.3-1