From: mhoellein <mario@hoellein.online>
Date: Mon, 7 Jun 2021 18:41:48 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=d8c4d23edfd342d70acf0ba53213da922a092c49;p=vserver

saving uncommitted changes in /etc prior to apt run
---

diff --git a/.etckeeper b/.etckeeper
index 52eebf819..6032b933a 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1309,7 +1309,7 @@ maybe chgrp 'nagios' 'icinga2/conf.d/users.conf'
 maybe chmod 0644 'icinga2/conf.d/users.conf'
 maybe chown 'nagios' 'icinga2/constants.conf'
 maybe chgrp 'nagios' 'icinga2/constants.conf'
-maybe chmod 0640 'icinga2/constants.conf'
+maybe chmod 0644 'icinga2/constants.conf'
 maybe chown 'nagios' 'icinga2/constants.conf.orig'
 maybe chgrp 'nagios' 'icinga2/constants.conf.orig'
 maybe chmod 0640 'icinga2/constants.conf.orig'
diff --git a/icinga2/scripts/mail-service-notification.sh b/icinga2/scripts/mail-service-notification.sh
index c901f234d..c6847cae0 100755
--- a/icinga2/scripts/mail-service-notification.sh
+++ b/icinga2/scripts/mail-service-notification.sh
@@ -5,7 +5,7 @@
 PROG="`basename $0`"
 ICINGA2HOST="`hostname`"
 MAILBIN="mail"
-
+echo "$PROG wurde gerufen" >> /tmp/mylog.log
 if [ -z "`which $MAILBIN`" ] ; then
   echo "$MAILBIN not found in \$PATH. Consider installing it."
   exit 1
diff --git a/icingaweb2/enabledModules/graphite b/icingaweb2/enabledModules/graphite
new file mode 120000
index 000000000..798361df1
--- /dev/null
+++ b/icingaweb2/enabledModules/graphite
@@ -0,0 +1 @@
+/usr/share/icingaweb2/modules/graphite
\ No newline at end of file
diff --git a/icingaweb2/resources.ini b/icingaweb2/resources.ini
index 61d41894d..33eeb7891 100644
--- a/icingaweb2/resources.ini
+++ b/icingaweb2/resources.ini
@@ -8,22 +8,22 @@ password = "cGtbWBBEs1zLXBQbI8MoR17nL"
 charset = "utf8"
 use_ssl = "0"
 
-[icinga_ido]
+[icingaweb2_db]
 type = "db"
 db = "mysql"
 host = "localhost"
-dbname = "icinga_ido"
-username = "icinga_ido"
-password = "vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q"
+dbname = "icingaweb2"
+username = "icingaweb2"
+password = "7cHKgV780AyvMFkRFEagHPRRNHhF21q"
 charset = "utf8"
 use_ssl = "0"
 
-[icingaweb2_db]
+[icinga_ido]
 type = "db"
 db = "mysql"
 host = "localhost"
-dbname = "icingaweb2"
-username = "icingaweb2"
-password = "7cHKgV780AyvMFkRFEagHPRRNHhF21q"
-charset = "utf8"
+dbname = "icinga_ido"
+username = "icinga_ido"
+password = "vhsQdqYAsuicEju0YxiVBdlIO8tHDDmr5Q"
+charset = "latin1"
 use_ssl = "0"