daily autocommit

diff --git a/.etckeeper b/.etckeeper
index a9b2416a082aeba0671b5b57b442cb6849a377d5..56c455cc0edeb9ade30b7759bb4a63ca941efab6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -5535,6 +5535,8 @@ maybe chmod 0644 'letsencrypt/csr/3279_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3280_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3281_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3282_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3283_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3284_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'
@@ -8819,6 +8821,8 @@ maybe chmod 0600 'letsencrypt/keys/3279_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3280_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3281_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3282_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3283_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3284_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/apache2/sites-enabled/graphite.conf b/apache2/sites-enabled/graphite.conf
deleted file mode 120000 (symlink)
index 4d567bb..0000000
--- a/apache2/sites-enabled/graphite.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/graphite.conf
\ No newline at end of file

diff --git a/icingaweb2/modules/graphite/config.ini b/icingaweb2/modules/graphite/config.ini
index 9e8e5735d24e6ddae7537bafac65c58bdabf3da7..63054c79da72e27e2405efa7d0fe7f69b17dfda2 100644 (file)
--- a/icingaweb2/modules/graphite/config.ini
+++ b/icingaweb2/modules/graphite/config.ini
@@ -1,5 +1,5 @@
 [graphite]
-url = "http://207.180.228.45:2003"
+url = "http://207.180.228.45:80"
 user = "admin"
 password = "LgnhywREd4INdvhsQdqYAsuicEju0Yxi"
 insecure = "0"

