saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 972ad458ec9df54c9cc39497c1607b9171b7bb56..57a072101738a438489a179f8a9ceca19f891032 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2731,27 +2731,6 @@ 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'
-maybe chown 'nagios' 'icinga2/conf.d'
-maybe chgrp 'nagios' 'icinga2/conf.d'
-maybe chmod 0750 'icinga2/conf.d'
-maybe chown 'nagios' 'icinga2/conf.d/api-users.conf'
-maybe chgrp 'nagios' 'icinga2/conf.d/api-users.conf'
-maybe chmod 0644 'icinga2/conf.d/api-users.conf'
-maybe chown 'nagios' 'icinga2/pki'
-maybe chgrp 'nagios' 'icinga2/pki'
-maybe chmod 0700 'icinga2/pki'
-maybe chown 'nagios' 'icinga2/pki/ca.crt'
-maybe chgrp 'nagios' 'icinga2/pki/ca.crt'
-maybe chmod 0644 'icinga2/pki/ca.crt'
-maybe chown 'nagios' 'icinga2/pki/home.hoellein.online.crt'
-maybe chgrp 'nagios' 'icinga2/pki/home.hoellein.online.crt'
-maybe chmod 0644 'icinga2/pki/home.hoellein.online.crt'
-maybe chown 'nagios' 'icinga2/pki/home.hoellein.online.key'
-maybe chgrp 'nagios' 'icinga2/pki/home.hoellein.online.key'
-maybe chmod 0600 'icinga2/pki/home.hoellein.online.key'
 maybe chgrp 'icingaweb2' 'icingaweb2'
 maybe chmod 2770 'icingaweb2'
 maybe chgrp 'icingaweb2' 'icingaweb2/enabledModules'

diff --git a/icinga2/conf.d/api-users.conf b/icinga2/conf.d/api-users.conf
deleted file mode 100644 (file)
index 0270578..0000000
--- a/icinga2/conf.d/api-users.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * The APIUser objects are used for authentication against the API.
- */
-object ApiUser "home.hoellein.online" {
-  password = "jR7u7zH5dVFdewnK7Z5TH6RH4p"
-  // client_cn = ""
-
-  permissions = [ "*" ]
-}

diff --git a/icinga2/pki/ca.crt b/icinga2/pki/ca.crt
deleted file mode 100644 (file)
index a51b091..0000000
--- a/icinga2/pki/ca.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEyTCCArGgAwIBAgIUatpF57OIxtZKq/r4PPt0ET6AQfIwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJSWNpbmdhIENBMB4XDTIwMDcwOTA5MjgyMVoXDTM1MDcw
-NjA5MjgyMVowFDESMBAGA1UEAwwJSWNpbmdhIENBMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEAsAeZlVG8oIX5MUATgfPJk64t96p9K7JSxSw3vHxYRv/2
-JN7ouQuPtFmB45uUcKlzICUwedfC0zK0K/GSr6KX/oSXHYkQQRkJxWw8xupmSqBK
-CmZiONBNlKMgGuUU4+CvXHapZw1N9JhtzorWStuZLNNo7Td4q3WnaojHNhkMDSY3
-1OSBBZzAwySoQJ4qiUd+fPwJMaTmbXo2AlJcvrNX55uPHQP5Su/jdhJKML7A6Ti4
-426/Sn+1NMKgJO5JZdDnr6dm4AXZgz5H6dR5lv7ES7NypjxBe9Vrt6UGf5KeDW4F
-w6ADJCrpNFvDCfm5VMGPzzSiuJ9RJpGSqIj9aV7YnxijxhItCT0ze7HS8sbhZIH7
-pJezUA9fYZW8vIUH2HgCjfPcAcxUSXrqwSRa2ALEDV8uuvX2eFQsBpFYRR60zxj2
-seQJ6ri7AkwrG7QOzgiFSJDqP5psmut8vio66U4e5l2mta+DhalEGducGvsHj4St
-g0z9ACrx1Wa7FK2V9/JAnarMCVTgXhzpIov7axwwTzs2Dgbs4zvWV0X4XSw2bHgG
-psTQxMAIhI5AfNZ7Dyvc4G6Hev+Tp4BpC8HnIJNOo0hvT2kH4864KvYC1IFw8Af+
-tUCnPYIvgq4I7vpAqRaUs4fjDySXmYv4zlZpHuIIcjAY68hwHg4sdFWN5gc/v1cC
-AwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAcA/a
-VtmAn786QLrJLgoHUSY3cx4TBZAX4CQsuVpqvu3WPzrOxNeU7N13Wmfudv1RplLB
-SQ6VTk7yeCC/gvWQKdLOJWljHJyRka2WUuCRGM59AcsDrkKQJJ3ZOaafOfG88P1/
-1FaQ3lBsTureyLMlLPh2DI/al8hxs6jy7CDJ70YZ2sjT2vchMfCD1KFMNwVmLdDa
-yb0DeziGfTq2/g9/UHG9vUy+ehX0WUAAzzR4ltxw9OyuRypHyKUr2XOOm5B5Iv0d
-vZ5Gzo3Z8GKlDuJD0pox7xQqS+dGShk8euZRS5vpInMB4WoVmCdZglKBENP+uVAf
-5yjJjaK9mOPCwqi1MxZqYAoFM8wBH25Hoy0+y/WnSKPR3mtamEJI015V83BJYoT7
-B+8cuM2nWDBn4lCo3Cev8v3/aZdcs6IJFUhoDX1NJHX6fpztfu04IfveDdsnbjSx
-flx15nzekzisgErHYNlzc/LF5+IK5FWIjmuHJeT3oNe5KVn5GTpHIf0VhDCqsp0i
-IBI8530k1W2Gen9snY40KXWQdVcr4xQ3e/41oAAaqqKtsuEGGib31oRNZwX/okOG
-vngTxg/gtRtQauzH6BkjOqlxmdsNpTFFXc5nryGOLKg+YS0+iFuCjYeKdZ0AebcL
-QAIg26t+Z9o9aLE69mAfjyV6Nc6aOHHwNx6lQt0=
------END CERTIFICATE-----

