From d0f2e1c712c732a1843c6d85352fd1f53489e368 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 21 Sep 2017 22:42:50 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to apt run

---
 .etckeeper                     |   1 +
 apt/sources.list.d/icinga.list |   2 ++
 apt/trusted.gpg                | Bin 5706 -> 6900 bytes
 icinga2/conf.d/apt.conf        |   1 +
 icinga2/conf.d/services.conf   |  38 ++++++++++++++++-----------------
 icinga2/conf.d/users.conf      |   6 +++++-
 6 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 apt/sources.list.d/icinga.list

diff --git a/.etckeeper b/.etckeeper
index dda1b32..8276ee1 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -251,6 +251,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
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
GIT binary patch
delta 1211
zcmV;s1VsDFEc7+7N)~^a0ipy_ht5tB1OSp8!Uay(@Zp;cC;&9vXZg3fFR-PjOSv2|
ziCzLHa;B(Gnn9q_m#vA53_XPYFz2ZVkw!N>5WtvOt<u!T6B1dhxL!Q~t_nl;_U}{Z
zBk?x$+F!9sqeef-*D+pHoUR~d%GemS55FEexYJlfgh>Enk70j1=!O}^CLy@fXLFYT
zpyKXG)fYvkSt<0BI=s_8R1yH0!2|zj>+M7au=_k<=#P@g1{}D5&3F#+E8H{;LM{gB
z1~Hr$f-Ix(HcSFP*rADAsR3K_+JC*ameo45{-(OuS0<WZGz|Hj`b4*jnJJvEp(UU1
zy?gW>f&FQ92E~8>InCUL#{hu__M|`RJYUse5>)yd-9k#W&G@=;TQSKI6_esH1O7Ul
zczM($F%xfE%IviUf)2&(@40bQU7ssIrh<opnuy;(CXBnJ7@i9|DtEfi5#fl;7|8o5
zM7zp;*=~wkGW5mUmVJmlBeu2~IXnrX*Vy2Ty9vs7v{io(ESbwRV_MA<<xbK>1+1jB
ztz#1%DeCR^Qu0D1N3^^qmH<zwtssZAK1pL~Zf9X2PjF>!AX9I3a${v6O>b^#bZ>HL
zZf77ULUn0uWFT{8a&~2MDIh#)Zf0*lX=7<_XJIaHa%Vn>U<4Bp0stTd0#b+0P68VP
z1`7!Y2Lpcs1Qh}Z0|XWV0|5da0Rk6*0162Z#^V{oG(iS}fg}K(7}s^XGOIYMhHPH|
zr{6S|E-?HZ0HBimghE#&GXjx8w18088>q@}_zSQC00X%K4Fpn$&Q1^r0KEJol|({|
z%=-Jdy3%?$pI)6c#Itvx6Y!|Brv0n*8I1+^{}_MP2Aq7TZ}7~vW43z1E>v$Y>uS#S
zZE(*u^NqV^wNA}vRN(k8t9ea`7}ajwCM^+Czfm$r0utPUyuHXjed}E<VDokt9rqFY
z9`}itI=6v*E5ov3MoG@&8B;=8dQ3-n(_<l{)+iWvob5X?y4*h?KO?SjH0Ajfjr?y!
zpkRM*>cy&)mx6auY$jE*L4E-yeb}%jao*_l4Px|k33kq>C+clX;)wO5HMs1`jQ!`z
zImLQb@T~PB{1@{@y_W~zva@>XLPMCuINF>}Rb`yHNT`Q><(>m0fED)u0|f{FOREY4
ziU;G{Lt(yg0rfHxo?Ci-IZrhSZF@9lxL<!o4D$Eu&~0IwnPT9BbP-Wg@zw4KPvyD1
zNx60i4NSo>l(Pu#EW$iD1K(hIqZ3ueSL5Sv3L05hSRrHi=UDp^lfMto9(n$DvaBpl
zxf=|41o7tdN|qdeSLvhkZU)I^ojQN0)>Ih3H@Cm$e<hO@>Pv0I1gEBIoUTh)x$1wx
z`<VocX%<iZD2}dx33_AA#{Eb_Or*yRu%TlnOtOnGApeW*1I6gX=Sxa=7LF}9I2<sn
zYTI!A6-hg%@Dq)AA#u#Vee}<P%2=1LF%N>70iUxA!omlEKiT{|i%X0Y09=Sk1Q-zl
z00{*GQisk?0vikf3JDO#;~B#=K?XB|&X53`1r4DbvPu7G<Zb`iK=nM!o+AUT0HD=W
ZHN>lu$vs#&iKorGM3FNH57Dp!00T0FE8+kE

delta 7
OcmexjdP--5mlyyKO#?6h

diff --git a/icinga2/conf.d/apt.conf b/icinga2/conf.d/apt.conf
index b2c77a0..bdf2acc 100644
--- 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/services.conf b/icinga2/conf.d/services.conf
index e459407..0db2dc2 100644
--- a/icinga2/conf.d/services.conf
+++ b/icinga2/conf.d/services.conf
@@ -97,25 +97,25 @@ apply Service "procs" {
   assign where host.name == NodeName
 }
 
-apply Service "proc named" {
-  import "generic-service"
-
-  check_command = "procs"
-  vars.procs_argument = "/usr/sbin/named"
-  vars.procs_ppid = 1
-  #vars.procs_warning = '1:1'
-  #vars.procs_critical = '1:1'
-  vars.procs_user = 'named'
-  #vars = {
-  #  procs_argument = "/usr/sbin/named"
-  #  procs_ppid = 1
-  #  procs_warning = '1:1'
-  #  procs_critical = '1:1'
-  #  procs_user = 'named'
-  #}
-
-  assign where host.name == NodeName
-}
+#apply Service "proc named" {
+#  import "generic-service"
+#
+#  check_command = "procs"
+#  vars.procs_argument = "/usr/sbin/named"
+#  vars.procs_ppid = 1
+#  #vars.procs_warning = '1:1'
+#  #vars.procs_critical = '1:1'
+#  vars.procs_user = 'named'
+#  #vars = {
+#  #  procs_argument = "/usr/sbin/named"
+#  #  procs_ppid = 1
+#  #  procs_warning = '1:1'
+#  #  procs_critical = '1:1'
+#  #  procs_user = 'named'
+#  #}
+#
+#  assign where host.name == NodeName
+#}
 
 apply Service "swap" {
   import "generic-service"
diff --git a/icinga2/conf.d/users.conf b/icinga2/conf.d/users.conf
index 034ba62..5f78f74 100644
--- a/icinga2/conf.d/users.conf
+++ b/icinga2/conf.d/users.conf
@@ -27,11 +27,15 @@ object User "frank_by_gmx" {
   import "generic-user"
 
   display_name = "Frank Brehm by GMX"
-  groups = [ "icingaadmins" ]
+  groups = [ "emergency_admins" ]
 
   email = "frank.brehm@gmx.net"
 }
 
+object UserGroup "emergency_admins" {
+  display_name = "Admins Group for Eemergency"
+}
+
 object UserGroup "icingaadmins" {
   display_name = "Icinga 2 Admin Group"
 }
-- 
2.39.5