daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 74dc0ded43089ce3928c40fc6238d3778d3fdd24..fe9d80b14716cf899c28ac6de9eca4302665192a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -459,46 +459,60 @@ maybe chmod 0755 'bash_completion.d'
 maybe chmod 0644 'bash_completion.d/fail2ban'
 maybe chmod 0644 'bash_completion.d/git-prompt'
 maybe chmod 0644 'bash_completion.d/grub'
+maybe chown 'bind' 'bind'
 maybe chgrp 'bind' 'bind'
 maybe chmod 2775 'bind'
+maybe chown 'bind' 'bind/Khome.hoellein.online.+157+03655.key'
 maybe chgrp 'bind' 'bind/Khome.hoellein.online.+157+03655.key'
 maybe chmod 0600 'bind/Khome.hoellein.online.+157+03655.key'
+maybe chown 'bind' 'bind/Khome.hoellein.online.+157+03655.private'
 maybe chgrp 'bind' 'bind/Khome.hoellein.online.+157+03655.private'
 maybe chmod 0600 'bind/Khome.hoellein.online.+157+03655.private'
+maybe chown 'bind' 'bind/bind.keys'
+maybe chgrp 'bind' 'bind/bind.keys'
 maybe chmod 0644 'bind/bind.keys'
+maybe chown 'bind' 'bind/db.0'
+maybe chgrp 'bind' 'bind/db.0'
 maybe chmod 0644 'bind/db.0'
+maybe chown 'bind' 'bind/db.127'
+maybe chgrp 'bind' 'bind/db.127'
 maybe chmod 0644 'bind/db.127'
+maybe chown 'bind' 'bind/db.255'
+maybe chgrp 'bind' 'bind/db.255'
 maybe chmod 0644 'bind/db.255'
+maybe chown 'bind' 'bind/db.empty'
+maybe chgrp 'bind' 'bind/db.empty'
 maybe chmod 0644 'bind/db.empty'
+maybe chown 'bind' 'bind/db.local'
+maybe chgrp 'bind' 'bind/db.local'
 maybe chmod 0644 'bind/db.local'
+maybe chown 'bind' 'bind/db.root'
+maybe chgrp 'bind' 'bind/db.root'
 maybe chmod 0644 'bind/db.root'
+maybe chown 'bind' 'bind/named.conf'
 maybe chgrp 'bind' 'bind/named.conf'
 maybe chmod 0644 'bind/named.conf'
+maybe chown 'bind' 'bind/named.conf.default-zones'
 maybe chgrp 'bind' 'bind/named.conf.default-zones'
 maybe chmod 0644 'bind/named.conf.default-zones'
+maybe chown 'bind' 'bind/named.conf.keys'
 maybe chgrp 'bind' 'bind/named.conf.keys'
 maybe chmod 0644 'bind/named.conf.keys'
+maybe chown 'bind' 'bind/named.conf.local'
 maybe chgrp 'bind' 'bind/named.conf.local'
 maybe chmod 0644 'bind/named.conf.local'
+maybe chown 'bind' 'bind/named.conf.options'
 maybe chgrp 'bind' 'bind/named.conf.options'
 maybe chmod 0644 'bind/named.conf.options'
+maybe chown 'bind' 'bind/named.hoellein.online.conf'
 maybe chgrp 'bind' 'bind/named.hoellein.online.conf'
 maybe chmod 0644 'bind/named.hoellein.online.conf'
 maybe chown 'bind' 'bind/rndc.key'
 maybe chgrp 'bind' 'bind/rndc.key'
 maybe chmod 0640 'bind/rndc.key'
-maybe chgrp 'bind' 'bind/zones'
-maybe chmod 2775 'bind/zones'
+maybe chown 'bind' 'bind/zones.rfc1918'
+maybe chgrp 'bind' 'bind/zones.rfc1918'
 maybe chmod 0644 'bind/zones.rfc1918'
