From 5e68eb9b046a272ee7e613d95fcd88baca086462 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 2 Feb 2019 06:25:17 +0100 Subject: [PATCH] daily autocommit --- .etckeeper | 14 ++++++++++- bind/Khome.hoellein.online.+157+03655.key | 1 + bind/Khome.hoellein.online.+157+03655.private | 7 ++++++ bind/named.conf | 2 +- bind/named.conf.local | 25 +++++++++++++++++++ bind/named.conf.options | 4 ++- bind/named.hoellein.online.conf | 16 ++++++++++++ bind/zones/db.180.228.45 | 13 ++++++++++ bind/zones/db.hoellein.online | 19 ++++++++++++++ motd | 11 -------- myssl/dh2048.pem | 12 ++++----- webmin/apache/site | 4 +++ webmin/bind8/zone-names | 13 ++++++---- webmin/installed.cache | 24 +++++++++--------- webmin/postfix/version | 2 +- webmin/webmin/config | 4 +-- 16 files changed, 131 insertions(+), 40 deletions(-) create mode 100644 bind/Khome.hoellein.online.+157+03655.key create mode 100644 bind/Khome.hoellein.online.+157+03655.private create mode 100644 bind/named.hoellein.online.conf create mode 100644 bind/zones/db.180.228.45 create mode 100644 bind/zones/db.hoellein.online delete mode 100644 motd create mode 100644 webmin/apache/site diff --git a/.etckeeper b/.etckeeper index 927928377..92c19f980 100755 --- a/.etckeeper +++ b/.etckeeper @@ -461,6 +461,10 @@ maybe chmod 0644 'bash_completion.d/git-prompt' maybe chmod 0644 'bash_completion.d/grub' maybe chgrp 'bind' 'bind' maybe chmod 2755 'bind' +maybe chgrp 'bind' 'bind/Khome.hoellein.online.+157+03655.key' +maybe chmod 0600 'bind/Khome.hoellein.online.+157+03655.key' +maybe chgrp 'bind' 'bind/Khome.hoellein.online.+157+03655.private' +maybe chmod 0600 'bind/Khome.hoellein.online.+157+03655.private' maybe chmod 0644 'bind/bind.keys' maybe chmod 0644 'bind/db.0' maybe chmod 0644 'bind/db.127' @@ -476,10 +480,18 @@ maybe chgrp 'bind' 'bind/named.conf.local' maybe chmod 0644 'bind/named.conf.local' maybe chgrp 'bind' 'bind/named.conf.options' maybe chmod 0644 'bind/named.conf.options' +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 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.hoellein.online' +maybe chmod 0644 'bind/zones/db.hoellein.online' maybe chmod 0644 'bindresvport.blacklist' maybe chmod 0755 'binfmt.d' maybe chmod 0755 'ca-certificates' @@ -1345,7 +1357,6 @@ maybe chmod 0755 'monit' maybe chmod 0755 'monit/conf-available' maybe chmod 0755 'monit/monitrc.d' maybe chmod 0644 'monit/monitrc.d/fail2ban' -maybe chmod 0644 'motd' maybe chmod 0755 'mysql' maybe chmod 0755 'mysql/conf.d' maybe chmod 0644 'mysql/conf.d/mysql.cnf' @@ -1777,6 +1788,7 @@ maybe chmod 0711 'webmin/apache' maybe chgrp 'bin' 'webmin/apache/config' maybe chmod 0600 'webmin/apache/config' maybe chmod 0644 'webmin/apache/httpd-info' +maybe chmod 0644 'webmin/apache/site' maybe chgrp 'bin' 'webmin/at' maybe chmod 0711 'webmin/at' maybe chgrp 'bin' 'webmin/at/config' diff --git a/bind/Khome.hoellein.online.+157+03655.key b/bind/Khome.hoellein.online.+157+03655.key new file mode 100644 index 000000000..25b234aa1 --- /dev/null +++ b/bind/Khome.hoellein.online.+157+03655.key @@ -0,0 +1 @@ +home.hoellein.online. IN KEY 512 3 157 E658CECSYmnrpWBVOEdbsBFw+crP5qllK5l/9bIHaEr4urBmzbxsleAd CMRwl5wzvgHyIwerSFIXHla2qtO5sA== diff --git a/bind/Khome.hoellein.online.+157+03655.private b/bind/Khome.hoellein.online.+157+03655.private new file mode 100644 index 000000000..c2ee8e8ac --- /dev/null +++ b/bind/Khome.hoellein.online.+157+03655.private @@ -0,0 +1,7 @@ +Private-key-format: v1.3 +Algorithm: 157 (HMAC_MD5) +Key: E658CECSYmnrpWBVOEdbsBFw+crP5qllK5l/9bIHaEr4urBmzbxsleAdCMRwl5wzvgHyIwerSFIXHla2qtO5sA== +Bits: AAA= +Created: 20190201095044 +Publish: 20190201095044 +Activate: 20190201095044 diff --git a/bind/named.conf b/bind/named.conf index 880786afd..6e76233f2 100644 --- a/bind/named.conf +++ b/bind/named.conf @@ -5,7 +5,7 @@ // this configuration file. // // If you are just adding zones, please do that in /etc/bind/named.conf.local - include "/etc/bind/named.conf.options"; include "/etc/bind/named.conf.local"; include "/etc/bind/named.conf.default-zones"; + diff --git a/bind/named.conf.local b/bind/named.conf.local index 7a57b1019..31615c513 100644 --- a/bind/named.conf.local +++ b/bind/named.conf.local @@ -6,3 +6,28 @@ // organization //include "/etc/bind/zones.rfc1918"; +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; + }; +}; + +// our IP 207.180.228.45 + +zone "228.180.207.in-addr.arpa" { + type master; + file "/etc/bind/zones/db.180.228.45"; +}; diff --git a/bind/named.conf.options b/bind/named.conf.options index b1bef512a..797bddfb8 100644 --- a/bind/named.conf.options +++ b/bind/named.conf.options @@ -1,6 +1,8 @@ options { directory "/var/cache/bind"; - + + //recursion no; + //allow-transfer { none; }; // If there is a firewall between you and nameservers you want // to talk to, you may need to fix the firewall to allow multiple // ports to talk. See http://www.kb.cert.org/vuls/id/800113 diff --git a/bind/named.hoellein.online.conf b/bind/named.hoellein.online.conf new file mode 100644 index 000000000..1641372e1 --- /dev/null +++ b/bind/named.hoellein.online.conf @@ -0,0 +1,16 @@ +key "home.hoellein.online" { + algorithm hmac-md5; + secret "E658CECSYmnrpWBVOEdbsBFw+crP5qllK5l/9bIHaEr4urBmzbxsleAdCMRwl5wzvgHyIwerSFIXHla2qtO5sA=="; +}; + +zone "hoellein.online" { + type master; + file "hoellein.online" + allow-transfer { + IP; + common-allow-transfer; + }; + update-policy { + grant home.hoellein.online name home.hoellein.online A; + }; +}; diff --git a/bind/zones/db.180.228.45 b/bind/zones/db.180.228.45 new file mode 100644 index 000000000..71e111cc2 --- /dev/null +++ b/bind/zones/db.180.228.45 @@ -0,0 +1,13 @@ +; +; BIND reverse data file for local loopback interface +; +$TTL 604800 +@ IN SOA hoellein.online. admin.hoellein.online. ( + 2019020101 ; 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.hoellein.online b/bind/zones/db.hoellein.online new file mode 100644 index 000000000..5034534c7 --- /dev/null +++ b/bind/zones/db.hoellein.online @@ -0,0 +1,19 @@ +; +; BIND data file for local loopback interface +; +$TTL 604800 +@ IN SOA hoellein.online. admin.hoellein.online. ( + 2019020107 ; Serial + 604800 ; Refresh + 86400 ; Retry + 2419200 ; Expire + 604800 ) ; Negative Cache TTL +; +@ IN NS localhost. +1.0.0 IN PTR localhost. + +hoellein.online IN NS ns1.hoellein.online. +hoellein.online IN NS d.ns.buddyns.com. +hoellein.online IN NS e.ns.buddyns.com. +hoellein.online IN NS f.ns.buddyns.com. +217 IN PTR ns1.hoellein.online. diff --git a/motd b/motd deleted file mode 100644 index 027b2abfd..000000000 --- a/motd +++ /dev/null @@ -1,11 +0,0 @@ - _____ - / ___/___ _ _ _____ _ ___ ___ -| | / _ \| \| |_ _/ \ | _ )/ _ \ -| |__| (_) | .` | | |/ _ \| _ \ (_) | - \____\___/|_|\_| |_/_/ \_|___/\___/ - -Welcome! - -This server is hosted by Contabo. If you have any questions or need help, -please don't hesitate to contact us at support@contabo.com. - diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem index aee2d5e58..a6fb36aee 100644 --- a/myssl/dh2048.pem +++ b/myssl/dh2048.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEArUyjYRhNdUhMhfzHlenaSpUZqzFebuom62uZCCnBSXiuefUr6flx -r6b+TcML0aeyRy0k4N08YL1U+S52pNnXbeeF0vlnPDmdDampfInLU//3CXhyA0zH -ssFhD+doTeW1CeMKKntGsPPtToljl2FJ1ntwgyX4fLctprYvQxVjFVEeUx6zk0hW -O2d5R8yV6HSByralXrBVCgynC2P+EF4ulgNp+cSsCWOrUrdPQPhIrDhaOHbifpMI -JDYtm8H+eXJFi31wMYBjBdGdp9kshFHTI1s5RqbJ/w0DdUWsvQr7lGF+R66p98QT -+8zQP5zO7kls7R8AvlpAPAtUdldhFOuYQwIBAg== +MIIBCAKCAQEAzIP7ZlZP/xEc+Dl+KuvVPAn6whIgQ+m4SbWa5RYgYsWbjckT0NAN +0y4wkahyvJHcRmqO++TLQQ5NI2WAb+b3WLMetlWkLbRUozVxT7PhER1Q/3FKTrV5 +amuNGATck42p71qWeKyVNuR9+jWWzRZaeO++hrYpOMBLzS+D5j0jEP2KijF0KxgC +mYm2jOtKbckBf96lRfpocF79d8q8jTaBnNwOBi6VEUUEe2IA9nMkx3oFDgTmFiqR +dtM33sCmu5wEA5+BvjQmCyWID4+PNLvqAsP3F0x195xDgBARJPJ45apmJIBa13M/ +YRV3lduWAf5yiowQqd60cW1gu/Uyd4XXgwIBAg== -----END DH PARAMETERS----- diff --git a/webmin/apache/site b/webmin/apache/site new file mode 100644 index 000000000..df5e1a457 --- /dev/null +++ b/webmin/apache/site @@ -0,0 +1,4 @@ +path=/usr/sbin/apache2 +modules=core/2.429 mod_log_config/2.429 mod_alias/2.429 mod_auth_basic/2.429 mod_authn_file/2.429 mod_authz_host/2.429 mod_autoindex/2.429 mod_dir/2.429 mod_env/2.429 mod_mime/2.429 mod_mpm_prefork/2.429 mod_negotiation/2.429 mod_proxy/2.429 mod_rewrite/2.429 mod_setenvif/2.429 mod_ssl/2.429 mod_status/2.429 mod_php7/2.429 +size=671392 +webmin=1.900 diff --git a/webmin/bind8/zone-names b/webmin/bind8/zone-names index 5ce5bc998..eb348276d 100644 --- a/webmin/bind8/zone-names +++ b/webmin/bind8/zone-names @@ -3,9 +3,12 @@ no_chroot_config=0 base=/var/cache/bind version=3 pidfile=/var/run/named/named.pid -zone_4=255.in-addr.arpa 6 master * /etc/bind/db.255 -zone_3=0.in-addr.arpa 5 master * /etc/bind/db.0 -zone_2=127.in-addr.arpa 4 master * /etc/bind/db.127 -zone_0=. 2 hint * /etc/bind/db.root -zone_1=localhost 3 master * /etc/bind/db.local +zone_4=127.in-addr.arpa 5 master * /etc/bind/db.127 +zone_3=localhost 4 master * /etc/bind/db.local +zone_2=. 3 hint * /etc/bind/db.root +zone_0=hoellein.online 1 master * /etc/bind/zones/db.hoellein.online +zone_1=228.180.207.in-addr.arpa 2 master * /etc/bind/zones/db.180.228.45 file_/etc/bind/named.conf.default-zones=1521820389 +file_/etc/bind/named.conf.local=1549049573 +zone_6=255.in-addr.arpa 7 master * /etc/bind/db.255 +zone_5=0.in-addr.arpa 6 master * /etc/bind/db.0 diff --git a/webmin/installed.cache b/webmin/installed.cache index 9724165ca..bb22db244 100644 --- a/webmin/installed.cache +++ b/webmin/installed.cache @@ -17,14 +17,14 @@ net=1 passwd=1 ldap-useradmin=0 tunnel=1 -spam=0 +spam=1 backup-config=1 -fail2ban=0 +fail2ban=1 idmapd=0 ajaxterm=1 iscsi-tgtd=0 status=1 -phpini=0 +phpini=1 iscsi-target=0 fetchmail=0 cluster-software=1 @@ -40,7 +40,7 @@ syslog=1 cluster-cron=1 pptp-server=0 lpadmin=1 -ipsec=0 +ipsec=1 cron=1 adsl-client=0 wuftpd=0 @@ -54,7 +54,7 @@ filter=1 pap=0 shorewall6=0 cluster-passwd=1 -mysql=0 +mysql=1 qmailadmin=0 burner=0 webalizer=0 @@ -62,13 +62,13 @@ pam=1 procmail=0 cluster-usermin=1 usermin=0 -firewall=0 +firewall=1 htaccess-htpasswd=1 mailcap=1 custom=1 ldap-server=0 pptp-client=0 -firewall6=0 +firewall6=1 sendmail=0 webmincron=1 shorewall=0 @@ -76,7 +76,7 @@ package-updates=1 filemin=1 inetd=0 time=1 -bind8=0 +bind8=1 ppp-client=0 syslog-ng=0 fdisk=1 @@ -84,7 +84,7 @@ stunnel=0 mount=1 at=0 grub=0 -dovecot=0 +dovecot=1 exim=0 jabber=0 postgresql=0 @@ -94,11 +94,11 @@ exports=0 system-status=1 nis=1 cluster-useradmin=1 -telnet=1 +telnet=0 cluster-shell=1 smart-status=0 cpan=1 -apache=0 +apache=1 firewalld=0 samba=0 man=1 @@ -107,5 +107,5 @@ heartbeat=0 ldap-client=0 mailboxes=1 logrotate=1 -postfix=0 +postfix=1 init=1 diff --git a/webmin/postfix/version b/webmin/postfix/version index 8b1378917..15a279981 100644 --- a/webmin/postfix/version +++ b/webmin/postfix/version @@ -1 +1 @@ - +3.3.0 diff --git a/webmin/webmin/config b/webmin/webmin/config index dc949a4e1..de24f47c0 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,10 +1,10 @@ cron_mode=0 -last_version_number=1.890 +last_version_number=1.900 updays=1 update=0 osdn=1 upmissing=0 -last_version_check=1542135688 +last_version_check=1549050668 upmins=47 warn_days=7 upshow=1 -- 2.43.0