daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 47e0864de50a6d3f5a432fd05dff7ea9f69ca8ad..abf9c1b7ebcd462288f581abfdd427f3f99dec39 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1511,6 +1511,7 @@ maybe chmod 0644 'letsencrypt/csr/0328_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0329_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0330_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0331_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0332_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'
@@ -1844,6 +1845,7 @@ maybe chmod 0600 'letsencrypt/keys/0328_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0329_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0330_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0331_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0332_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/collabora.hoellein.online/README'

diff --git a/apache2/sites-available/dyndns.conf b/apache2/sites-available/dyndns.conf
index 89dfe130fead8712f230a74cd8d4143efe1d0b23..7bfd6b2a6f06f57e7cad7f414a5fb623d28a36f6 100644 (file)
--- a/apache2/sites-available/dyndns.conf
+++ b/apache2/sites-available/dyndns.conf
@@ -1,13 +1,38 @@
 <VirtualHost *:443>
+       DocumentRoot /var/www/dyndns/
        ServerName dyndns.hoellein.online
        ServerAlias dyndns.hoellein.online
-       DocumentRoot /var/www/dyndns/
-       <Directory "/var/www/dyndns/">
-               Options Indexes FollowSymLinks MultiViews
-               AllowOverride All
-               Require all granted
+       
+       ErrorLog /var/log/apache2/dyndns.hoellein.online.error_log
+       TransferLog /var/log/apache2/dyndns.hoellein.online.access_log
+       CustomLog /var/log/apache2/dyndns.hoellein.online.ssl_request_log ssl_combined
+
+       
+
+
+       <Directory "/var/www/dyndns">
+               SSLOptions +StdEnvVars
+               Options -Indexes +FollowSymLinks
+               DirectoryIndex index.php
+               AllowOverride None
+#              AuthType Basic
+#              AuthName "dyndns.hoellein.online"
+#              AuthUserFile /var/www/dyndns/htpasswd.dyndns.hoellein.online
+#              Require valid-user
        </Directory>
+       RewriteEngine on
+       RewriteRule ^nic/update?(.*)$ /index.php$1
+       
+       SSLEngine on
+       SSLVerifyClient none
        SSLCertificateFile /etc/letsencrypt/live/dyndns.hoellein.online/fullchain.pem
        SSLCertificateKeyFile /etc/letsencrypt/live/dyndns.hoellein.online/privkey.pem
        Include /etc/letsencrypt/options-ssl-apache.conf
+       SSLProtocol all -SSLv2 -SSLv3
+       SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH
+       SSLHonorCipherOrder     on
+       # HSTS einrichten -- erfordert mod_headers!
+       <IfModule mod_headers.c>
+               Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains; preload"
+       </IfModule>
 </VirtualHost>

