saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 52eebf81991afc93d5a28b20eebd2b6cb63aa334..6032b933aece6db6142d97075a075832ed25c46a 100755 (executable)
--- 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 c901f234dcbb7493731efffbb37b41d62b8c13e1..c6847cae0718ad5d0bc1977a0d0f4ba652b7f2d9 100755 (executable)
--- 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 (symlink)
index 0000000..798361d
--- /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 61d41894d128762345741b2b88c543651b7b7ba1..33eeb7891080c6a09203fb30d6a7adb49c5230dc 100644 (file)
--- 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"