Remove deprecated Classic UI configuration package

refs #5301
This commit is contained in:
Michael Friedrich 2017-08-14 13:13:03 +02:00
parent 0f570e8fe9
commit 6ab38b6c15
6 changed files with 0 additions and 242 deletions

View File

@ -15,7 +15,6 @@
# along with this program; if not, write to the Free Software Foundation
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
configure_file(icinga/icinga-classic-apache.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga/icinga-classic-apache.conf @ONLY)
configure_file(icinga2/init.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf @ONLY)
if(NOT WIN32)

View File

@ -1,5 +0,0 @@
# 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.

View File

@ -1,77 +0,0 @@
# Icinga 2 Classic UI configuration
#
# 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
url_stylesheets_path=/icinga/stylesheets
http_charset=utf-8
refresh_rate=30
refresh_type=1
escape_html_tags=1
result_limit=50
show_tac_header=1
use_pending_states=1
first_day_of_week=0
suppress_maintenance_downtime=0
action_url_target=main
notes_url_target=main
use_authentication=1
use_ssl_authentication=0
lowercase_user_name=0
authorized_for_system_information=icingaadmin
authorized_for_configuration_information=icingaadmin
authorized_for_full_command_resolution=icingaadmin
authorized_for_system_commands=icingaadmin
authorized_for_all_services=icingaadmin
authorized_for_all_hosts=icingaadmin
authorized_for_all_service_commands=icingaadmin
authorized_for_all_host_commands=icingaadmin
show_all_services_host_is_authorized_for=1
show_partial_hostgroups=0
show_partial_servicegroups=0
default_statusmap_layout=5
status_show_long_plugin_output=0
display_status_totals=0
highlight_table_rows=1
add_notif_num_hard=28
add_notif_num_soft=0
use_logging=0
cgi_log_file=/var/log/icinga/gui/icinga-cgi.log
cgi_log_rotation_method=d
cgi_log_archive_path=/var/log/icinga/gui
enforce_comments_on_actions=0
send_ack_notifications=1
persistent_ack_comments=0
lock_author_names=1
default_downtime_duration=7200
set_expire_ack_by_default=0
default_expiring_acknowledgement_duration=86400
default_expiring_disabled_notifications_duration=86400
tac_show_only_hard_state=0
show_tac_header_pending=1
exclude_customvar_name=PASSWORD,COMMUNITY
exclude_customvar_value=secret
extinfo_show_child_hosts=0
tab_friendly_titles=1
######################################
# STANDALONE (ICINGA 2) OPTIONS
# requires standalone_installation=1
######################################
object_cache_file=/var/cache/icinga2/objects.cache
status_file=/var/cache/icinga2/status.dat
resource_file=/etc/icinga/resource.cfg
command_file=/var/run/icinga2/cmd/icinga2.cmd
check_external_commands=1
interval_length=60
status_update_interval=10
log_file=/var/log/icinga2/compat/icinga.log
log_rotation_method=h
log_archive_path=/var/log/icinga2/compat/archives
date_format=us
# EOF

View File

@ -1,70 +0,0 @@
# SAMPLE CONFIG SNIPPETS FOR APACHE WEB SERVER
#
# This file contains examples of entries that need
# 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"
<Directory "@CMAKE_INSTALL_FULL_LIBDIR@/icinga/cgi">
# SSLRequireSSL
Options ExecCGI
AllowOverride None
AuthName "Icinga Access"
AuthType Basic
AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
# Require local
Require valid-user
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
# Order deny,allow
# Deny from all
# Allow from 127.0.0.1
Require valid-user
</IfModule>
</Directory>
Alias /icinga "@CMAKE_INSTALL_FULL_DATADIR@/icinga/"
<Directory "@CMAKE_INSTALL_FULL_DATADIR@/icinga/">
# SSLRequireSSL
Options None
AllowOverride All
AuthName "Icinga Access"
AuthType Basic
AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
# Require local
Require valid-user
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
# Order deny,allow
# Deny from all
# Allow from 127.0.0.1
Require valid-user
</IfModule>
</Directory>

View File

@ -1,3 +0,0 @@
# 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

View File

@ -62,9 +62,6 @@
%define icingaweb2name icingaweb2
%define icingaweb2version 2.0.0
# DEPRECATED
%define icingaclassicconfdir %{_sysconfdir}/icinga
%define logmsg logger -t %{name}/rpm
Summary: Network monitoring application
@ -227,35 +224,6 @@ Requires: %{name} = %{version}-%{release}
Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x
IDOUtils schema >= 1.12
# DEPRECATED, disable builds on Amazon
%if !(0%{?amzn})
# DEPRECATED
%package classicui-config
Summary: Icinga 2 Classic UI Standalone configuration
Group: Applications/System
BuildRequires: %{apachename}
Requires: %{apachename}
Requires: %{name} = %{version}-%{release}
%if "%{_vendor}" == "suse"
Recommends: icinga-www
# for running logger to log the deprecated warning
%if 0%{?use_systemd}
BuildRequires:util-linux-systemd
Requires: util-linux-systemd
%endif
%endif
Provides: icinga-classicui-config
Conflicts: icinga-gui-config
# DEPRECATED
%description classicui-config
Icinga 1.x Classic UI Standalone configuration with locations
for Icinga 2.
# DEPRECATED, disable builds on Amazon
%endif
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
%global selinux_variants mls targeted
%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)}
@ -388,17 +356,6 @@ cd -
make install \
DESTDIR="%{buildroot}"
# DEPRECATED, disable builds on Amazon
%if !(0%{?amzn})
# 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
# DEPRECATED, disable builds on Amazon
%endif
# remove features-enabled symlinks
rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf
@ -621,36 +578,6 @@ fi
exit 0
# DEPRECATED, disable builds on Amazon
%if !(0%{?amzn})
%post classicui-config
if [ ${1:-0} -eq 1 ]
then
# initial installation, enable features
for feature in statusdata compatlog command; do
ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
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
for feature in statusdata compatlog command; do
rm -f %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
done
fi
exit 0
# DEPRECATED, disable builds on Amazon
%endif
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
%post selinux
for selinuxvariant in %{selinux_variants}
@ -771,19 +698,6 @@ fi
%{_libdir}/%{name}/libdb_ido_pgsql*
%{_datadir}/icinga2-ido-pgsql
# DEPRECATED, disable builds on Amazon
%if !(0%{?amzn})
%files classicui-config
%defattr(-,root,root,-)
%attr(0751,%{icinga_user},%{icinga_group}) %dir %{icingaclassicconfdir}
%config(noreplace) %{icingaclassicconfdir}/cgi.cfg
%config(noreplace) %{apacheconfdir}/icinga.conf
%config(noreplace) %attr(0640,root,%{apachegroup}) %{icingaclassicconfdir}/passwd
# DEPRECATED, disable builds on Amazon
%endif
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
%files selinux
%defattr(-,root,root,0755)