-maybe chgrp 'bind' 'bind/zones/db.228.180.207'
-maybe chmod 0644 'bind/zones/db.228.180.207'
-maybe chgrp 'bind' 'bind/zones/db.hoellein.online'
-maybe chmod 0644 'bind/zones/db.hoellein.online'
-maybe chgrp 'bind' 'bind/zones/db.home.hoellein.online'
-maybe chmod 0644 'bind/zones/db.home.hoellein.online'
-maybe chown 'bind' 'bind/zones/db.home.hoellein.online.jnl'
-maybe chgrp 'bind' 'bind/zones/db.home.hoellein.online.jnl'
-maybe chmod 0644 'bind/zones/db.home.hoellein.online.jnl'
 maybe chmod 0644 'bindresvport.blacklist'
 maybe chmod 0755 'binfmt.d'
 maybe chmod 0755 'ca-certificates'

diff --git a/bind/named.conf.local b/bind/named.conf.local
index 3412043ac690608bf1aa9cc0544a8e4e545197c3..f899407cd72b267f894b748efc9800ebeb300bde 100644 (file)
--- a/bind/named.conf.local
+++ b/bind/named.conf.local
@@ -13,7 +13,7 @@ key "home.hoellein.online" {
 
 zone "hoellein.online" {
        type master;
-       file "/etc/bind/zones/db.hoellein.online";
+       file "/var/cache/bind/db.hoellein.online";
        allow-transfer {
                79.143.179.232;
        };
@@ -28,12 +28,12 @@ zone "hoellein.online" {
 
 zone "228.180.207.in-addr.arpa" {
        type master;
-       file "/etc/bind/zones/db.228.180.207";
+       file "/var/cache/bind/db.228.180.207";
        notify yes;
 };
 
 zone "home.hoellein.online" {
        type master;
-       file "/etc/bind/zones/db.home.hoellein.online";
+       file "/var/cache/bind/db.home.hoellein.online";
        allow-update { key home.hoellein.online.; };
 };

diff --git a/bind/zones/db.228.180.207 b/bind/zones/db.228.180.207
deleted file mode 100644 (file)
index 6737f46..0000000
--- a/bind/zones/db.228.180.207
+++ /dev/null
@@ -1,21 +0,0 @@
-;
-; BIND reverse data file for local loopback interface
-;
-$TTL   604800
-@      IN      SOA     hoellein.online. admin.hoellein.online. (
-                       2019020602      ; Serial
-                       604800          ; Refresh
-                       1000            ; Retry
-                       2419200         ; Expire
-                       600 )   ; Negative Cache TTL
-;
-               IN      NS      ns1.hoellein.online.
-ns1            IN      A       207.180.228.45
-ns1            IN      AAAA    2a02:c207:3003:1768::1          
-45             IN      PTR     ns1.hoellein.online.
-45             IN      PTR     hoellein.online.
-45             IN      PTR     www.hoellein.online.
-45             IN      PTR     mail.hoellein.online.
-45             IN      PTR     smtp.hoellein.online.
-45             IN      PTR     imap.hoellein.online.
-45             IN      PTR     vserver1.hoellein.online.

diff --git a/bind/zones/db.hoellein.online b/bind/zones/db.hoellein.online
deleted file mode 100644 (file)
index da4a080..0000000
--- a/bind/zones/db.hoellein.online
+++ /dev/null
@@ -1,47 +0,0 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL   604800
-@      IN      SOA     ns1.hoellein.online. admin.hoellein.online. (
-                       2019020801      ; Serial
-                       3600            ; Refresh
-                       1000            ; Retry
-                       1209600         ; Expire
-                       600 )           ; Negative Cache TTL
-;
-@                      IN      NS      ns1.hoellein.online.
-@                      IN      NS      ns2.hoellein.online.
-@                      IN      A       207.180.228.45
-@                      IN      AAAA    2a02:c207:3003:1768::1
-@                      MX      10      mail.hoellein.online.
-@                      IN      TXT     "v=spf1 mx a:siedlerverein-wittgensdorf.de ~all"
-ns1                    IN      A       207.180.228.45
-ns2                    IN      A       79.143.179.232  
-vserver1               IN      A       207.180.228.45  
-vserver2               IN      A       79.143.179.232  
-mail                   IN      A       207.180.228.45
-imap                   IN      A       207.180.228.45
-smtp                   IN      A       207.180.228.45
-www                    IN      A       207.180.228.45
-ns1                    IN      AAAA    2a02:c207:3003:1768::1
-ns2                    IN      AAAA    2a02:c205:3003:6020::1  
-vserver1               IN      AAAA    2a02:c207:3003:1768::1
-vserver2               IN      AAAA    2a02:c205:3003:6020::1
-mail                   IN      AAAA    2a02:c207:3003:1768::1
-imap                   IN      AAAA    2a02:c207:3003:1768::1
-smtp                   IN      AAAA    2a02:c207:3003:1768::1
-www                    IN      AAAA    2a02:c207:3003:1768::1
-home.hoellein.online   IN      NS      ns1.hoellein.online.
-                       IN      MX      10      mail
-mail                   IN      MX      10      mail
-
-
-1.0.0                  IN      PTR     localhost.
-hoellein.online                IN      NS      ns1.hoellein.online.
-217                    IN      PTR     ns1.hoellein.online.
-
-key1._domainkey                IN      TXT     ( "v=DKIM1; h=sha256; k=rsa; "
-          "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwixsvOcmLmhPFCZ81AaMTS37Ok342bs8Z38rE6+pjkmTg5TgrCw2iyoehEm/+eowUmnrtKwietIgKIl8FSVYox0SWEN0DXBGb4a2kqkbGot5UibjttSjFlsFduS76PahGJT9oFJ67A609zuRpvAYqy0vnkzRtJUoXGvVT7MfZIHqoddnIFJVEIwpvlA4pqTuyUoPSb/drVb36s"
-          "EuXh/WRvGnc79xI4n6yeLp5VgsxAN90VYHJTT83BnBitERobaD3baQerrM/RYOF65IJ5NK61poXJjGrdFFwQzmUPNJCVbrm6O03Nh8Iml0FAk/ehEtpjpujPlMM7hYhj904mS1KwIDAQAB" )
-_dmarc IN      TXT     "v=DMARC1; p=none; rua=mailto:postmaster@hoellein.online; ruf=mailto:postmaster@hoellein.online; fo=1"
-

diff --git a/bind/zones/db.home.hoellein.online b/bind/zones/db.home.hoellein.online
deleted file mode 100644 (file)
index 4680860..0000000
--- a/bind/zones/db.home.hoellein.online
+++ /dev/null
@@ -1,10 +0,0 @@
-$ORIGIN .
-$TTL 200
-home.hoellein.online IN SOA ns1.hoellein.online admin.hoellein.online. (
-                           2019010801
-                           500
-                           500
-                           86400
-                           500 )
-       NS ns1.hoellein.online.
-       A  1.2.3.4

diff --git a/bind/zones/db.home.hoellein.online.jnl b/bind/zones/db.home.hoellein.online.jnl
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 730aa9e007061ca43d840056422c54ce92e4e981..aec2c88c96b020f00d4171e9bdfce660af6364fe 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAta6cTzu3VGD60GvAk/G8657h201uehftl+az3B2TGsihyvSHdpV7
-ZhXeRpHg3HtqMlIRYkL8fBYw6mQrma9r8dCIoh9sukXQiq04SMy04rHd/zlU2s7n
-mJ4MDPprYxsdlgJVo38Knq7PYDWnBAWjiWwSt9A+9n62XcsvuK7BoO3vKcWwSLxV
-ADeyaBAduPWaC5TuQxoGslI0usJ2C1ossJIntch4Lh3TOnnmuDurS4ivfuh3ll/c
-dJz/kAnJJVnf72GdsFQnCX8ZvacCQFAkuEMayz+/fWI/Ng/0VddVMApYW6zP1rv6
-Z2R2NCu1Ik7a9Ej/09ecS5MgeMjjNecdOwIBAg==
+MIIBCAKCAQEAzJsHKAt93mICNnq+Vk+B6BCGhU+NsbRXOycYogN0bDlKfw/8J3Gr
+IO8j6+cKxsD9jtU2mNWO9JO8wEGbjetCP95vUH1LDdWqDU5yKQqPH5SU/gBIh92a
+8vv3VScGvvHbYXHyjeVBiIhZbVqOsTSu2EHFa/p4BrRzbzgEMMWelu8bWhdBSLTV
+xok3Cl7Aqf8i/dNZ02OS/14VVHev10axgT+nXVFnHgAI0dno/05czQKM/OS0OCte
+yg5wMM/t3oJNUNtXoymihGkoaGKFL1Xzm82os2rR3igyoUOCGEgnvj7VjtRKQ7/o
+N6HWT3oIxy06CQ3kLXAfAfuntDPMNxAJuwIBAg==
 -----END DH PARAMETERS-----