committing changes in /etc after apt run

Package changes:
-git 1:2.11.0-3+deb9u3 amd64
-git-email 1:2.11.0-3+deb9u3 all
-git-man 1:2.11.0-3+deb9u3 all
+git 1:2.11.0-3+deb9u4 amd64
+git-email 1:2.11.0-3+deb9u4 all
+git-man 1:2.11.0-3+deb9u4 all
-icinga2 2.9.1-1.stretch amd64
-icinga2-bin 2.9.1-1.stretch amd64
+icinga2 2.10.0-1.stretch amd64
+icinga2-bin 2.10.0-1.stretch amd64
-icinga2-common 2.9.1-1.stretch all
+icinga2-common 2.10.0-1.stretch all
-imagemagick 8:6.9.7.4+dfsg-11+deb9u5 amd64
-imagemagick-6-common 8:6.9.7.4+dfsg-11+deb9u5 all
-imagemagick-6.q16 8:6.9.7.4+dfsg-11+deb9u5 amd64
+imagemagick 8:6.9.7.4+dfsg-11+deb9u6 amd64
+imagemagick-6-common 8:6.9.7.4+dfsg-11+deb9u6 all
+imagemagick-6.q16 8:6.9.7.4+dfsg-11+deb9u6 amd64
-libicinga2 2.9.1-1.stretch amd64
-libmagickcore-6.q16-3 8:6.9.7.4+dfsg-11+deb9u5 amd64
-libmagickwand-6.q16-3 8:6.9.7.4+dfsg-11+deb9u5 amd64
+libmagickcore-6.q16-3 8:6.9.7.4+dfsg-11+deb9u6 amd64
+libmagickwand-6.q16-3 8:6.9.7.4+dfsg-11+deb9u6 amd64
-libpython2.7 2.7.13-2+deb9u2 amd64
-libpython2.7-minimal 2.7.13-2+deb9u2 amd64
-libpython2.7-stdlib 2.7.13-2+deb9u2 amd64
+libpython2.7 2.7.13-2+deb9u3 amd64
+libpython2.7-minimal 2.7.13-2+deb9u3 amd64
+libpython2.7-stdlib 2.7.13-2+deb9u3 amd64
-libpython3.5-minimal 3.5.3-1 amd64
-libpython3.5-stdlib 3.5.3-1 amd64
+libpython3.5-minimal 3.5.3-1+deb9u1 amd64
+libpython3.5-stdlib 3.5.3-1+deb9u1 amd64
-linux-image-4.9.0-8-amd64 4.9.110-3+deb9u4 amd64
+linux-image-4.9.0-8-amd64 4.9.110-3+deb9u6 amd64
-python2.7 2.7.13-2+deb9u2 amd64
-python2.7-minimal 2.7.13-2+deb9u2 amd64
+python2.7 2.7.13-2+deb9u3 amd64
+python2.7-minimal 2.7.13-2+deb9u3 amd64
-python3.5 3.5.3-1 amd64
-python3.5-minimal 3.5.3-1 amd64
+python3.5 3.5.3-1+deb9u1 amd64
+python3.5-minimal 3.5.3-1+deb9u1 amd64
-vim-icinga2 2.9.1-1.stretch all
+vim-icinga2 2.10.0-1.stretch all