diff --git a/icinga2/pki/home.hoellein.online.crt b/icinga2/pki/home.hoellein.online.crt
deleted file mode 100644 (file)
index 0da625b..0000000
--- a/icinga2/pki/home.hoellein.online.crt
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE8jCCAtqgAwIBAgIUZpP0AwL7UHRlL+nxOJn/F6EDeLUwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJSWNpbmdhIENBMB4XDTIwMDcxMDA2NDQ0NFoXDTM1MDcw
-NzA2NDQ0NFowHzEdMBsGA1UEAwwUaG9tZS5ob2VsbGVpbi5vbmxpbmUwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCt1TFiIS+IVEFbjPlYNFwh5ITk2b1Y
-g3X8gkljyxk9PJOR68CewvZVzrRPKjX84zPYQ6NyQjnvT9wntHTf/YNnNBgkkl6W
-YS2P575owtWKVEba3V5RBIjV6LiIj5Q2Kldug2zcKQKdkCi3iaXmGRlgS4lH6OX1
-Ayr8dV0LoLlZaAgGEC3Jx4LtaRLOfpbYyGsU/suvF/vIBVGd6vwyDnytPRZFavjM
-3x4p7krH2e9LxlZJtJFlHSuqLiLgaWvaZXbTquLtJTR4sZfUPv6HzYXscY85h8fI
-VibxxvrQbkIVxtjishETak3IdKAzRUr8nz41FlnaxlbH8r8sFN9D+eoAJsuuYMC4
-ABvrD1oAyRhmioFrrTqjv5y69HRwD4ea2SL78JJlxUZZt1s9si9WyyyNRQo/b3p1
-C69YGbFUa4CVi7OOftRDth8HgikLqan+DarQ65pjcJgmD5mgWroFY6L54JrYXIxe
-9/l/+VMeE1UoBd8V2R5sw6uZJcj8/6uYfLUmMScgaF26M2hW0KMrLYlm9kgsvm+j
-CaPj7XxkvRL6DNfnqOf3pMd1gjhEtgDwRfAGPvIVRg3TketAsUSk1xZSsDoqSCDz
-NhNE/anPxX3dT4M2UQsh8qTk8l36X9QHtu/n84nHjQsllP7l/tNwmn5U4ixhs2dj
-gCUNNm1xGTHDXQIDAQABozEwLzAMBgNVHRMBAf8EAjAAMB8GA1UdEQQYMBaCFGhv
-bWUuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4ICAQBXePlkQuFqMmcd
-/kRSTZNY/QCIj5fu/pibKeumMdx++i4CAhIGFcsZ9Xe+p2DRIIaPCCgnaPIm1TYS
-QAAhLm/ysm+tetmsYm+s2QaylPfqC9M1rtpU06M3mOOrm4A0yl8yO4grXHDbKrw9
-ur49PmRW9SntDf/DfvshyoVkas++aZrd6r9Xk+Fa4A1IDfKaWmjArEgLjfgjK7y0
-ItCoFhFf9A2HZkUcjopshlach0VFWm+HGF13CCbuBq8OMp2clVMVxVwjBvfo5k/S
-/0i41pecupvkuu722LGMfNpIrHz+mgzagWVI9/l4YvBww7gQFchrKs+czWmkLyfM
-MKTz6vt2KBExEeLCrPJYqtr8M15VxpL18Ytrl3AmPHV/s2yLxeYRldUuo+kcNr++
-zh22J1nxQ+8GMjgROfD0kBOyjFAqsqi5lzUmAkR7yAQpwLQgyonYe2FSyWrRS5kQ
-0S7zlJhLQZsrBdxwYYYvJWA86Bag8+YySIsGFjTsksGp/MhtF5yjAmNDis2OacQT
-WdBVgnsMh9iDqP9OPwNKL1jM8MEhOeaVgo+/4yj6YY181ohO/IOBTpG6Fhemmi5j
-kVWnQ8tAD1iTgVSRsf+m8kfIwHIdPMrCRGO8aynT6DaABR2ur8cwTUx8rV8VutH7
-JahwSGCt62ktlINCIWqqhzG184Ivvg==
------END CERTIFICATE-----

diff --git a/icinga2/pki/home.hoellein.online.key b/icinga2/pki/home.hoellein.online.key
deleted file mode 100644 (file)
index 06acec7..0000000
--- a/icinga2/pki/home.hoellein.online.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----