From 95e622d0ce355374db4c2b9defd14b6e63619f0e Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 30 Jan 2023 10:31:42 +0100
Subject: [PATCH] committing changes in /etc made by "apt dist-upgrade -y"

Packages with configuration changes:
-icingaweb2 2.11.3-2.bullseye all
+icingaweb2 2.11.4-1+debian11 all

Package changes:
-bind9 1:9.16.33-1~deb11u1 amd64
-bind9-dnsutils 1:9.16.33-1~deb11u1 amd64
-bind9-host 1:9.16.33-1~deb11u1 amd64
-bind9-libs 1:9.16.33-1~deb11u1 amd64
-bind9-utils 1:9.16.33-1~deb11u1 amd64
+bind9 1:9.16.37-1~deb11u1 amd64
+bind9-dnsutils 1:9.16.37-1~deb11u1 amd64
+bind9-host 1:9.16.37-1~deb11u1 amd64
+bind9-libs 1:9.16.37-1~deb11u1 amd64
+bind9-utils 1:9.16.37-1~deb11u1 amd64
-curl 7.74.0-1.3+deb11u3 amd64
+curl 7.74.0-1.3+deb11u5 amd64
-dnsutils 1:9.16.33-1~deb11u1 all
+dnsutils 1:9.16.37-1~deb11u1 all
-git 1:2.30.2-1 amd64
-git-email 1:2.30.2-1 all
-git-man 1:2.30.2-1 all
+git 1:2.30.2-1+deb11u1 amd64
+git-email 1:2.30.2-1+deb11u1 all
+git-man 1:2.30.2-1+deb11u1 all
+icinga-l10n 1.2.0-1.bullseye amd64
-icingacli 2.11.3-2.bullseye all
-icingaweb2 2.11.3-2.bullseye all
-icingaweb2-common 2.11.3-2.bullseye all
-icingaweb2-module-monitoring 2.11.3-2.bullseye all
+icingacli 2.11.4-1+debian11 all
+icingaweb2 2.11.4-1+debian11 all
+icingaweb2-common 2.11.4-1+debian11 all
-libcurl3-gnutls 7.74.0-1.3+deb11u3 amd64
-libcurl4 7.74.0-1.3+deb11u3 amd64
+libcurl3-gnutls 7.74.0-1.3+deb11u5 amd64
+libcurl4 7.74.0-1.3+deb11u5 amd64
-libtiff5 4.2.0-1+deb11u1 amd64
+libtiff5 4.2.0-1+deb11u3 amd64
-php-icinga 2.11.3-2.bullseye all
+php-icinga 2.11.4-1+debian11 all
---
 .etckeeper                             | 2 +-
 apache2/conf-available/icingaweb2.conf | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.etckeeper b/.etckeeper
index 77b91cf..bdf8656 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1021,7 +1021,7 @@ maybe chgrp 'icingaweb2' 'icingaweb2/config.ini'
 maybe chmod 0660 'icingaweb2/config.ini'
 maybe chown 'www-data' 'icingaweb2/enabledModules'
 maybe chgrp 'icingaweb2' 'icingaweb2/enabledModules'
-maybe chmod 2750 'icingaweb2/enabledModules'
+maybe chmod 2770 'icingaweb2/enabledModules'
 maybe chown 'www-data' 'icingaweb2/groups.ini'
 maybe chgrp 'icingaweb2' 'icingaweb2/groups.ini'
 maybe chmod 0660 'icingaweb2/groups.ini'
diff --git a/apache2/conf-available/icingaweb2.conf b/apache2/conf-available/icingaweb2.conf
index 3188180..08fc829 100644
--- a/apache2/conf-available/icingaweb2.conf
+++ b/apache2/conf-available/icingaweb2.conf
@@ -3,11 +3,10 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
 <Directory "/usr/share/icingaweb2/public">
     Options SymLinksIfOwnerMatch
     AllowOverride None
+    Require all granted
 
     SetEnv ICINGAWEB_CONFIGDIR "/etc/icingaweb2"
 
-    EnableSendfile Off
-
     <IfModule mod_rewrite.c>
         RewriteEngine on
         RewriteBase /icingaweb2/
@@ -20,6 +19,8 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
 
     <IfModule !mod_rewrite.c>
         DirectoryIndex error_norewrite.html
-        ErrorDocument 404 /error_norewrite.html
+        ErrorDocument 404 /icingaweb2/error_norewrite.html
     </IfModule>
+
+    DirectoryIndex index.php
 </Directory>
-- 
2.39.5