From e9af696799b99e1c0247b171942a9b6f7d59e95e Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 18 Oct 2018 23:09:44 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -icinga2-classicui 2.9.1-1.stretch all --- .etckeeper | 5 --- icinga2-classicui/apache2.conf | 31 ------------- icinga2-classicui/cgi.cfg | 74 -------------------------------- icinga2-classicui/htpasswd.users | 2 - 4 files changed, 112 deletions(-) delete mode 100644 icinga2-classicui/apache2.conf delete mode 100644 icinga2-classicui/cgi.cfg delete mode 100644 icinga2-classicui/htpasswd.users diff --git a/.etckeeper b/.etckeeper index 27377d8..455d863 100755 --- a/.etckeeper +++ b/.etckeeper @@ -763,11 +763,6 @@ maybe chmod 0644 'hosts.deny' maybe chown 'nagios' 'icinga2' maybe chgrp 'nagios' 'icinga2' maybe chmod 0750 'icinga2' -maybe chmod 0755 'icinga2-classicui' -maybe chmod 0644 'icinga2-classicui/apache2.conf' -maybe chmod 0644 'icinga2-classicui/cgi.cfg' -maybe chgrp 'www-data' 'icinga2-classicui/htpasswd.users' -maybe chmod 0640 'icinga2-classicui/htpasswd.users' maybe chmod 0755 'icinga2/conf.d' maybe chmod 0644 'icinga2/conf.d/api-users.conf' maybe chmod 0644 'icinga2/conf.d/app.conf' diff --git a/icinga2-classicui/apache2.conf b/icinga2-classicui/apache2.conf deleted file mode 100644 index 9b81bef..0000000 --- a/icinga2-classicui/apache2.conf +++ /dev/null @@ -1,31 +0,0 @@ -# apache configuration for icinga - -ScriptAlias /cgi-bin/icinga2-classicui /usr/lib/cgi-bin/icinga2-classicui - -# Where the stylesheets (config files) reside -Alias /icinga2-classicui/stylesheets /etc/icinga2-classicui/stylesheets - -# Where the HTML pages live -Alias /icinga2-classicui /usr/share/icinga2/classicui - - - SetEnv ICINGA_CGI_CONFIG /etc/icinga2-classicui/cgi.cfg - - - - Options FollowSymLinks - - DirectoryIndex index.html - - AllowOverride AuthConfig - - - Order Allow,Deny - Allow From All - - - AuthName "Icinga Access" - AuthType Basic - AuthUserFile /etc/icinga2-classicui/htpasswd.users - Require valid-user - diff --git a/icinga2-classicui/cgi.cfg b/icinga2-classicui/cgi.cfg deleted file mode 100644 index fae1151..0000000 --- a/icinga2-classicui/cgi.cfg +++ /dev/null @@ -1,74 +0,0 @@ -# Icinga 2 Classic UI configuration -# -# requires icinga-gui package -# check http://docs.icinga.org for option details -standalone_installation=1 -physical_html_path=/usr/share/icinga -url_html_path=/icinga2-classicui -url_stylesheets_path=/icinga2-classicui/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 -url_cgi_path=/cgi-bin/icinga2-classicui -# EOF diff --git a/icinga2-classicui/htpasswd.users b/icinga2-classicui/htpasswd.users deleted file mode 100644 index 66df579..0000000 --- a/icinga2-classicui/htpasswd.users +++ /dev/null @@ -1,2 +0,0 @@ -icingaadmin:$apr1$iFfKiuLF$nwExYtTK3UsmVYHYTzllL/ -frank:$2y$05$Ys9DHq2M/dWa8jJckfBsfOss9wGdA6Ql2cJwALvpVea1hmHmpnNuG -- 2.39.5