From: root Date: Thu, 7 Feb 2019 05:25:16 +0000 (+0100) Subject: daily autocommit X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=761035697586bd7a3ff44374eef1a4235001c8f6;p=vserver daily autocommit --- diff --git a/.etckeeper b/.etckeeper index 92c19f980..438d38514 100755 --- a/.etckeeper +++ b/.etckeeper @@ -488,8 +488,8 @@ maybe chmod 0640 'bind/rndc.key' maybe chgrp 'bind' 'bind/zones' maybe chmod 2755 'bind/zones' maybe chmod 0644 'bind/zones.rfc1918' -maybe chgrp 'bind' 'bind/zones/db.180.228.45' -maybe chmod 0644 'bind/zones/db.180.228.45' +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 chmod 0644 'bindresvport.blacklist' diff --git a/bind/named.conf.local b/bind/named.conf.local index 31615c513..3aedb5405 100644 --- a/bind/named.conf.local +++ b/bind/named.conf.local @@ -10,24 +10,15 @@ zone "hoellein.online" { type master; file "/etc/bind/zones/db.hoellein.online"; allow-transfer { - # allow ALL the following addresses! BuddyNS employs them all. - 173.244.206.26; - 88.198.106.11; - 108.61.224.67; - 103.6.87.125; - 185.136.176.247; - # uncomment these for IPv6: - 2607:f0d0:1001:d::100; - 2a01:4f8:d12:d01::10:100; - 2001:19f0:6400:8642::3; - 2403:2500:4000::f3e; - 2a06:fdc0:fade:2f7::1; + 79.143.179.232; }; + notify yes; }; // our IP 207.180.228.45 zone "228.180.207.in-addr.arpa" { type master; - file "/etc/bind/zones/db.180.228.45"; + file "/etc/bind/zones/db.228.180.207"; + notify yes; }; diff --git a/bind/zones/db.180.228.45 b/bind/zones/db.180.228.45 deleted file mode 100644 index bd46cb045..000000000 --- a/bind/zones/db.180.228.45 +++ /dev/null @@ -1,13 +0,0 @@ -; -; BIND reverse data file for local loopback interface -; -$TTL 604800 -@ IN SOA hoellein.online. admin.hoellein.online. ( - 2019020102 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL -; - IN NS ns1.hoellein.online. -207 IN PTR ns1.hoellein.online. diff --git a/bind/zones/db.228.180.207 b/bind/zones/db.228.180.207 new file mode 100644 index 000000000..6737f4691 --- /dev/null +++ b/bind/zones/db.228.180.207 @@ -0,0 +1,21 @@ +; +; 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 index 07f9a4a94..c48f44412 100644 --- a/bind/zones/db.hoellein.online +++ b/bind/zones/db.hoellein.online @@ -3,26 +3,44 @@ ; $TTL 604800 @ IN SOA ns1.hoellein.online. admin.hoellein.online. ( - 2019020507 ; Serial + 2019020621 ; Serial 3600 ; Refresh - 1800 ; Retry - 604800 ; Expire + 1000 ; Retry + 1209600 ; Expire 600 ) ; Negative Cache TTL ; -;@ IN NS localhost. @ IN NS ns1.hoellein.online. - IN NS ns2.hoellein.online. - IN MX 10 mail -1.0.0 IN PTR localhost. +@ 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 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 -hoellein.online IN A 207.180.228.45 -hoellein.online IN AAAA 2a02:c207:3003:1768::1 +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 + IN MX 10 mail +mail IN MX 10 mail + + +1.0.0 IN PTR localhost. hoellein.online IN NS ns1.hoellein.online. -hoellein.online IN NS c.ns.buddyns.com. -hoellein.online IN NS d.ns.buddyns.com. 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/myssl/dh2048.pem b/myssl/dh2048.pem index e19f95cfb..5e6b65def 100644 --- a/myssl/dh2048.pem +++ b/myssl/dh2048.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEApjDAAKWEom9hrxhol+QOVZUuqypFLYG2+OkQ3PhgscKoX0Ez0Yrq -6q+uH58uZH9Bc11EJ1S69+PqyXD0lX/AlBRx+KyQpLKFUkE8KgYFqalN0dVUT42m -+boN/J4wr0UKBVgC7X13eDwz1N++kKGx1cDDAPt+51FFl9jaPnAw++VbkFyhdpkZ -xhqLLWlghqQ6vG4wMutWvoYWkSiu/sO05UU27dyPj7lPbytTO8H+KLMogYP4lBQR -6r2d9GYLTAoejJ/4uBdzww/tbBwdbXe6FDWnF0JWkhVDo+4rCTyDJYVg/H2Pu/Cw -q6Rm+yYbH8Gx6diW0kGnjFz5yuPn1/P+QwIBAg== +MIIBCAKCAQEA1Wthd81ekabFXh32vpjigPa8QqG/b/fR8amY5Ygt+O3d5NUwkaRY +ppVG4L1Sa6cnSLzd8MjwAoXHIVOI+6IdjNCw9cP2DIhMjEAgFcB/Yibe7ddSgl7D +4bC/u/+QcVUfEnevbzuJ01tZ042ZeJ/6P+dbV6UDvX2HjXQwtYwaL+8kJnRI+ct4 +Sj9+4mjedMQcp8AQnWkql2OJGH7ZvuA3G7yfiXUYmwYYOs+K5IOielaU+qGlN+kw +js0Kd6caa+DNu5KuBysVzrA2QKS2OdhdZ2VEC4DeMMoWxaewwoKUNx7rq+OTrHJ9 +6jdiaZSnziiSiSd+JOE8U4oqDj2a/l68awIBAg== -----END DH PARAMETERS-----