saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 35d605726f27c22f2a281234112a012d1c305e14..73f9149baeb08fa2b3d03a4d502e171c08099d83 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2730,9 +2730,6 @@ maybe chmod 0755 'hp'
 maybe chmod 0644 'hp/hplip.conf'
 maybe chmod 0755 'icedtea-web'
 maybe chmod 0644 'icedtea-web/javaws.policy'
-maybe chmod 0755 'icinga'
-maybe chmod 0755 'icinga/objects'
-maybe chmod 0644 'icinga/objects/usg.cfg'
 maybe chown 'nagios' 'icinga2'
 maybe chgrp 'nagios' 'icinga2'
 maybe chmod 0750 'icinga2'
@@ -5488,6 +5485,7 @@ maybe chmod 0644 'letsencrypt/csr/1980_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1981_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1982_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1983_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/1984_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -7473,6 +7471,7 @@ maybe chmod 0600 'letsencrypt/keys/1980_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1981_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1982_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1983_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/1984_key-certbot.pem'
 maybe chmod 0755 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README'

diff --git a/icinga/objects/usg.cfg b/icinga/objects/usg.cfg
deleted file mode 100644 (file)
index 31b29af..0000000
--- a/icinga/objects/usg.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-define host {
-        use                     generic-host
-        host_name               usg 
-        alias                   UniFi Security Gateway
-        address                 192.168.178.1
-}
-
-define service {
-        use                     generic-service
-        host_name               usg
-        service_description     HTTP
-        check_command           check_http
-}

diff --git a/icinga2/conf.d/apt.conf b/icinga2/conf.d/apt.conf
index b2c77a0c1f29514d985fcaa449d680dd030d4895..02e4c48c94b23a2802580c629cfc2bc7497081af 100644 (file)
--- a/icinga2/conf.d/apt.conf
+++ b/icinga2/conf.d/apt.conf
@@ -2,6 +2,8 @@ apply Service "apt" {
   import "generic-service"
 
   check_command = "apt"
+  vars.apt_only_critical = "true"
+  vars.apt_timeout = "30"
 
   assign where host.name == NodeName
 }

