committing changes in /etc after apt run

Package changes:
+icingaweb2 2.8.1-1.bionic all
+icingaweb2-common 2.8.1-1.bionic all

diff --git a/.etckeeper b/.etckeeper
index 52acfb1bb428a525cec96e7443f6c15ecc3bd8f9..2874c938d9807f09a5a249c2c20305cc6c7570d1 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -258,6 +258,7 @@ maybe chmod 0755 'apache2/conf-available'
 maybe chmod 0644 'apache2/conf-available/charset.conf'
 maybe chmod 0644 'apache2/conf-available/gitweb.conf'
 maybe chmod 0644 'apache2/conf-available/httpd.conf'
+maybe chmod 0644 'apache2/conf-available/icingaweb2.conf'
 maybe chmod 0644 'apache2/conf-available/javascript-common.conf'
 maybe chmod 0644 'apache2/conf-available/localized-error-pages.conf'
 maybe chmod 0644 'apache2/conf-available/loolwsd.conf'
@@ -2777,6 +2778,12 @@ maybe chmod 0755 'icinga2/scripts/mail-service-notification.sh'
 maybe chmod 0644 'icinga2/zones.conf'
 maybe chmod 0755 'icinga2/zones.d'
 maybe chmod 0644 'icinga2/zones.d/README'
+maybe chgrp 'icingaweb2' 'icingaweb2'
+maybe chmod 2770 'icingaweb2'
+maybe chgrp 'icingaweb2' 'icingaweb2/modules'
+maybe chmod 2770 'icingaweb2/modules'
+maybe chmod 0755 'icingaweb2/modules/translation'
+maybe chmod 0644 'icingaweb2/modules/translation/config.ini'
 maybe chmod 0644 'idmapd.conf'
 maybe chmod 0755 'ifplugd'
 maybe chmod 0755 'ifplugd/action.d'

diff --git a/apache2/conf-available/icingaweb2.conf b/apache2/conf-available/icingaweb2.conf
new file mode 100644 (file)
index 0000000..3188180
--- /dev/null
+++ b/apache2/conf-available/icingaweb2.conf
@@ -0,0 +1,25 @@
+Alias /icingaweb2 "/usr/share/icingaweb2/public"
+
+<Directory "/usr/share/icingaweb2/public">
+    Options SymLinksIfOwnerMatch
+    AllowOverride None
+
+    SetEnv ICINGAWEB_CONFIGDIR "/etc/icingaweb2"
+
+    EnableSendfile Off
+
+    <IfModule mod_rewrite.c>
+        RewriteEngine on
+        RewriteBase /icingaweb2/
+        RewriteCond %{REQUEST_FILENAME} -s [OR]
+        RewriteCond %{REQUEST_FILENAME} -l [OR]
+        RewriteCond %{REQUEST_FILENAME} -d
+        RewriteRule ^.*$ - [NC,L]
+        RewriteRule ^.*$ index.php [NC,L]
+    </IfModule>
+
+    <IfModule !mod_rewrite.c>
+        DirectoryIndex error_norewrite.html
+        ErrorDocument 404 /error_norewrite.html
+    </IfModule>
+</Directory>

diff --git a/apache2/conf-enabled/icingaweb2.conf b/apache2/conf-enabled/icingaweb2.conf
new file mode 120000 (symlink)
index 0000000..a25f238
--- /dev/null
+++ b/apache2/conf-enabled/icingaweb2.conf
@@ -0,0 +1 @@
+../conf-available/icingaweb2.conf
\ No newline at end of file

diff --git a/icingaweb2/modules/translation/config.ini b/icingaweb2/modules/translation/config.ini
new file mode 100644 (file)
index 0000000..5bdf37b
--- /dev/null
+++ b/icingaweb2/modules/translation/config.ini
@@ -0,0 +1,4 @@
+[translation]
+msgmerge = /usr/bin/msgmerge
+xgettext = /usr/bin/xgettext
+msgfmt = /usr/bin/msgfmt