diff --git a/apache2/conf-available/icinga2-classicui.conf b/apache2/conf-available/icinga2-classicui.conf
deleted file mode 120000 (symlink)
index 2ba37da..0000000
--- a/apache2/conf-available/icinga2-classicui.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../icinga2-classicui/apache2.conf
\ No newline at end of file

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

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 548d934d728aec688e9ef1bea1fbc40261ada468..dac4d974ebcc500b0c3cf9a96b702a11615f6269 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -26,24 +26,21 @@ APT::NeverAutoRemove
 };
 /* Debug information:
 # dpkg list:
-ii  linux-image-4.9.0-5-amd64            4.9.65-3+deb9u2                   amd64        Linux 4.9 for 64-bit PCs
 ii  linux-image-4.9.0-6-amd64            4.9.88-1+deb9u1                   amd64        Linux 4.9 for 64-bit PCs
-iF  linux-image-4.9.0-8-amd64            4.9.110-3+deb9u4                  amd64        Linux 4.9 for 64-bit PCs
-iU  linux-image-amd64                    4.9+80+deb9u6                     amd64        Linux for 64-bit PCs (meta-package)
+iF  linux-image-4.9.0-8-amd64            4.9.110-3+deb9u6                  amd64        Linux 4.9 for 64-bit PCs
+ii  linux-image-amd64                    4.9+80+deb9u6                     amd64        Linux for 64-bit PCs (meta-package)
 # list of installed kernel packages:
-4.9.0-5-amd64 4.9.65-3+deb9u2
 4.9.0-6-amd64 4.9.88-1+deb9u1
-4.9.0-8-amd64 4.9.110-3+deb9u4
+4.9.0-8-amd64 4.9.110-3+deb9u6
 # list of different kernel versions:
-4.9.110-3+deb9u4
+4.9.110-3+deb9u6
 4.9.88-1+deb9u1
-4.9.65-3+deb9u2
-# Installing kernel: 4.9.110-3+deb9u4 (4.9.0-8-amd64)
-# Running kernel: 4.9.88-1+deb9u1 (4.9.0-6-amd64)
-# Last kernel: 4.9.110-3+deb9u4
+# Installing kernel: 4.9.110-3+deb9u6 (4.9.0-8-amd64)
+# Running kernel: 4.9.110-3+deb9u6 (4.9.0-8-amd64)
+# Last kernel: 4.9.110-3+deb9u6
 # Previous kernel: 4.9.88-1+deb9u1
 # Kernel versions list to keep:
-4.9.110-3+deb9u4
+4.9.110-3+deb9u6
 4.9.88-1+deb9u1
 # Kernel packages (version part) to protect:
 4\.9\.0-6-amd64

diff --git a/icinga2-classicui/stylesheets b/icinga2-classicui/stylesheets
deleted file mode 120000 (symlink)
index 6c4562f..0000000
--- a/icinga2-classicui/stylesheets
+++ /dev/null
@@ -1 +0,0 @@
-../icinga/stylesheets
\ No newline at end of file

diff --git a/icinga2/conf.d/commands.conf b/icinga2/conf.d/commands.conf
index 9c5153811a7d4aee4cfbd41399ff56ec78447d81..bd511cebcfdf4275ddda81d8827711ecef53ce4a 100644 (file)
--- a/icinga2/conf.d/commands.conf
+++ b/icinga2/conf.d/commands.conf
@@ -7,7 +7,7 @@
  */
 
 object NotificationCommand "mail-host-notification" {
-  command = [ SysconfDir + "/icinga2/scripts/mail-host-notification.sh" ]
+  command = [ ConfigDir + "/scripts/mail-host-notification.sh" ]
 
   arguments += {
     "-4" = "$notification_address$"
@@ -66,7 +66,7 @@ object NotificationCommand "mail-host-notification" {
 }
 
 object NotificationCommand "mail-service-notification" {
-  command = [ SysconfDir + "/icinga2/scripts/mail-service-notification.sh" ]
+  command = [ ConfigDir + "/scripts/mail-service-notification.sh" ]
 
   arguments += {
     "-4" = "$notification_address$"
@@ -146,7 +146,7 @@ object NotificationCommand "mail-service-notification" {
 /*
 
 object NotificationCommand "mail-host-notification" {
-  command = [ SysconfDir + "/icinga2/scripts/mail-host-notification.sh" ]
+  command = [ ConfigDir + "/scripts/mail-host-notification.sh" ]
 
   env = {
     NOTIFICATIONTYPE = "$notification.type$"
@@ -164,7 +164,7 @@ object NotificationCommand "mail-host-notification" {
 }
 
 object NotificationCommand "mail-service-notification" {
-  command = [ SysconfDir + "/icinga2/scripts/mail-service-notification.sh" ]
+  command = [ ConfigDir + "/scripts/mail-service-notification.sh" ]
 
   env = {
     NOTIFICATIONTYPE = "$notification.type$"

diff --git a/icinga2/features-available/debuglog.conf b/icinga2/features-available/debuglog.conf
index 6e8e5813e6112e0ac4318f842c213cb54c9eb1ef..e66518fe16483589d18015821c5d4ba30cdd088c 100644 (file)
--- a/icinga2/features-available/debuglog.conf
+++ b/icinga2/features-available/debuglog.conf
@@ -6,6 +6,5 @@
 
 object FileLogger "debug-file" {
   severity = "debug"
-  path = LocalStateDir + "/log/icinga2/debug.log"
+  path = LogDir + "/debug.log"
 }
-

diff --git a/icinga2/features-available/mainlog.conf b/icinga2/features-available/mainlog.conf
index ded9a7c7d96cda8d12c731908429c27ca2878120..a3bb19dabe6795383626776c22349a265f1a8b33 100644 (file)
--- a/icinga2/features-available/mainlog.conf
+++ b/icinga2/features-available/mainlog.conf
@@ -4,6 +4,5 @@
 
 object FileLogger "main-log" {
   severity = "information"
-  path = LocalStateDir + "/log/icinga2/icinga2.log"
+  path = LogDir + "/icinga2.log"
 }
-

diff --git a/logrotate.d/icinga2 b/logrotate.d/icinga2
index cc9e4fbab8a1965dccbd581480b43c61e363c71e..a8b6f51efded0906a0f57b7a7418b663d1efb787 100644 (file)
--- a/logrotate.d/icinga2
+++ b/logrotate.d/icinga2
@@ -23,4 +23,3 @@
        create 644 nagios nagios
        # TODO: figure out how to get Icinga to re-open this log file
 }
-