DEPRECATE icinga2-classicui-config package and files

refs #5102

diff --git a/etc/icinga/README b/etc/icinga/README
index 9f71ac383eeb786d63d900256e189ef6379c336f..f06656685fb79d7f1d256de813953244afeead41 100644 (file)
--- a/etc/icinga/README
+++ b/etc/icinga/README
@@ -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
 used by packages.

diff --git a/etc/icinga/cgi.cfg b/etc/icinga/cgi.cfg
index 268bc0f6e581d1b56386796a28bd3abdbaa7fe70..255d9d427b627d4f73e4494e0c137893c77f0ea0 100644 (file)
--- a/etc/icinga/cgi.cfg
+++ b/etc/icinga/cgi.cfg
@@ -2,6 +2,10 @@
 #
 # requires icinga-gui package
 # 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
 physical_html_path=/usr/share/icinga
 url_html_path=/icinga

diff --git a/etc/icinga/icinga-classic-apache.conf.cmake b/etc/icinga/icinga-classic-apache.conf.cmake
index 3df301cb2e17d3f9187edc0b3413d6b508a1c9e4..6c364172ac325d108f9ca93d788e8f5ea974be71 100644 (file)
--- a/etc/icinga/icinga-classic-apache.conf.cmake
+++ b/etc/icinga/icinga-classic-apache.conf.cmake
@@ -4,6 +4,9 @@
 # to be incorporated into your Apache web server
 # configuration file.  Customize the paths, etc. as
 # 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"
 

diff --git a/etc/icinga/icinga-classic.htpasswd b/etc/icinga/icinga-classic.htpasswd
index cf7a663a633324cfc8b016c7499a4975aa0427b3..c47106b6c67b8307855f6abee4252aa09928c551 100644 (file)
--- a/etc/icinga/icinga-classic.htpasswd
+++ b/etc/icinga/icinga-classic.htpasswd
@@ -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

diff --git a/icinga2.spec b/icinga2.spec
index cc01327de312ddae94ff15473d491886e935b736..f19dcd8934e71cdae2b3b87cd97d75fcdfe649ef 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -60,6 +60,7 @@
 %define icingaweb2name icingaweb2
 %define icingaweb2version 2.0.0
 
+# DEPRECATED
 %define icingaclassicconfdir %{_sysconfdir}/icinga
 
 %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
 
 
+# DEPRECATED
 %package classicui-config
 Summary:      Icinga 2 Classic UI Standalone configuration
 Group:        Applications/System
@@ -225,6 +227,7 @@ Recommends:   icinga-www
 Provides:     icinga-classicui-config
 Conflicts:    icinga-gui-config
 
+# DEPRECATED
 %description classicui-config
 Icinga 1.x Classic UI Standalone configuration with locations
 for Icinga 2.
@@ -364,6 +367,7 @@ cd -
 make install \
        DESTDIR="%{buildroot}"
 
+# DEPRECATED
 # 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
@@ -595,6 +599,7 @@ fi
 
 exit 0
 
+# DEPRECATED
 %post classicui-config
 if [ ${1:-0} -eq 1 ]
 then
@@ -604,8 +609,11 @@ then
        done
 fi
 
+%logmsg "The icinga2-classicui-config package has been deprecated and will be removed in future releases."
+
 exit 0
 
+# DEPRECATED
 %postun classicui-config
 if [ "$1" = "0" ]; then
         # deinstallation of the package - remove feature
@@ -735,6 +743,7 @@ fi
 %{_libdir}/%{name}/libdb_ido_pgsql*
 %{_datadir}/icinga2-ido-pgsql
 
+# DEPRECATED
 %files classicui-config
 %defattr(-,root,root,-)
 %attr(0751,%{icinga_user},%{icinga_group}) %dir %{icingaclassicconfdir}