committing changes in /etc after apt run

Package changes:
+icingacli 2.6.1-1.stretch all
+icingaweb2 2.6.1-1.stretch all
+icingaweb2-common 2.6.1-1.stretch all
+icingaweb2-module-monitoring 2.6.1-1.stretch all
+php-htmlpurifier 4.7.0-2 all
+php-icinga 2.6.1-1.stretch all

diff --git a/.etckeeper b/.etckeeper
index 7f49741629adda438e318090b9494edf55119870..85e6be4e59cfc4f3d6ef4ada30132ab4580b5b59 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -97,6 +97,7 @@ maybe chmod 0644 'apache2/apache2.conf'
 maybe chmod 0755 'apache2/conf-available'
 maybe chmod 0644 'apache2/conf-available/charset.conf'
 maybe chmod 0644 'apache2/conf-available/custom-log.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/other-vhosts-access-log.conf'
@@ -899,6 +900,12 @@ maybe chmod 0644 'icinga2/zones.d/master/hosts.conf'
 maybe chmod 0644 'icinga2/zones.d/master/mail.conf'
 maybe chmod 0644 'icinga2/zones.d/master/salt.conf'
 maybe chmod 0644 'icinga2/zones.d/master/services.conf'
+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 0755 'init'
 maybe chmod 0755 'init.d'
 maybe chmod 0644 'init.d/README'

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/group b/group
index 02d73465c72d7ba6e8be5f26c99e79b05b6e56ea..caa093a7056f2f2977b068403bf2f7c79f932557 100644 (file)
--- a/group
+++ b/group
@@ -57,3 +57,4 @@ postgres:x:116:
 messagebus:x:117:
 _chrony:x:118:
 nagios:x:119:
+icingaweb2:x:120:www-data

diff --git a/group- b/group-
index e76dab08f69ad3289bb8fb83a2aee0bbb059a251..ff4e78231b9db23b4fb9f2679ee376cf9dbfa3c2 100644 (file)
--- a/group-
+++ b/group-
@@ -56,3 +56,5 @@ ulog:x:115:
 postgres:x:116:
 messagebus:x:117:
 _chrony:x:118:
+nagios:x:119:
+icingaweb2:x:120:

diff --git a/gshadow b/gshadow
index 1134e09d534a72a7f378c2037f5363c85d9a99d9..4f1ce2661af604f421bcdd000d62fed741084ffa 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -57,3 +57,4 @@ postgres:!::
 messagebus:!::
 _chrony:!::
 nagios:!::
+icingaweb2:!::www-data

diff --git a/gshadow- b/gshadow-
index 73d529db0a9813fe5c0a8acc33b5776f73771afb..63c98b9c8117f18da3cf0bd08b91cd18655bc6a7 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -56,3 +56,5 @@ ulog:!::
 postgres:!::
 messagebus:!::
 _chrony:!::
+nagios:!::
+icingaweb2:!::

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