diff --git a/letsencrypt/csr/0332_csr-certbot.pem b/letsencrypt/csr/0332_csr-certbot.pem
new file mode 100644 (file)
index 0000000..c77c29c
--- /dev/null
+++ b/letsencrypt/csr/0332_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfI
++s8YPl8nQ+w5hhpptujXXAmyPuyXcZk/F95QSwZsuU0NLF9HSJxjLx/RfKs/+nWb
+76RaeSf+J53wzH6qmEDJg2dhp+8mrr/csfaV6FiTLpQKRVR0AU6y+H/0Jycd3ikY
+E+2Sl9u+Je0Pd89Bhp1/lWDDxmdetvEeBbVvVPQ9lR00DJArrUSbJg5TV/Sn/Er2
+nbJuef8ZKASkkG/i4HRGTMoT5rGOKvQakI0ff2gjWNO7WxN/UQ3y1e8Y6/rR9SfD
+2U/TPLAVz4wv7VrP3srVwWbzYk6UH3g/+ywksTOD1Ue60dS1KdA5cVi0aNk7swVa
+ZGb2bwfvM/1mW1kJtosCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAvsfID+6P9s0Q
+YjvzzXAKMEXg4eJdPWrS0GLvt8K25pXUm8aUZ+6evPMMxBzQFP/ox+UWzuw0snda
+TWAccHv9D+u+NjQ02dNfKYe6fTJcdlPxJ50cvJp9k9nX2ODyNhbhRzyZi0azF/pS
+B95uVWGMZn3JDVzlQmAC8ONZb81sVYyO0yRFeyRQyr+l6JtAatv5lWHYV50Wfr5N
+0uGFe8ScOC+gwetFPe5NyNyh+wetGd/abLKjk+7t05zhdfSrdOQXKFQuWDxMwUmy
+cf3z+kua71Yf66On6vtngtPThezrwY+1kdb/4kPGArvF2iaoje0VZxhw6PMze/zR
+pC3st1GEPw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/0332_key-certbot.pem b/letsencrypt/keys/0332_key-certbot.pem
new file mode 100644 (file)
index 0000000..473ad13
--- /dev/null
+++ b/letsencrypt/keys/0332_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHyPrPGD5fJ0Ps
+OYYaabbo11wJsj7sl3GZPxfeUEsGbLlNDSxfR0icYy8f0XyrP/p1m++kWnkn/ied
+8Mx+qphAyYNnYafvJq6/3LH2lehYky6UCkVUdAFOsvh/9CcnHd4pGBPtkpfbviXt
+D3fPQYadf5Vgw8ZnXrbxHgW1b1T0PZUdNAyQK61EmyYOU1f0p/xK9p2ybnn/GSgE
+pJBv4uB0RkzKE+axjir0GpCNH39oI1jTu1sTf1EN8tXvGOv60fUnw9lP0zywFc+M
+L+1az97K1cFm82JOlB94P/ssJLEzg9VHutHUtSnQOXFYtGjZO7MFWmRm9m8H7zP9
+ZltZCbaLAgMBAAECggEBAJMNpUcwUiCZ9032XXYtn/utIUrlz5k4M96X6UqzETYu
+awqDCskq4BB0lSg3eytWEVXmLLNuAMXmNmTz7KHDkgQGD9nVsNXARFpm6PtXBknE
+NEG1eaibJqc15uHP5c3OF0tqNKjnAS42vRXMD+UXFy3wzhQGppBJ0CCUd6E/zGll
+aa2/wFNCWDk+RuTvnyiYczQ0mCdsgZJbH7EoAZszfMHxsDobBjuIcCp8ERf8JkoL
+2j7GuUSGiVyr0fx+SN9xA34CCY/HxRlO4TenqAYK2vn60fr8hHRmUIZV6HPzPcBv
+2lJU+IgRIWYPK0ocgDX+T5uJxDPjWVqsZyA//H33d+kCgYEA6jpSlQwpS8aNJjQZ
+RSQ+bAxND0RKCm+VBINNToUt9uclEhmTljd5BE2DFhhhYOgT9RpGiwJnPNaxkjqd
+64ww8q3v+vrAnd897ZIAFsVgDvp7LgNaVfiAbbOBBu2ISLqFIaoIGRPiokIOb0WR
+BKdkUMJJX1Y46kq/knvNSWUQh78CgYEA2lsPCBYgTc5TB+2t4rt75l9X5aTWTreF
+caXixaeJYUR/QDho63JAWc9Mvk35cZF4qUHtz2AkOiHyXPgzVHaUTMsyFZa9GaTP
+3dMPSDNyAOCL2GVUn7WlHV+P5L5smCw/nfUgvsl2vR3x8OklUkakQ7X9rW8pyJJh
+vr5s1UYpZDUCgYBatvfg7fLYfC+Sij73PlBGvITj0sjyPcDzHH9GV+Iza9Y5qlo0
+pYtjFTodxpeAVqHUHbcQg3/EWkovnjAnWAZlFuSIybDr89giOJd8Ojk30979NSM5
+hKMI2aqxKjHMKSECpr24KLFvsjGw+rptmP8LIBQWrmggpY6IhxY8xL2gNQKBgANk
+SrV7coEC5XNIE91jwCbx8DGW/+U1IJOFWiJr2cxy/e8HcUnG+ozqlWyXVXqYIeGv
+Lnx8J9PnVxZunI2BUghnV53SO5m8X6Y4cxJSCkFNO57e5BOfBLOSGnAZLSKn/Uz8
+08di5b9GSc3OMVA33LFYkFozUdjVvULzPkmJz3bJAoGANchrIrA5NSdvid7b9MK2
+scjpDBreIMY2KKX8Nw1jmb6XAX4B5H1zgPJkEaVgKeF8zG7IZfJb8wCw/bZMJTqD
+lnifzgpQW7+iDX7dk6OuJBIUIcRWm5e04cTsabipQclZ0yQSkjMRU8iwzHmpVGAR
+6M0MKrfAxnLYAclMmvv3zuo=
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 4455a33cfd27a1f833d96eee1a154a45a3c0e8f4..59693b9512fd18704a49972335ba661d125726ef 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAjVKcrNdSxOtaSY6fUMovEsJm8hjxLua/cNP3mklMHmOPjN1rnIhI
-ERhrbP/dNViMiStJN2ACLGZB6/er07jWNrPPId4HxqzYoL/8dIl9sZooZueajuJj
-jwVOmXLQeHkrhHtzQTmmKucGPa9Z1/rFp9A2RYqT5yYlx6coa9M7ja1vk2GRvE72
-ViYiEgflOyltbk07fVzHPUtuXstMBgPNZ3YN1gijHbcZxurBDkhwa+ERtbs3bLgK
-ZVd5ofgBJAOO1WU2x/44xV00jyZhPJ4LLWpi+MwivJ+Bl5wlEvkl3+zpnoKUm7SJ
-msiScTo2lFv3fD5y8945Gms0y6Uh3zV32wIBAg==
+MIIBCAKCAQEAhsLaqBFGLVHS9QQD6qMZ7T6VpyaPDtvKiwKPSjq9iEstlnq/Rk+1
+cYta10oELJwMJDtNZCTe5KJaeLLy/4Pcw6eEEpnPIwZRC6oDIce/S4keIaCv7Ny3
+eaZfCOh1IjgiPsl+m0t81H1sUSXO1A+WGDlN/AvlOGYp7Xfw5jDlRITBWdcIRlCo
+x8xuIkkBZlJXVuxeMuZkMexV0DGmlnBjYuX/ZYeldHIU0pSC5XMoRgEn+PpwblmS
+wXHoGoOO2hWatneGeS2h8paSTQqrxtUz5WPqE7hxAKUyDWWzpoH3/PScQri2ml0B
++KPB3Clc9QIsXeFO6+nBpov0XF75eUIocwIBAg==
 -----END DH PARAMETERS-----