From e585f3edf08a8a4351d5ee56ca092f771511fa14 Mon Sep 17 00:00:00 2001 From: iliajie Date: Wed, 10 Aug 2022 22:05:02 +0300 Subject: [PATCH] Add further fixes to BIND configs --- bind8/config-AlmaLinux-6.0-ALL | 6 +-- bind8/config-CentOS-Linux-8.0-ALL | 6 +-- bind8/config-CentOS-Stream-Linux-8.0-ALL | 6 +-- bind8/config-Oracle-Linux-8.0-ALL | 8 ++-- ...=> config-Redhat-Enterprise-Linux-6.0-7.0} | 0 ...=> config-Redhat-Enterprise-Linux-8.0-ALL} | 12 +++-- bind8/config-Rocky-Linux-6.0-ALL | 6 +-- ...-13.0-23.0 => config-redhat-linux-7.0-ALL} | 15 ++++-- bind8/config-redhat-linux-7.1-12.0 | 47 ------------------- ...dhat-linux => config-redhat-linux-ALL-6.0} | 16 ++++++- 10 files changed, 49 insertions(+), 73 deletions(-) rename bind8/{config-Redhat-Enterprise-Linux-6.0-ALL => config-Redhat-Enterprise-Linux-6.0-7.0} (100%) rename bind8/{config-redhat-linux-24.0-ALL => config-Redhat-Enterprise-Linux-8.0-ALL} (80%) rename bind8/{config-redhat-linux-13.0-23.0 => config-redhat-linux-7.0-ALL} (78%) delete mode 100644 bind8/config-redhat-linux-7.1-12.0 rename bind8/{config-redhat-linux => config-redhat-linux-ALL-6.0} (63%) diff --git a/bind8/config-AlmaLinux-6.0-ALL b/bind8/config-AlmaLinux-6.0-ALL index 94fdae129..523a18970 100644 --- a/bind8/config-AlmaLinux-6.0-ALL +++ b/bind8/config-AlmaLinux-6.0-ALL @@ -51,8 +51,8 @@ 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 +start_cmd=systemctl start named +stop_cmd=systemctl stop named +restart_cmd=systemctl reload named chroot= auto_chroot= diff --git a/bind8/config-CentOS-Linux-8.0-ALL b/bind8/config-CentOS-Linux-8.0-ALL index 586946b52..8722885e4 100644 --- a/bind8/config-CentOS-Linux-8.0-ALL +++ b/bind8/config-CentOS-Linux-8.0-ALL @@ -47,8 +47,8 @@ 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 +start_cmd=systemctl start named +stop_cmd=systemctl stop named +restart_cmd=systemctl reload named chroot= auto_chroot= diff --git a/bind8/config-CentOS-Stream-Linux-8.0-ALL b/bind8/config-CentOS-Stream-Linux-8.0-ALL index 94fdae129..523a18970 100644 --- a/bind8/config-CentOS-Stream-Linux-8.0-ALL +++ b/bind8/config-CentOS-Stream-Linux-8.0-ALL @@ -51,8 +51,8 @@ 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 +start_cmd=systemctl start named +stop_cmd=systemctl stop named +restart_cmd=systemctl reload named chroot= auto_chroot= diff --git a/bind8/config-Oracle-Linux-8.0-ALL b/bind8/config-Oracle-Linux-8.0-ALL index b0b4bb231..523a18970 100644 --- a/bind8/config-Oracle-Linux-8.0-ALL +++ b/bind8/config-Oracle-Linux-8.0-ALL @@ -51,6 +51,8 @@ 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 +start_cmd=systemctl start named +stop_cmd=systemctl stop named +restart_cmd=systemctl reload named +chroot= +auto_chroot= diff --git a/bind8/config-Redhat-Enterprise-Linux-6.0-ALL b/bind8/config-Redhat-Enterprise-Linux-6.0-7.0 similarity index 100% rename from bind8/config-Redhat-Enterprise-Linux-6.0-ALL rename to bind8/config-Redhat-Enterprise-Linux-6.0-7.0 diff --git a/bind8/config-redhat-linux-24.0-ALL b/bind8/config-Redhat-Enterprise-Linux-8.0-ALL similarity index 80% rename from bind8/config-redhat-linux-24.0-ALL rename to bind8/config-Redhat-Enterprise-Linux-8.0-ALL index d26fd7a4a..8722885e4 100644 --- a/bind8/config-redhat-linux-24.0-ALL +++ b/bind8/config-Redhat-Enterprise-Linux-8.0-ALL @@ -3,8 +3,6 @@ named_path=/usr/sbin/named named_conf=/etc/named.conf show_list=1 records_order=0 -start_cmd=systemctl start named.service -stop_cmd=systemctl stop named.service 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/named.pid +pid_file=/run/named/named.pid whois_cmd=whois short_names=0 updserial_def=0 @@ -42,9 +40,15 @@ 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 -restart_cmd=systemctl reload named.service +start_cmd=systemctl start named +stop_cmd=systemctl stop named +restart_cmd=systemctl reload named chroot= auto_chroot= diff --git a/bind8/config-Rocky-Linux-6.0-ALL b/bind8/config-Rocky-Linux-6.0-ALL index 94fdae129..523a18970 100644 --- a/bind8/config-Rocky-Linux-6.0-ALL +++ b/bind8/config-Rocky-Linux-6.0-ALL @@ -51,8 +51,8 @@ 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 +start_cmd=systemctl start named +stop_cmd=systemctl stop named +restart_cmd=systemctl reload named chroot= auto_chroot= diff --git a/bind8/config-redhat-linux-13.0-23.0 b/bind8/config-redhat-linux-7.0-ALL similarity index 78% rename from bind8/config-redhat-linux-13.0-23.0 rename to bind8/config-redhat-linux-7.0-ALL index af8fb2a86..8722885e4 100644 --- a/bind8/config-redhat-linux-13.0-23.0 +++ b/bind8/config-redhat-linux-7.0-ALL @@ -3,8 +3,6 @@ named_path=/usr/sbin/named named_conf=/etc/named.conf show_list=1 records_order=0 -start_cmd=/etc/rc.d/init.d/named start -stop_cmd=/etc/rc.d/init.d/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/named.pid +pid_file=/run/named/named.pid whois_cmd=whois short_names=0 updserial_def=0 @@ -28,12 +26,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 @@ -44,6 +40,15 @@ 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 +stop_cmd=systemctl stop named +restart_cmd=systemctl reload named +chroot= +auto_chroot= diff --git a/bind8/config-redhat-linux-7.1-12.0 b/bind8/config-redhat-linux-7.1-12.0 deleted file mode 100644 index bf06686ef..000000000 --- a/bind8/config-redhat-linux-7.1-12.0 +++ /dev/null @@ -1,47 +0,0 @@ -soa_style=1 -named_path=/usr/sbin/named -named_conf=/etc/named.conf -show_list=1 -records_order=0 -start_cmd=/etc/rc.d/init.d/named start -stop_cmd=/etc/rc.d/init.d/named stop -max_zones=50 -rev_def=0 -support_aaaa=1 -allow_comments=0 -allow_wild=1 -allow_long=0 -master_ttl=1 -pid_file=/var/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 -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 -force_random=0 -spf_record=0 -dnssec_info=1 -chroot= -auto_chroot= diff --git a/bind8/config-redhat-linux b/bind8/config-redhat-linux-ALL-6.0 similarity index 63% rename from bind8/config-redhat-linux rename to bind8/config-redhat-linux-ALL-6.0 index e701fe963..80de5852d 100644 --- a/bind8/config-redhat-linux +++ b/bind8/config-redhat-linux-ALL-6.0 @@ -3,8 +3,8 @@ named_path=/usr/sbin/named named_conf=/etc/named.conf show_list=1 records_order=0 -start_cmd=/etc/rc.d/init.d/named start -stop_cmd=/etc/rc.d/init.d/named stop +start_cmd=service named start +stop_cmd=service named stop max_zones=50 rev_def=0 support_aaaa=1 @@ -12,6 +12,7 @@ allow_comments=0 allow_wild=1 allow_long=0 master_ttl=1 +pid_file=/var/run/named.pid /run/named.pid whois_cmd=whois short_names=0 updserial_def=0 @@ -29,6 +30,8 @@ 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 @@ -39,6 +42,15 @@ 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