From 2d2022a123b5511b7072eb4e3b0b645dd0b0d895 Mon Sep 17 00:00:00 2001
From: mhoellein <mhoellein@freenet.de>
Date: Fri, 10 Jul 2020 12:18:15 +0200
Subject: [PATCH] committing changes in /etc after apt run

Package changes:
-icingacli 2.8.1-1.bionic all
-icingaweb2 2.8.1-1.bionic all
-icingaweb2-common 2.8.1-1.bionic all
-icingaweb2-module-monitoring 2.8.1-1.bionic all
---
 .etckeeper                                | 10 ---------
 apache2/conf-available/icingaweb2.conf    | 25 -----------------------
 apache2/conf-enabled/icingaweb2.conf      |  1 -
 bash_completion.d/icingacli               | 10 ---------
 icingaweb2/enabledModules/monitoring      |  1 -
 icingaweb2/modules/translation/config.ini |  4 ----
 6 files changed, 51 deletions(-)
 delete mode 100644 apache2/conf-available/icingaweb2.conf
 delete mode 120000 apache2/conf-enabled/icingaweb2.conf
 delete mode 100644 bash_completion.d/icingacli
 delete mode 120000 icingaweb2/enabledModules/monitoring
 delete mode 100644 icingaweb2/modules/translation/config.ini

diff --git a/.etckeeper b/.etckeeper
index 57a07210..563e3cab 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -257,7 +257,6 @@ 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'
@@ -1161,7 +1160,6 @@ maybe chmod 0644 'bash_completion.d/fail2ban'
 maybe chmod 0644 'bash_completion.d/gem1.9.1'
 maybe chmod 0644 'bash_completion.d/git-prompt'
 maybe chmod 0644 'bash_completion.d/grub'
-maybe chmod 0644 'bash_completion.d/icingacli'
 maybe chmod 0644 'bash_completion.d/insserv'
 maybe chmod 0644 'bash_completion.d/libreoffice.sh'
 maybe chmod 0644 'bash_completion.d/openvpn'
@@ -2731,14 +2729,6 @@ maybe chmod 0644 'icedtea-web/javaws.policy'
 maybe chmod 0755 'icinga'
 maybe chmod 0755 'icinga/objects'
 maybe chmod 0644 'icinga/objects/usg.cfg'
-maybe chgrp 'icingaweb2' 'icingaweb2'
-maybe chmod 2770 'icingaweb2'
-maybe chgrp 'icingaweb2' 'icingaweb2/enabledModules'
-maybe chmod 2750 'icingaweb2/enabledModules'
-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
deleted file mode 100644
index 31881804..00000000
--- a/apache2/conf-available/icingaweb2.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 120000
index a25f2382..00000000
--- a/apache2/conf-enabled/icingaweb2.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf-available/icingaweb2.conf
\ No newline at end of file
diff --git a/bash_completion.d/icingacli b/bash_completion.d/icingacli
deleted file mode 100644
index f9be7bcf..00000000
--- a/bash_completion.d/icingacli
+++ /dev/null
@@ -1,10 +0,0 @@
-_icingacli_completion()
-{
-  local cur opts
-  opts="${COMP_WORDS[*]}"
-  cur="${COMP_WORDS[COMP_CWORD]}"
-  COMPREPLY=($($opts --autocomplete --autoindex $COMP_CWORD < /dev/null))
-  return 0
-}
-
-complete -F _icingacli_completion icingacli
diff --git a/icingaweb2/enabledModules/monitoring b/icingaweb2/enabledModules/monitoring
deleted file mode 120000
index c201d002..00000000
--- a/icingaweb2/enabledModules/monitoring
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icingaweb2/modules/monitoring
\ No newline at end of file
diff --git a/icingaweb2/modules/translation/config.ini b/icingaweb2/modules/translation/config.ini
deleted file mode 100644
index 5bdf37b0..00000000
--- a/icingaweb2/modules/translation/config.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[translation]
-msgmerge = /usr/bin/msgmerge
-xgettext = /usr/bin/xgettext
-msgfmt = /usr/bin/msgfmt
-- 
2.43.0