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

Merge pull request #5302 from Icinga/feature/deprecate-classicui-config 

DEPRECATE icinga2-classicui-config package and config files

refs #5102
This commit is contained in:
Michael Friedrich 2017-05-29 20:35:30 +02:00 committed by GitHub
parent c9039e1850 6cee5331ec
commit c2f0dca7f7
5 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/icinga/README
View File

@ -1,2 +1,5 @@
# This has been DEPRECATED and will be removed in future releases.
# You can manually configure the Classic UI by keeping a backup of this file.
This directory contains Icinga 1.x Classic UI configuration This directory contains Icinga 1.x Classic UI configuration
used by packages. used by packages.

4
etc/icinga/cgi.cfg
View File

@ -2,6 +2,10 @@
# #
# requires icinga-gui package # requires icinga-gui package
# check http://docs.icinga.com for option details # check http://docs.icinga.com for option details
#
# This has been DEPRECATED and will be removed in future releases.
# You can manually configure the Classic UI by keeping a backup of this file.
standalone_installation=1 standalone_installation=1
physical_html_path=/usr/share/icinga physical_html_path=/usr/share/icinga
url_html_path=/icinga url_html_path=/icinga

3
etc/icinga/icinga-classic-apache.conf.cmake
View File

@ -4,6 +4,9 @@
# to be incorporated into your Apache web server # to be incorporated into your Apache web server
# configuration file. Customize the paths, etc. as # configuration file. Customize the paths, etc. as
# needed to fit your system. # needed to fit your system.
#
# This has been DEPRECATED and will be removed in future releases.
# You can manually configure the Classic UI by keeping a backup of this file.
ScriptAlias /icinga/cgi-bin "@CMAKE_INSTALL_FULL_LIBDIR@/icinga/cgi" ScriptAlias /icinga/cgi-bin "@CMAKE_INSTALL_FULL_LIBDIR@/icinga/cgi"

2
etc/icinga/icinga-classic.htpasswd
View File

@ -1 +1,3 @@
# This has been DEPRECATED and will be removed in future releases.
# You can manually configure the Classic UI by keeping a backup of this file.
icingaadmin:bRH4xwLfPkKeE icingaadmin:bRH4xwLfPkKeE

9
icinga2.spec
View File

@ -60,6 +60,7 @@
%define icingaweb2name icingaweb2 %define icingaweb2name icingaweb2
%define icingaweb2version 2.0.0 %define icingaweb2version 2.0.0
# DEPRECATED
%define icingaclassicconfdir %{_sysconfdir}/icinga %define icingaclassicconfdir %{_sysconfdir}/icinga
%define logmsg logger -t %{name}/rpm %define logmsg logger -t %{name}/rpm
@ -213,6 +214,7 @@ Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x
IDOUtils schema >= 1.12 IDOUtils schema >= 1.12
# DEPRECATED
%package classicui-config %package classicui-config
Summary: Icinga 2 Classic UI Standalone configuration Summary: Icinga 2 Classic UI Standalone configuration
Group: Applications/System Group: Applications/System
@ -225,6 +227,7 @@ Recommends: icinga-www
Provides: icinga-classicui-config Provides: icinga-classicui-config
Conflicts: icinga-gui-config Conflicts: icinga-gui-config
# DEPRECATED
%description classicui-config %description classicui-config
Icinga 1.x Classic UI Standalone configuration with locations Icinga 1.x Classic UI Standalone configuration with locations
for Icinga 2. for Icinga 2.
@ -364,6 +367,7 @@ cd -
make install \ make install \
DESTDIR="%{buildroot}" DESTDIR="%{buildroot}"
# DEPRECATED
# install classicui config # install classicui config
install -D -m 0644 etc/icinga/icinga-classic.htpasswd %{buildroot}%{icingaclassicconfdir}/passwd 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/cgi.cfg %{buildroot}%{icingaclassicconfdir}/cgi.cfg
@ -595,6 +599,7 @@ fi
exit 0 exit 0
# DEPRECATED
%post classicui-config %post classicui-config
if [ ${1:-0} -eq 1 ] if [ ${1:-0} -eq 1 ]
then then
@ -604,8 +609,11 @@ then
done done
fi fi
%logmsg "The icinga2-classicui-config package has been deprecated and will be removed in future releases."
exit 0 exit 0
# DEPRECATED
%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
@ -735,6 +743,7 @@ fi
%{_libdir}/%{name}/libdb_ido_pgsql* %{_libdir}/%{name}/libdb_ido_pgsql*
%{_datadir}/icinga2-ido-pgsql %{_datadir}/icinga2-ido-pgsql
# DEPRECATED
%files classicui-config %files classicui-config
%defattr(-,root,root,-) %defattr(-,root,root,-)
%attr(0751,%{icinga_user},%{icinga_group}) %dir %{icingaclassicconfdir} %attr(0751,%{icinga_user},%{icinga_group}) %dir %{icingaclassicconfdir}