tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spec: Add icinga2-classicui-config package. 

Conflicts with icinga-gui-config meta package shipped with 1.10
This commit is contained in:
Michael Friedrich 2013-10-10 16:43:15 +02:00
parent 8a05cf8cb9
commit b25facafb9
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/icinga/icinga-classic-apache.conf
View File

@ -18,7 +18,7 @@ ScriptAlias /icinga/cgi-bin "/usr/lib64/icinga/cgi"
# Allow from 127.0.0.1 # Allow from 127.0.0.1
AuthName "Icinga Access" AuthName "Icinga Access"
AuthType Basic AuthType Basic
AuthUserFile /etc/icinga/htpasswd.users AuthUserFile /etc/icinga/passwd
Require valid-user Require valid-user
</Directory> </Directory>
@ -35,7 +35,7 @@ Alias /icinga "/usr/share/icinga/"
# Allow from 127.0.0.1 # Allow from 127.0.0.1
AuthName "Icinga Access" AuthName "Icinga Access"
AuthType Basic AuthType Basic
AuthUserFile /etc/icinga/htpasswd.users AuthUserFile /etc/icinga/passwd
Require valid-user Require valid-user
</Directory> </Directory>

25
icinga2.spec.in
View File

@ -4,16 +4,20 @@
%define el5_boost_version 141 %define el5_boost_version 141
%define el5_boost_libs %{_libdir}/boost%{el5_boost_version} %define el5_boost_libs %{_libdir}/boost%{el5_boost_version}
%define el5_boost_includes /usr/include/boost%{el5_boost_version} %define el5_boost_includes /usr/include/boost%{el5_boost_version}
%define apacheconfdir %{_sysconfdir}/httpd/conf.d
%endif %endif
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
%define opensuse_boost_version 1_49_0 %define opensuse_boost_version 1_49_0
%define sles_boost_version 1_54_0 %define sles_boost_version 1_54_0
%define apacheconfdir %{_sysconfdir}/apache2/conf.d
%endif %endif
%define icinga_user icinga %define icinga_user icinga
%define icinga_group icinga %define icinga_group icinga
%define icingacmd_group icingacmd %define icingacmd_group icingacmd
%define icingaclassicconfdir %{_sysconfdir}/icinga
%define logmsg logger -t %{name}/rpm %define logmsg logger -t %{name}/rpm
Summary: network monitoring application Summary: network monitoring application
@ -127,6 +131,16 @@ Requires: mysql
Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x
IDOUtils schema >= 1.10 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 %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
@ -146,6 +160,12 @@ make install \
INSTALL_OPTS="" \ INSTALL_OPTS="" \
COMMAND_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 %clean
[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot} [ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
@ -220,6 +240,11 @@ fi
%files ido-mysql %files ido-mysql
%{_libdir}/%{name}/libdb_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 %changelog
* Tue Oct 01 2013 Michael Friedrich <michael.friedrich@netways.de> - 0.0.3-1 * Tue Oct 01 2013 Michael Friedrich <michael.friedrich@netways.de> - 0.0.3-1