From c996a144508da9a43701c7da934e9148c729a7d9 Mon Sep 17 00:00:00 2001 From: iliajie Date: Sun, 17 Jul 2022 00:49:31 +0300 Subject: [PATCH 1/6] Fix BIND configs for modern distros --- bind8/config-AlmaLinux-6.0-ALL | 12 ++--- ...ux-6.0-ALL => config-CentOS-Linux-6.0-7.0} | 0 bind8/config-CentOS-Linux-8.0-ALL | 52 +++++++++++++++++++ bind8/config-Rocky-Linux-6.0-ALL | 12 ++--- bind8/config-debian-linux-10.0-ALL | 49 +++++++++++++++++ ...ux-3.1-ALL => config-debian-linux-3.1-9.0} | 0 bind8/config-redhat-linux-24.0-ALL | 3 +- 7 files changed, 110 insertions(+), 18 deletions(-) rename bind8/{config-CentOS-Linux-6.0-ALL => config-CentOS-Linux-6.0-7.0} (100%) create mode 100644 bind8/config-CentOS-Linux-8.0-ALL create mode 100644 bind8/config-debian-linux-10.0-ALL rename bind8/{config-debian-linux-3.1-ALL => config-debian-linux-3.1-9.0} (100%) diff --git a/bind8/config-AlmaLinux-6.0-ALL b/bind8/config-AlmaLinux-6.0-ALL index de126f1bf..eadde15ec 100644 --- a/bind8/config-AlmaLinux-6.0-ALL +++ b/bind8/config-AlmaLinux-6.0-ALL @@ -3,8 +3,6 @@ named_path=/usr/sbin/named named_conf=/etc/named.conf show_list=1 records_order=0 -start_cmd=service named start -stop_cmd=service named stop max_zones=50 rev_def=0 support_aaaa=1 @@ -12,7 +10,7 @@ allow_comments=0 allow_wild=1 allow_long=0 master_ttl=1 -pid_file=/var/run/named.pid /run/named.pid +pid_file=/run/named/named.pid whois_cmd=whois short_names=0 updserial_def=0 @@ -42,15 +40,13 @@ keygen=dnssec-keygen signzone=dnssec-signzone checkconf=named-checkconf other_slaves=1 -restart_cmd=restart keygen=dnssec-keygen tmpl_dnssec=0 dnssec_period=21 tmpl_dnssec_dt=1 -dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf -dnssectools_rollrec=/var/named/system.rollrec -dnssectools_keydir=/var/named/dtkeys -dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid force_random=0 spf_record=0 dnssec_info=1 +start_cmd=systemctl start named.service +stop_cmd=systemctl stop named.service +restart_cmd=systemctl reload named.service diff --git a/bind8/config-CentOS-Linux-6.0-ALL b/bind8/config-CentOS-Linux-6.0-7.0 similarity index 100% rename from bind8/config-CentOS-Linux-6.0-ALL rename to bind8/config-CentOS-Linux-6.0-7.0 diff --git a/bind8/config-CentOS-Linux-8.0-ALL b/bind8/config-CentOS-Linux-8.0-ALL new file mode 100644 index 000000000..eadde15ec --- /dev/null +++ b/bind8/config-CentOS-Linux-8.0-ALL @@ -0,0 +1,52 @@ +soa_style=1 +named_path=/usr/sbin/named +named_conf=/etc/named.conf +show_list=1 +records_order=0 +max_zones=50 +rev_def=0 +support_aaaa=1 +allow_comments=0 +allow_wild=1 +allow_long=0 +master_ttl=1 +pid_file=/run/named/named.pid +whois_cmd=whois +short_names=0 +updserial_def=0 +updserial_on=1 +updserial_man=1 +ndc_cmd=ndc +forwardzonefilename_format=ZONE.hosts +reversezonefilename_format=ZONE.rev +rev_must=0 +ipv6_mode=1 +allow_underscore=1 +by_view=0 +confirm_zone=1 +confirm_rec=0 +no_chroot=0 +relative_paths=0 +rndc_cmd=rndc +master_dir=/var/named +slave_dir=/var/named/slaves +no_pid_chroot=0 +soa_start=0 +rndc_conf=/etc/rndc.conf +rndcconf_cmd=rndc-confgen +largezones=0 +checkzone=named-checkzone +keygen=dnssec-keygen +signzone=dnssec-signzone +checkconf=named-checkconf +other_slaves=1 +keygen=dnssec-keygen +tmpl_dnssec=0 +dnssec_period=21 +tmpl_dnssec_dt=1 +force_random=0 +spf_record=0 +dnssec_info=1 +start_cmd=systemctl start named.service +stop_cmd=systemctl stop named.service +restart_cmd=systemctl reload named.service diff --git a/bind8/config-Rocky-Linux-6.0-ALL b/bind8/config-Rocky-Linux-6.0-ALL index de126f1bf..eadde15ec 100644 --- a/bind8/config-Rocky-Linux-6.0-ALL +++ b/bind8/config-Rocky-Linux-6.0-ALL @@ -3,8 +3,6 @@ named_path=/usr/sbin/named named_conf=/etc/named.conf show_list=1 records_order=0 -start_cmd=service named start -stop_cmd=service named stop max_zones=50 rev_def=0 support_aaaa=1 @@ -12,7 +10,7 @@ allow_comments=0 allow_wild=1 allow_long=0 master_ttl=1 -pid_file=/var/run/named.pid /run/named.pid +pid_file=/run/named/named.pid whois_cmd=whois short_names=0 updserial_def=0 @@ -42,15 +40,13 @@ keygen=dnssec-keygen signzone=dnssec-signzone checkconf=named-checkconf other_slaves=1 -restart_cmd=restart keygen=dnssec-keygen tmpl_dnssec=0 dnssec_period=21 tmpl_dnssec_dt=1 -dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf -dnssectools_rollrec=/var/named/system.rollrec -dnssectools_keydir=/var/named/dtkeys -dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid force_random=0 spf_record=0 dnssec_info=1 +start_cmd=systemctl start named.service +stop_cmd=systemctl stop named.service +restart_cmd=systemctl reload named.service diff --git a/bind8/config-debian-linux-10.0-ALL b/bind8/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..1221bc0df --- /dev/null +++ b/bind8/config-debian-linux-10.0-ALL @@ -0,0 +1,49 @@ +soa_style=1 +named_path=/usr/sbin/named +named_conf=/etc/bind/named.conf +show_list=1 +records_order=0 +max_zones=50 +rev_def=0 +support_aaaa=1 +allow_comments=0 +allow_wild=1 +allow_long=0 +master_ttl=1 +whois_cmd=whois +short_names=0 +updserial_def=0 +updserial_on=1 +updserial_man=1 +ndc_cmd=ndc +forwardzonefilename_format=ZONE.hosts +reversezonefilename_format=ZONE.rev +rev_must=0 +ipv6_mode=1 +allow_underscore=1 +by_view=0 +confirm_zone=1 +confirm_rec=0 +no_chroot=0 +relative_paths=0 +rndc_cmd=rndc +pid_file=/var/run/named/named.pid +zones_file=/etc/bind/named.conf.local +master_dir=/var/lib/bind +slave_dir=/var/lib/bind +no_pid_chroot=0 +soa_start=0 +rndc_conf=/etc/bind/rndc.conf +rndcconf_cmd=rndc-confgen +largezones=0 +checkzone=named-checkzone +keygen=dnssec-keygen +signzone=dnssec-signzone +checkconf=named-checkconf +other_slaves=1 +force_random=0 +spf_record=0 +dnssec_info=1 +start_cmd=systemctl start bind9.service +stop_cmd=systemctl stop bind9.service +restart_cmd=systemctl reload bind9.service diff --git a/bind8/config-debian-linux-3.1-ALL b/bind8/config-debian-linux-3.1-9.0 similarity index 100% rename from bind8/config-debian-linux-3.1-ALL rename to bind8/config-debian-linux-3.1-9.0 diff --git a/bind8/config-redhat-linux-24.0-ALL b/bind8/config-redhat-linux-24.0-ALL index e127299f7..68e3b2fa4 100644 --- a/bind8/config-redhat-linux-24.0-ALL +++ b/bind8/config-redhat-linux-24.0-ALL @@ -28,12 +28,10 @@ by_view=0 confirm_zone=1 confirm_rec=0 no_chroot=0 -chroot=/var/named/chroot relative_paths=0 rndc_cmd=rndc master_dir=/var/named slave_dir=/var/named/slaves -auto_chroot=sh -c '. /etc/sysconfig/named && echo "$ROOTDIR"' no_pid_chroot=0 soa_start=0 rndc_conf=/etc/rndc.conf @@ -47,3 +45,4 @@ other_slaves=1 force_random=0 spf_record=0 dnssec_info=1 +restart_cmd=systemctl reload named.service \ No newline at end of file From e0a5c4e50712dcfd652fa11bb39d17ed19ba36d2 Mon Sep 17 00:00:00 2001 From: iliajie Date: Sun, 17 Jul 2022 15:51:28 +0300 Subject: [PATCH 2/6] Clear manifest files too --- makedebian.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/makedebian.pl b/makedebian.pl index 64bd44eb9..5eabd50ed 100755 --- a/makedebian.pl +++ b/makedebian.pl @@ -350,6 +350,7 @@ read answer printf "\\n" if [ "\\\$answer" = "y" ]; then echo "Removing $ucproduct package .." + rm -f /usr/share/$baseproduct/authentic-theme/manifest-* dpkg --remove --force-depends $product systemctlcmd=\\\`which systemctl 2>/dev/null\\\` if [ -x "\\\$systemctlcmd" ]; then @@ -395,6 +396,7 @@ if [ "\$1" != "upgrade" -a "\$1" != "abort-upgrade" ]; then # Package is being removed, and no new version of webmin # has taken it's place. Run uninstalls and stop the server /etc/$baseproduct/stop >/dev/null 2>&1 /dev/null 2>&1 Date: Sun, 17 Jul 2022 21:02:18 +0300 Subject: [PATCH 3/6] Fix to run uninstalls conditionally --- setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 13643eeda..951f96e16 100755 --- a/setup.sh +++ b/setup.sh @@ -863,7 +863,9 @@ printf "\n" if [ "\$answer" = "y" ]; then $config_dir/stop echo "Running uninstall scripts .." - (cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl") >/dev/null 2>&1 /dev/null 2>&1 Date: Sun, 17 Jul 2022 21:10:47 +0300 Subject: [PATCH 4/6] Remove for Usermin only, as Webmin runs uninstalls --- makedebian.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makedebian.pl b/makedebian.pl index 5eabd50ed..472004f35 100755 --- a/makedebian.pl +++ b/makedebian.pl @@ -396,10 +396,10 @@ if [ "\$1" != "upgrade" -a "\$1" != "abort-upgrade" ]; then # Package is being removed, and no new version of webmin # has taken it's place. Run uninstalls and stop the server /etc/$baseproduct/stop >/dev/null 2>&1 /dev/null 2>&1 /dev/null\` if [ -x "\$systemctlcmd" ]; then \$systemctlcmd stop $product >/dev/null 2>&1 Date: Sun, 17 Jul 2022 22:29:15 +0300 Subject: [PATCH 5/6] Fix not to touch `dnssectools` in this PR --- bind8/config-AlmaLinux-6.0-ALL | 4 ++++ bind8/config-Rocky-Linux-6.0-ALL | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/bind8/config-AlmaLinux-6.0-ALL b/bind8/config-AlmaLinux-6.0-ALL index eadde15ec..b0b4bb231 100644 --- a/bind8/config-AlmaLinux-6.0-ALL +++ b/bind8/config-AlmaLinux-6.0-ALL @@ -44,6 +44,10 @@ keygen=dnssec-keygen tmpl_dnssec=0 dnssec_period=21 tmpl_dnssec_dt=1 +dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf +dnssectools_rollrec=/var/named/system.rollrec +dnssectools_keydir=/var/named/dtkeys +dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid force_random=0 spf_record=0 dnssec_info=1 diff --git a/bind8/config-Rocky-Linux-6.0-ALL b/bind8/config-Rocky-Linux-6.0-ALL index eadde15ec..b0b4bb231 100644 --- a/bind8/config-Rocky-Linux-6.0-ALL +++ b/bind8/config-Rocky-Linux-6.0-ALL @@ -44,6 +44,10 @@ keygen=dnssec-keygen tmpl_dnssec=0 dnssec_period=21 tmpl_dnssec_dt=1 +dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf +dnssectools_rollrec=/var/named/system.rollrec +dnssectools_keydir=/var/named/dtkeys +dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid force_random=0 spf_record=0 dnssec_info=1 From 7f0d7fe7411ea9e76169630c2c43ffe7796023db Mon Sep 17 00:00:00 2001 From: iliajie Date: Sun, 17 Jul 2022 22:31:49 +0300 Subject: [PATCH 6/6] Add missing `dnssec_period` option --- bind8/config-debian-linux-10.0-ALL | 1 + 1 file changed, 1 insertion(+) diff --git a/bind8/config-debian-linux-10.0-ALL b/bind8/config-debian-linux-10.0-ALL index 1221bc0df..3a042bc0d 100644 --- a/bind8/config-debian-linux-10.0-ALL +++ b/bind8/config-debian-linux-10.0-ALL @@ -47,3 +47,4 @@ dnssec_info=1 start_cmd=systemctl start bind9.service stop_cmd=systemctl stop bind9.service restart_cmd=systemctl reload bind9.service +dnssec_period=21