saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 3432b8b3ed55eb8bfecc7207024bc1b02a367d81..dcea7930337a533fc9b1a7294c9e6b9317be1cd5 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -244,6 +244,7 @@ maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub'
 maybe chmod 0644 'apt/sources.list'
 maybe chmod 0755 'apt/sources.list.d'
 maybe chmod 0644 'apt/sources.list.d/fbrehm.list'
+maybe chmod 0644 'apt/sources.list.d/icinga.list'
 maybe chmod 0644 'apt/sources.list.d/salt.list'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'

diff --git a/apt/sources.list.d/icinga.list b/apt/sources.list.d/icinga.list
new file mode 100644 (file)
index 0000000..e4f5617
--- /dev/null
+++ b/apt/sources.list.d/icinga.list
@@ -0,0 +1,2 @@
+deb    http://packages.icinga.com/debian icinga-stretch main
+deb-src        http://packages.icinga.com/debian icinga-stretch main

diff --git a/apt/trusted.gpg b/apt/trusted.gpg
index af016abf026dd978fdc0a8fb668215478e585d2e..96e7a47ddfafdeaa9638b81dd720b19683049cb2 100644 (file)
Binary files a/apt/trusted.gpg and b/apt/trusted.gpg differ

diff --git a/icinga2/conf.d/apt.conf b/icinga2/conf.d/apt.conf
index b2c77a0c1f29514d985fcaa449d680dd030d4895..bdf2acc03093f618b02546d7c9e7bb7785927d07 100644 (file)
--- a/icinga2/conf.d/apt.conf
+++ b/icinga2/conf.d/apt.conf
@@ -2,6 +2,7 @@ apply Service "apt" {
   import "generic-service"
 
   check_command = "apt"
+  enable_notifications = false
 
   assign where host.name == NodeName
 }

diff --git a/icinga2/conf.d/users.conf b/icinga2/conf.d/users.conf
index aa31e272eb7a9d655ee10159f1d97b5f31b394ea..4fd2ef5203f0aa7877c2825d2e086bbc5646f27d 100644 (file)
--- a/icinga2/conf.d/users.conf
+++ b/icinga2/conf.d/users.conf
@@ -10,6 +10,29 @@ object User "icingaadmin" {
   groups = [ "icingaadmins" ]
 
   email = "root@localhost"
+  enable_notifications = false
+}
+
+object User "frank" {
+  import "generic-user"
+
+  display_name = "Frank Brehm"
+  groups = [ "icingaadmins" ]
+
+  email = "frank@brehm-online.com"
+}
+
+object User "frank_by_gmx" {
+  import "generic-user"
+
+  display_name = "Frank Brehm by GMX"
+  groups = [ "emergency_admins" ]
+
+  email = "frank.brehm@gmx.net"
+}
+
+object UserGroup "emergency_admins" {
+  display_name = "Admins Group for Eemergency"
 }
 
 object UserGroup "icingaadmins" {