committing changes in /etc made by "apt --fix-broken install"

Package changes:
+icingacli 2.11.4-1+ubuntu20.04 all
+icingaweb2 2.11.4-1+ubuntu20.04 all
+icingaweb2-common 2.11.4-1+ubuntu20.04 all
+php-icinga 2.11.4-1+ubuntu20.04 all

diff --git a/.etckeeper b/.etckeeper
index 14b265bd785fab7ecbd8b0617bb6e04620dcb858..99cc4887deef9c8c1843c34bc0835dad1889c855 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1457,7 +1457,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 3188180406b9d75a389c26b2fb0917cdbb1cf71e..08fc82939439ea8d176c40fabb269b675bffcbf0 100644 (file)
--- 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>