daily autocommit

diff --git a/.etckeeper b/.etckeeper
index d8cdb4dc9a39522740f19c2b16be389134db5ace..4d5e071ae8c36ecb0d52d6800e63794e648da6c0 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1578,7 +1578,6 @@ maybe chmod 0755 'ldap/schema'
 maybe chmod 0644 'ldap/schema/amavis.schema'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
-maybe chmod 0600 'letsencrypt/.certbot.lock'
 maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt'
 maybe chmod 0700 'letsencrypt/accounts'
 maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'
@@ -4783,6 +4782,7 @@ maybe chmod 0644 'letsencrypt/csr/2727_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2728_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2729_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2730_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2731_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'
@@ -7515,6 +7515,7 @@ maybe chmod 0600 'letsencrypt/keys/2727_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2728_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2729_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2730_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2731_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0644 'letsencrypt/live/README'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'

diff --git a/icinga2/scripts/mail-service-notification.sh b/icinga2/scripts/mail-service-notification.sh
index c6847cae0718ad5d0bc1977a0d0f4ba652b7f2d9..c901f234dcbb7493731efffbb37b41d62b8c13e1 100755 (executable)
--- a/icinga2/scripts/mail-service-notification.sh
+++ b/icinga2/scripts/mail-service-notification.sh
@@ -5,7 +5,7 @@
 PROG="`basename $0`"
 ICINGA2HOST="`hostname`"
 MAILBIN="mail"
-echo "$PROG wurde gerufen" >> /tmp/mylog.log
+
 if [ -z "`which $MAILBIN`" ] ; then
   echo "$MAILBIN not found in \$PATH. Consider installing it."
   exit 1

diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/letsencrypt/csr/2731_csr-certbot.pem b/letsencrypt/csr/2731_csr-certbot.pem
new file mode 100644 (file)
index 0000000..e871042
--- /dev/null
+++ b/letsencrypt/csr/2731_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCS
+tSz5w/h+IB62BgaFhPYvN28GP0VykxJuOvll4Px058Qv5v0X9z3lRPSwY7fqVHVA
+hzVNrLvNecssjAMMWFPS1Dvryq1pUDXqwsLoX0tuKCKewUM9LYbNwwMOPNbTmBBs
+IQk1+VUGEa2a0Hzsr65gmigLLU4vMqqWZAZCCdvKEopNHjcVmT9GuUn8/Xq4VXcJ
+jwKSBqKa2bFpWnxKHLsKpqGMOLgZAkZ/kbRlBMY7qtmoONnLFNxwMmQntGv7SD6k
+ESLmpDFcqLD2l/AN4EqyQdxOGwLiQpA2BOMqfhdqku9l/u9jIZ2LxE4/ehwLHUTC
+r21RCxAO6067P0kRmJkCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAKMYZy2ZKg/Md
+2IdNziLjo4Bigm3BXfj4gw5NglKs2gKO5CK6x3VBVKNVpBk2FrXBqAwhYIs8QVwc
+R4TMJ7FWBxjAS1caFejQocRnP7iPVud7aHG/oXEBb2e4fAY1wDZmAmSGwNpBAfLH
+afUepR6BWbiiakNikgbW5m7JSpYGAU3N4pqUnyYeF94Cofc0ZwOivzL79GgZ+vpT
+3021LK/od2yt8RT+7+njgYP1sQYOs9Ov/0I+1AbD3Vtz/Ze/hxE4/JEzrBAg/BnJ
+PWbCm9ZapJVtSDuYiiYbSf3tFPCnjTuI3/6UKo3O7ybhsU8cXEIxy4z0tisjRnzu
+npJlseNCQA==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/2731_key-certbot.pem b/letsencrypt/keys/2731_key-certbot.pem
new file mode 100644 (file)
index 0000000..a103ecb
--- /dev/null
+++ b/letsencrypt/keys/2731_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDAkrUs+cP4fiAe
+tgYGhYT2LzdvBj9FcpMSbjr5ZeD8dOfEL+b9F/c95UT0sGO36lR1QIc1Tay7zXnL
+LIwDDFhT0tQ768qtaVA16sLC6F9LbiginsFDPS2GzcMDDjzW05gQbCEJNflVBhGt
+mtB87K+uYJooCy1OLzKqlmQGQgnbyhKKTR43FZk/RrlJ/P16uFV3CY8Ckgaimtmx
+aVp8Shy7CqahjDi4GQJGf5G0ZQTGO6rZqDjZyxTccDJkJ7Rr+0g+pBEi5qQxXKiw
+9pfwDeBKskHcThsC4kKQNgTjKn4XapLvZf7vYyGdi8ROP3ocCx1Ewq9tUQsQDutO
+uz9JEZiZAgMBAAECggEAQeGvFAz664eSy47wbsi9HVA4Aca8XLD++d42VN5y40vH
+gsn0l3/ceRN3zNKPuvrzHA4Qc774KmP4l/bMi7pseXj2XO2lMECITXncWbwP5glw
+t69iZPOIIMdCQUhcrg5DxtKHVtRdUaY65A7D5wk+bUTlWG/Cdy4UgmHjJHTxVHys
+eYqd+l1ES8xe7Lo4Jdc5GpFb2xFW+8aBwpHgRCEVUjCMueyHKnKONPjTa9NMA0jt
+pevJJQoUgxtFbwSPY8PE1GXkxEFChLfINuqIXJVeuijitCxz8w4shSKYEhfd+8+i
+tyABpet+ENPyWC2FSbjwPKzYUG1W6dsBpYUKkgrn9QKBgQDiZIs6dzRi1W2jw/no
+oeLyLfqE90zYlnhPl6mlaxbkhEMMMLU1QQCMA9SJxi+hHPn5C+4PwoU8Y7T8MXQr
+Dx95Fw3K+b+Q1enk2ilZPBAaEvkBf66wdbXG9CNLYOeecnSqoaCu/KLY+t4gGmoc
+sishr1mscRUierfmBVxDtLqaGwKBgQDZweg2p6XyP4C/SICZdwBDNwk772t5jWzd
+GJ9lh79v8QScIvqCuqKq8qa7vjj0GhmeXFfCtXnqi0DopQRe09S8GKfVNqjgY1uB
+8Ecjj74dusVbHPpNEJG1A+ISHXQeNOAvRMD54Zakl1/cZlj/BPA7GB76c/omLjb0
+G64nN7ODWwKBgQC5mzjSbByU0uoak3d2FBMd/jgffyiPgX2Ns4ewSMXx/8WAXwaR
+bINoR1OeyM8PxdPjLLa2UQIu6ofdIyZcjv98pTv3px45PkeOCpZPxIBnABsJ8YZk
+wXyQamPtTrtWGfwwUGaOUC2qurIVm9JXSHM4IKziRavQItBWUxq7n5ZE9QKBgF2M
+s3E/hshSxcHnqO/FMwStUTdBfT+kJV+640egEPtLZPqbAFpHSfj88+p2J0ufJuBk
+tYM9qZm8p28K7Zy7joocYYX0zIpRxQ9GpZk+eKOXCJBDG7kd5CsK9wVnR+puNt23
+wNvZMXmWWqV6BsPQYFBS5YQdbRsYAZ3PgnrwsBs/AoGBAIcnvy1ErGkwQOG+7N9Z
+pwX2pskzmw6zHpKv/1332lFBHeu4f+xOj9kJsWksblBehIv1b6ue8ve+87uexotG
+GKlMkkNZ6K/587VnOXAjHi180xcRyf7qLknY9+OQlL65udOscyQ7NZkgtvcAcLLA
+jasNljDAGj3fMky0xRn16++I
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 9dc14f4ccba8af3fb890b4f818ff3676bbec327f..2917fc658576f35e1e99ae2b7c3199b441a53295 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA4Xleeux1h5jQtAqLicf03oTsehpw6OeLjug+5RiBKqns2wUHGpVO
-FL6h+JOM3uWbfJOrPjKbrPUwnaejWqnilOkiJlweQlTbuiQTf7mr71FOgbmicWGq
-kQCdl7p8V3n6RbE6Ar5lfAGOOthcSMmOU6N5UVt/n6mgLKEffu6s3qeSlr3U83Td
-2y1iupevyhAb/GEeTlai1lDm1UFkG74hDyTB/LN9zJIgb6r0opItnX2GXElwMDvp
-IZJlqewC22VgTny6gvTdhYPqZR6KDf2ANsnXbtZEr+GXbGvW2hUcKiRlnUf0YwD+
-wOtHc9OQuThbR49wBDM3BTFgHHtyx8qy4wIBAg==
+MIIBCAKCAQEAzTqIXLhGKsuA4PIw2CrvlPSGtHaS+wPa9hIlTXEWka8GmYPZgRKO
+t52RiAF3slYXKz8gtPGK4MKXExBnW4L2irNJmuRThMT1ztcSWNYonqyJJqEJRKgB
+ypZlyQux9lxZbqbdRkV7+mNTrns0Ikt5HVsAFPxLnGLupB9OCHAt5BYZzAMQC0b5
+Y9VzsUqT0my+l6qGBi/LcX+K7X9x4hp0AJavVs6e3x0z6F0pIx3g4g3T08snEqh6
+lxi2xejXQRTRr1v8Vg4WETGLPN+NsN8yukjp7dKZndZWuvSLNBP7cvUhTF91uUOf
+3mMKBdhgDS1nXmNWYCupxjW7WtNB3bkuwwIBAg==
 -----END DH PARAMETERS-----