diff --git a/letsencrypt/csr/1984_csr-certbot.pem b/letsencrypt/csr/1984_csr-certbot.pem
new file mode 100644 (file)
index 0000000..1edd2c4
--- /dev/null
+++ b/letsencrypt/csr/1984_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANn3
+dIo2xMM65a62kny9zllWNmTKoxOJy/lOJl4aoPDbonaV6lWU/76cH0Cae2e+FIfa
+rYf8R2jr8MRuOmUoV22jpimW+bjwh1BbZ6+lscEv5lkHaV7g+AQ295P9dPf6h8X9
+00c2g/hPLFBXxKJakPUewaZ/1cBnOHkZqy//MmrI0Zde+31b2y4xfiRXRCGtS6Vk
+1Us5fW62fiTNXotqp+ahc8jrl/uEJpLXyeJ8P47DWT6I5/lfc1x4sQzR2sNZTR/y
+9zxz5z4H55skBfuvKW2f+Y0bememhN14iTlJHJxcwkZLSefgLAeRBeoZEpP0VWWl
+LVq4Tb0DTfIv/xuMnE8CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQAKoZIOBWqA
+9INKWXcZUrLBbAjLZWP54TRqYrwbh5/GRZjlU5ZxXAo1trZ+kx8PFGCRkt4V9BRb
+XF4VH6uJ4uMJG/SA/ORnj0IKSHUHgch6s0PRKqjsPMfzQjajV0nCT2AgmlsLJ/nQ
+YzAkkx9XmmrsNAUZc7XyhaNPuf9+wP7YmN1jy04c+/LPuMvIKQQgaRE/MFRybu+k
+L8rmYX2uVtfHr+TGxqrvymJC7vVIto6c0er3id2tSdhxj6fh7Y7wjHDrTalP/8V3
+Yu7QL+bDM7e30WEoZedDpcMscJ39lbPlbLm4CJloyWRdpEYGVk6pN1aVDYq45YBm
+XlBoW74dxHj8
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/1984_key-certbot.pem b/letsencrypt/keys/1984_key-certbot.pem
new file mode 100644 (file)
index 0000000..5cd564c
--- /dev/null
+++ b/letsencrypt/keys/1984_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDZ93SKNsTDOuWu
+tpJ8vc5ZVjZkyqMTicv5TiZeGqDw26J2lepVlP++nB9AmntnvhSH2q2H/Edo6/DE
+bjplKFdto6Yplvm48IdQW2evpbHBL+ZZB2le4PgENveT/XT3+ofF/dNHNoP4TyxQ
+V8SiWpD1HsGmf9XAZzh5Gasv/zJqyNGXXvt9W9suMX4kV0QhrUulZNVLOX1utn4k
+zV6LaqfmoXPI65f7hCaS18nifD+Ow1k+iOf5X3NceLEM0drDWU0f8vc8c+c+B+eb
+JAX7ryltn/mNG3pnpoTdeIk5SRycXMJGS0nn4CwHkQXqGRKT9FVlpS1auE29A03y
+L/8bjJxPAgMBAAECggEARPwisFPhNoD/jKpP9pcEJhY5JPFVZ6unGQJ49jOrWE/L
+PYj5H5kG0EcNRR8fi5gHW3AEmBNqbnSuQR058iYwdYzj3CniY3wM94vWZysj9Sa5
+2teTq+m71WmoNfhz+sAaFLnfEpzYa9BzEAKXQ2MymcHgPFgdSMXig8FyAsDcLhtH
+Eke0KNwL4oInjdU0OY32xxdaCt82O2+SVt1waHazGIXcEqG61vjUEkkjCAt+pjwG
++ttc/kUf2rwN48OQm9lP5JdL4WVfbsOc0jIpWvdEzwEn6kSBCPWRUEMAL92+HmB2
+6Nhv8LBVocJDfKts1U1WFb4T3jGSgNO/PVlobT/jAQKBgQD8KddyUr6F+Y+HSCc6
+mq8ORSrNssaTOFrpfBIngZXOGhqZNWvv+7TmCoopXyiBXJlrRyuVrE5mHIJJBzAT
+cA1aqbnWloa4+VFGMrd1VuBl3kHCH1N9MB5DpOqcVwBuJk3P/5qhhBgPD1FQXGuX
+n12hTS2nEqM16A9lbEm+R9YmDwKBgQDdSGtj74rvFISdLrjpFTijdO9lMf5w7khB
+d8kFvscba078b9UYR3KAJ5NX+edSQVYTGufTk6l5qie3usV9+JubNE029EI7eQfy
+B2cqKmpmkjtZ3tRp9R/P/xw/vPZVy0LXZ05UskYr5wuV3z9rZTh9zTo2uJNFK/x5
+D26P7oplwQKBgQCMBBezTSqpbac6sN/HdLibLeDUkt4cRQCGAPR7p0KtTGVUiQtE
+F/mcemG5EzOEkQxHOx+CXkix/kaBklIpmOBxZSjhdHeeIiH03phruS+koMLWrVpI
+ev1zBhGXed+tSeuPARi1comBYzn9azP63uy4cghVas3hUteps3VHCNBqFQKBgGoG
+LfZXKwF8mkHZxh1f3qBrAd1BxAEGGrbLlxTaoPnhQ5ouVzLn4NPIoo+PnKdLyNsk
+lBlK8fPqdFdS9Rdzi9Mkjy6agDWQux7bLzID2rFEtY1M+AfAvDpjqHxdpMXcuy0M
+QXrRZE/axzFLI07o09VrBM59R4roFXNH0pjCGavBAoGARTSr+d4C+bsnY9gGgeUD
+pmcJuVZ98AcAxN7vvpWg/qbi/H3iFHAvUj/bkfRn0M7WF8KS+p87TqoxwDJMHsL4
+FNH+8WfsqlF6VUfxGmYTnAUzQapECDInd6DJqiZ10TgCb/zcrhsZknIYP/evI3HI
+ToHU/Zd696N6MbhLN0ePXAQ=
+-----END PRIVATE KEY-----