Merge branch 'master' of github.com:webmin/webmin

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,7 +40,6 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
 keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
@@ -54,3 +51,6 @@ 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

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

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,7 +40,6 @@ keygen=dnssec-keygen
 signzone=dnssec-signzone
 checkconf=named-checkconf
 other_slaves=1
-restart_cmd=restart
 keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
@@ -54,3 +51,6 @@ 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

bind8/config-debian-linux-10.0-ALL

@@ -0,0 +1,50 @@
+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
+dnssec_period=21

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

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
@@ -398,6 +399,7 @@ if [ "\$1" != "upgrade" -a "\$1" != "abort-upgrade" ]; then
 		if [ "$product" = "webmin" ]; then
 			(cd /usr/share/$baseproduct ; WEBMIN_CONFIG=/etc/$baseproduct WEBMIN_VAR=/var/$baseproduct LANG= /usr/share/$baseproduct/run-uninstalls.pl) >/dev/null 2>&1 </dev/null
 		else
+			rm -f /usr/share/$baseproduct/authentic-theme/manifest-*
 			systemctlcmd=\`which systemctl 2>/dev/null\`
 			if [ -x "\$systemctlcmd" ]; then
 				\$systemctlcmd stop $product >/dev/null 2>&1 </dev/null

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
+	if [ -r "$wadir/run-uninstalls.pl" ]; then
+		(cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl") >/dev/null 2>&1 </dev/null
+	fi
 	echo "Deleting $wadir .."
 	rm -rf "$wadir"
 	echo "Deleting $config_dir .."