diff --git a/letsencrypt/csr/3283_csr-certbot.pem b/letsencrypt/csr/3283_csr-certbot.pem
new file mode 100644 (file)
index 0000000..225c391
--- /dev/null
+++ b/letsencrypt/csr/3283_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8a
+apQFdp0mIThnjXycOwjT5aEEyfKfLLIcieqOgX+pH0XBogeUNpj/pst4VgylxfMq
+ylkj4cUxhk8ys0RiU3U+QWs2vegBvL/IEFfvatehSnrs/7Dn3Nd6Vccgt9NPSYaJ
+Rhv3ywPewI1S+mZlxOtxtqmu5pfFDxbQ4HaNaEk+0POwIj2mzCDK1lTcIh2D/O+x
+srJYm3VSc2VOoK0ggKRPGVpp/l9+/zbBbmAI2ZcK0VwFKsEPd8ZZRA6O7Iq+p85A
+n/Hs5wltpfYh9QuJk58uU0EfbK6Emhl1+QbC3Q+WXBXJCNF/SPKJy3k/GtuX4NNj
+IHLUmTldaR1tHI0sqWsCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAnQUhCz85th0b
+S510aEoq9HTUAflMY4M6KfdfEOmRyfT3+5dcae1DC+ry2qQZfQ3gOJhGvlORWh56
+FtijE1XWeQRZkYktXcrgNUSeoA8S1s6YDlr3kH8+SDLnHfs7te61SChYwFCkBzmC
+JZhQRh42EsWcCPD3/3GD9kzuo5LderTbP5uE2uJ7B9BZw7tNQ2EXJB3R3uLOdZYE
+0ybM9C6wNoSkSs/WEyM4t3QymHJm1WYVAvVUZyEQxJMgUZfkGxMD4kTTOrVtsWYp
+iW2Y83r2p9sSytvvz+oxJcvEOk4i4EKTH+cabMmpF1UQYDymA+geYFK96a4nI8yQ
+fkF/tPAG9w==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/3284_csr-certbot.pem b/letsencrypt/csr/3284_csr-certbot.pem
new file mode 100644 (file)
index 0000000..560cd93
--- /dev/null
+++ b/letsencrypt/csr/3284_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKfa
+g9h1MkYZ41bVavbXpeF94umfLq4It5iVRTf5OGifTBLF8cZWvpZeg2DmPiOXnTrK
+B3sJR2nXAOJouJQfsyTwuGWnwis2nptWbBjRIHM6NW9dlbXfdUEry7D3uIVcaVrD
+4s2NnD6dQwgvuXj+xWIjWJpZ732bPdh745Ff4dL+a2Rxl0c97CKG11c+JlA3WPhA
+d/Ud0FhM859Eq/OzWWWtg/zEljOevpHwRproTTrwQMf1/O/wdcm2gXm8nBjY+MlX
+5hqNpRz6OLcxneOQa/+y/x5+qOQIhD4mQ2fiiLk3BY24GTRa3mS4qtRGDOuvQqC3
+qie2dRc6IvJyuCuKXacCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAoXoH3/dSJqvR
+/w1W9vhsx+foq874GzRz4bKF/AfSrZUGgH6t1rQY0vJeuFZrX3FTboXD84tfkSn7
+1vwt6DL2qN1t/LPn4JiEPTeN95+dRj7XNZ531rAzGCKCrKiyBHftxecnE+mjJed5
+aSfRPfRp+Z7lOFELGGqcBEfk1pdv/DR+GjWXQMOldjdaMAjMnpBALnKhAxbu7B9h
+8jjO9SL/E/tcHh9U1poFrnHL8kNZv2el+asTC7hcltFS+QYblwiQNy/OcyI4B2sy
+aSKLiifFCVezE3OMCcT3W8J7OI1ky/g22SYsZmL3M7ZEJuyhlbNpUwfE4io82uVk
+soTiGGwFdQ==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/3283_key-certbot.pem b/letsencrypt/keys/3283_key-certbot.pem
new file mode 100644 (file)
index 0000000..531f272
--- /dev/null
+++ b/letsencrypt/keys/3283_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/GmqUBXadJiE4
+Z418nDsI0+WhBMnynyyyHInqjoF/qR9FwaIHlDaY/6bLeFYMpcXzKspZI+HFMYZP
+MrNEYlN1PkFrNr3oAby/yBBX72rXoUp67P+w59zXelXHILfTT0mGiUYb98sD3sCN
+UvpmZcTrcbapruaXxQ8W0OB2jWhJPtDzsCI9pswgytZU3CIdg/zvsbKyWJt1UnNl
+TqCtIICkTxlaaf5ffv82wW5gCNmXCtFcBSrBD3fGWUQOjuyKvqfOQJ/x7OcJbaX2
+IfULiZOfLlNBH2yuhJoZdfkGwt0PllwVyQjRf0jyict5Pxrbl+DTYyBy1Jk5XWkd
+bRyNLKlrAgMBAAECggEARkWNeV7E7iaOQrJ5aZ/9aVKZ9urO4+O6SMiLwm+imPH0
+qO76CPVsWjhv+hQG+GGg97j9bWfvZla+v7KyDuxlKhC5d5ZKoNy6rn7/24YTcLVD
+sQ4jO8cXAzld/3o9fnuCWvFxkWk+Au9POOiRYUP89GL9O0owSxDQaqBmWdHHzl6j
+Q8d77huohwtZIh/HFDsjRAE5MluX0EyLBYsPCbeuVk/aGiYKxW+v5A6uLz3HiuKv
+SvdXNTVpEPtt9oxnDYF0Bq+DCYJTqAqU8cYkcwzF3/Kc9BqgCLCCwaMvVHLy6oV4
+zFKkSkQRM9kWK5GpzIvttL9XxNkMh+BUpXt1EH8ICQKBgQDfo1Ry9wimqstRQlYj
+DDCPjLJhOYpKDhojhjQZWNo7OuaJe07j1obXe6V5kEpVN2ooYlGJ/YcLeWTw177b
+5EJKYcP41hbspMCssjNA74PFzX1+4kBh+R2b3tZT4Rt5WgtWHfLpToVh6fffxXpT
+Op0dy5yl8kgk4t0Q/xBP5hAfVQKBgQDawdWFbRkcEtBc9JmNBUxr61NlXMDTPJ5a
+BqmJsJnEIbvs+xMFQJy9+7Cm//5aIUpQzzmMYiLVdm5stYzQ51KBWUklQTwrCsAw
+yYZB4UPtXH6KxJQxGKKakFnB+zvfLGtSQ3ofasCWVSWkT0n3FC/tL24MZ6lH5IfA
+31t3PCYlvwKBgQCKslwclNLbss83zUFoqRWw4Zx7qdj3Rrm1UHUdRzrJQyVZHI13
+xkOIfpnIw9El+qEu/JL/VqobVqVgrR0kePMX+Hw25mf/ScppEHezDRiXY3MybxVo
+7bwMQG6CRPjqEQs41IgjY9xbNmTRdkMAPTjWEsJLNPDDV6Os99NhChjzpQKBgBJc
+pMyPTMVDewPicCUbJcAFP7nJYFIay3vpBUAOd8mzvy90H7OYKc/0mW5bHIF6O9+u
+lTkIX74lM72iO5Cpag57bR1YbXF7dIhj0gYjn20ED4ccWwgH9lYc+bvDl9Hyy4tb
+KJwMfN/hg8hX83Bu3Fr/WTBnXxkuwIpa9TV78gPHAoGAWbMLRVH59XbTOVwdn+gJ
+Awfmskb79p0kxligvHZCelWjBI3rMX2Fh2IW6Hob9Vp7dRKvdgCI3uWoq7PKrb4A
+hN4vPPisXuNmaPvHQD1JSq3ZNOn+9PhfHsG5XfCRJD3rWkDwIHvzULIulgOOtKhQ
+9C5qpllIfGCuSfsN6nWtk70=
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/3284_key-certbot.pem b/letsencrypt/keys/3284_key-certbot.pem
new file mode 100644 (file)
index 0000000..69679c7
--- /dev/null
+++ b/letsencrypt/keys/3284_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCn2oPYdTJGGeNW
+1Wr216XhfeLpny6uCLeYlUU3+Thon0wSxfHGVr6WXoNg5j4jl506ygd7CUdp1wDi
+aLiUH7Mk8Lhlp8IrNp6bVmwY0SBzOjVvXZW133VBK8uw97iFXGlaw+LNjZw+nUMI
+L7l4/sViI1iaWe99mz3Ye+ORX+HS/mtkcZdHPewihtdXPiZQN1j4QHf1HdBYTPOf
+RKvzs1llrYP8xJYznr6R8Eaa6E068EDH9fzv8HXJtoF5vJwY2PjJV+YajaUc+ji3
+MZ3jkGv/sv8efqjkCIQ+JkNn4oi5NwWNuBk0Wt5kuKrURgzrr0Kgt6ontnUXOiLy
+crgril2nAgMBAAECggEACTUgZGBRaK0E3n+IhY/gxpTMPLqBqgRKZfFSQbbHFF4g
+oyr+jz206LS4ijk3EWbAtjfc3y/sHe8wWjsaXO28OvuFcfYY3Zv6aVT9SwM1v3xi
+7//3NWnTmcaYPtXn5lDiapsyNspc1sZzpeBQUUXQeAiuVJE4ZPB+HQD2w8O5tIQv
+i4ew87qxHuaE6PhRXlqw21C3yvoq66jhIdmcKw5w9HA1mtmFbruQA73zFq591pqV
+zu1DzRtVp+2wZyJCPEbhKVhxt4pOevQEbuBuzEwyo5jU6R3CV3kw205SoWdAg+m7
+PVSJptDmUx7lPxH0S8UGFVE2Jg/oeJDKpUteNPlb+QKBgQDRoJHAlmY/RBZkLUCI
+v6+eIUMbta0t4tmlxiEzaHV6qvJO8r8d9Fh+bDrhO7uEqPk7aNWn4ZT/0gaGiRpU
+D3LvxQyVEJBeJoeXDAl2TupMh8F5hEhyKyrJKYo3wz8O/KjH90wNgiIPFnUC/rxW
+u4RwEFz8OmrakoEeXMaVs+pkuwKBgQDM/EGBIzsqlWdG+p6rHimlefLQRUgx0Ryo
+BPN5WdmIyZo73wBkyeuwfrlA3gelYrj3u+hha4++8GZBGC34GdcDqPW3uZdyBrgt
+GvdT5HnDetRcYCC/NxVkvRRlGjb1D39rA+NAprfEaL0dHpXKkumtAw10XqhaLpxy
+mRbp+S/SBQKBgQCf2OcLiiQRniPM48zP+gs6c3auzIxv7wm0JS7v+nmKvovis6wU
+dVx9mp4TXe8Rq5/RM5GoYJWztT2QnT9cViN4vjNn/6d2g77k6SLV+jsjfGmF9d8g
+X9ZSasCg4NtW3Eb/pI1zx4WdJ6y2SfTn1jmZEoE1PH56iTi4JFqxkO3tPQKBgBTj
+9G0LwSDi3wadzgPUbBwgJH3TQbtJ+2ioMIQCgyfsm9pULL8Y0PtIvup8dj0FpaIh
+tVoQUzL7XwBtTWoGgCIwWvJhaKzHQIfgQqp7E2m3n+LWLSAvpe+BUY3IMSeib7Lh
+T4ysMPhEUFmiX1Ooy0XFlN5yMygVrf4D2hD4Q0ZdAoGBAJkBKF6jcX5gqeP0Qpw5
+m200w40IRP36arAzp9yXVLbiyT8qfQhjOk/pvJ+Z9gWDeg5i/bIYyEUwIXbpZz4W
+lcWtw8jX4895Zy+zCV2gX2WsR9toY7fMlHRGPOX/LD8XDTmeiMpfQ4xNXJAoLT5Y
+aXo5Q6InSKV+x9laoXAcnz1U
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 83f9faa403bb7c882addf7c50ef9cac9f7399f95..88e8e35aaf5d27b9c296ae431ef30c3afea7d687 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA07vkrgLQC4SXET6xk/gFAuzQR7mgwfWw70LhZU3KX64ThqAkC/OF
-8j6nmrIYoNQwKGVbnqzK5/dPWPhL2+k3oEhvfNfpBQJbr1VRl1ukdWa0/QREeh2u
-8hPGtZ7HJsH+FzTrdR1GR0qELUZ5ceAXdv5JEDQIe68iEZ8Py02TRh91YQuEoslx
-YcyXHuJavnw5bqu5LZpxYfjVKTiwzXU3j+3GWd3m2CwWE1HH00oHIHy2Ox6tKhOi
-RLp7eVN1dxt8vksV77U/EXVWHplBWV/g2uRZ4pdCIyE5SvuLb0jZYD9BVsIsG76T
-h9UJioWUoSG+/Mus+CZEcFIjG4WrEwKsgwIBAg==
+MIIBCAKCAQEAwkqwdFyjmGmIJxbdA0OqTDISXpzyS5CktuVVwJNxVDDoB6htHotZ
+mxYyaiVa0ztvI8J23xHCYgAHnS3y+CuYGiEwHppluFcUzUE5pdUjhZDAHP9zJUsS
+2qG+q1czPLBD7aiibkruJsF7iXpEL+uzy6djkH2xW0rNEJThSlpZ3/7Kb6bfKWAQ
+YC80U4X2UIVziU5fjK1KVjZKOmeaAu0BmOrL8/Cn0ALuaJZOUqU4oIejSAT9msC2
+1SJpZDCA898QiDeRwPK5Ji4w/zWVi6hVU60hnIFb3GABkjjXL5mGcUMKQM1J+Qz9
+UEd+IZjNMN0nSEFERYqfZRlMLFlpF63V+wIBAg==
 -----END DH PARAMETERS-----