From: mhoellein <mario@hoellein.online>
Date: Thu, 4 Mar 2021 06:48:43 +0000 (+0100)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=64b907100fc02f43937c1fe58b1d67717c5f11e1;p=vserver

committing changes in /etc made by "apt-get upgrade"

Package changes:
-collaboraoffice6.4 6.4.10.27-27 amd64
-collaboraoffice6.4-ure 6.4.10.27-27 amd64
+collaboraoffice6.4 6.4.10.28-28 amd64
+collaboraoffice6.4-ure 6.4.10.28-28 amd64
-collaboraofficebasis6.4-calc 6.4.10.27-27 amd64
-collaboraofficebasis6.4-core 6.4.10.27-27 amd64
-collaboraofficebasis6.4-draw 6.4.10.27-27 amd64
-collaboraofficebasis6.4-en-us 6.4.10.27-27 amd64
-collaboraofficebasis6.4-extension-pdf-import 6.4.10.27-27 amd64
-collaboraofficebasis6.4-graphicfilter 6.4.10.27-27 amd64
-collaboraofficebasis6.4-images 6.4.10.27-27 amd64
-collaboraofficebasis6.4-impress 6.4.10.27-27 amd64
-collaboraofficebasis6.4-ooofonts 6.4.10.27-27 amd64
-collaboraofficebasis6.4-ooolinguistic 6.4.10.27-27 amd64
-collaboraofficebasis6.4-writer 6.4.10.27-27 amd64
+collaboraofficebasis6.4-calc 6.4.10.28-28 amd64
+collaboraofficebasis6.4-core 6.4.10.28-28 amd64
+collaboraofficebasis6.4-draw 6.4.10.28-28 amd64
+collaboraofficebasis6.4-en-us 6.4.10.28-28 amd64
+collaboraofficebasis6.4-extension-pdf-import 6.4.10.28-28 amd64
+collaboraofficebasis6.4-graphicfilter 6.4.10.28-28 amd64
+collaboraofficebasis6.4-images 6.4.10.28-28 amd64
+collaboraofficebasis6.4-impress 6.4.10.28-28 amd64
+collaboraofficebasis6.4-ooofonts 6.4.10.28-28 amd64
+collaboraofficebasis6.4-ooolinguistic 6.4.10.28-28 amd64
+collaboraofficebasis6.4-writer 6.4.10.28-28 amd64
-loolwsd 6.4.6-6 amd64
+loolwsd 6.4.6-7 amd64
-python3-twisted 18.9.0-11 all
-python3-twisted-bin 18.9.0-11 amd64
+python3-twisted 18.9.0-11ubuntu0.20.04.1 all
+python3-twisted-bin 18.9.0-11ubuntu0.20.04.1 amd64
-webmin 1.970 all
+webmin 1.972 all
---

diff --git a/init.d/webmin b/init.d/webmin
index b3ed40ce5..988bb44be 100755
--- a/init.d/webmin
+++ b/init.d/webmin
@@ -1,77 +1,29 @@
 #!/bin/sh
-# chkconfig: 235 99 10
-# description: web-based administration interface for Unix systems
-#
 ### BEGIN INIT INFO
-# Provides:          webmin
-# Required-Start:    $local_fs $network $syslog
-# Required-Stop:     $local_fs $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: web-based administration interface for Unix systems
-# Description:       Webmin is a web-based interface for system administration
-#                    for Unix. Using Webmin you can configure DNS, Samba, NFS,
-#                    local/remote filesystems and more using your web browser.
+# Provides: webmin
+# Required-Start: $network $syslog
+# Required-Stop: $network
+# Default-Start: 2 3 5
+# Default-Stop:
+# Description: Webmin
 ### END INIT INFO
 
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="web-based administration interface for Unix systems"
-NAME=Webmin
-PIDFILE=/var/webmin/miniserv.pid
-SCRIPTNAME=/etc/init.d/$NAME
-START=/etc/webmin/start
-STOP=/etc/webmin/stop
-RELOAD=/etc/webmin/reload
-LOCKFILE=/var/lock/subsys/webmin
-CONFFILE=/etc/webmin/miniserv.conf
-
 case "$1" in
-start)
-	$START >/dev/null 2>&1 </dev/null
+'start')
+	/etc/webmin/start
 	RETVAL=$?
-	if [ "$RETVAL" = "0" ]; then
-		touch $LOCKFILE >/dev/null 2>&1
-	fi
 	;;
-stop)
-	$STOP
+'stop')
+	/etc/webmin/stop
 	RETVAL=$?
-	if [ "$RETVAL" = "0" ]; then
-		rm -f $LOCKFILE
-	fi
-	;;
-status)
-	pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'`
-	if [ "$pidfile" = "" ]; then
-		pidfile=$PIDFILE
-	fi
-	if [ -s $pidfile ]; then
-		pid=`cat $pidfile`
-		kill -0 $pid >/dev/null 2>&1
-		if [ "$?" = "0" ]; then
-			echo "$NAME (pid $pid) is running"
-			RETVAL=0
-		else
-			echo "$NAME is stopped"
-			RETVAL=1
-		fi
-	else
-		echo "$NAME is stopped"
-		RETVAL=1
-	fi
 	;;
-restart)
-	$STOP ; $START
-	RETVAL=$?
-	;;
-reload|force-reload)
-	$RELOAD
+'restart')
+	$0 stop ; $0 start
 	RETVAL=$?
 	;;
 *)
-	echo "Usage: $0 {start|stop|restart|reload|force-reload|status}" >&2
+	echo "Usage: $0 { start | stop }"
 	RETVAL=1
 	;;
 esac
 exit $RETVAL
-
diff --git a/rc2.d/S99webmin_1 b/rc2.d/S99webmin_1
new file mode 120000
index 000000000..4e77f9fdf
--- /dev/null
+++ b/rc2.d/S99webmin_1
@@ -0,0 +1 @@
+/etc/init.d/webmin
\ No newline at end of file
diff --git a/rc3.d/S99webmin_1 b/rc3.d/S99webmin_1
new file mode 120000
index 000000000..4e77f9fdf
--- /dev/null
+++ b/rc3.d/S99webmin_1
@@ -0,0 +1 @@
+/etc/init.d/webmin
\ No newline at end of file
diff --git a/rc5.d/S99webmin_1 b/rc5.d/S99webmin_1
new file mode 120000
index 000000000..4e77f9fdf
--- /dev/null
+++ b/rc5.d/S99webmin_1
@@ -0,0 +1 @@
+/etc/init.d/webmin
\ No newline at end of file
diff --git a/webmin/acl/config b/webmin/acl/config
index 017dd0405..ee9b4c16b 100644
--- a/webmin/acl/config
+++ b/webmin/acl/config
@@ -1,3 +1,3 @@
-order=0
-ssleay=/usr/bin/openssl
 display=1
+ssleay=/usr/bin/openssl
+order=0
diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config
index fa9920957..afc9b3ab0 100644
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
 status_cmd=adsl-status
-conf_style=0
-pppoe_conf=/etc/ppp/pppoe.conf
 stop_cmd=adsl-stop
-pap_file=/etc/ppp/pap-secrets
 pppoe_cmd=pppoe
 start_cmd=adsl-start
+pap_file=/etc/ppp/pap-secrets
+pppoe_conf=/etc/ppp/pppoe.conf
+conf_style=0
diff --git a/webmin/apache/config b/webmin/apache/config
index de5503150..0a266b22c 100644
--- a/webmin/apache/config
+++ b/webmin/apache/config
@@ -1,24 +1,24 @@
-test_apachectl=1
-show_list=0
-show_names=0
-access_conf=/etc/apache2/access.conf
-srm_conf=/etc/apache2/srm.conf
-test_always=0
-max_servers=100
-apply_cmd=/usr/sbin/apache2ctl graceful
-apachectl_path=/usr/sbin/apache2ctl
-httpd_path=/usr/sbin/apache2
 httpd_dir=/etc/apache2
-test_config=1
-test_manual=0
-start_cmd=/etc/init.d/apache2 start
 httpd_conf=/etc/apache2/apache2.conf
-defines_name=APACHE_ARGUMENTS
 defines_file=/etc/apache2/envvars
-stop_cmd=/etc/init.d/apache2 stop
-auto_mods=1
+show_order=0
+start_cmd=/etc/init.d/apache2 start
+defines_name=APACHE_ARGUMENTS
+max_servers=100
 allow_virtualmin=0
+show_names=0
+httpd_path=/usr/sbin/apache2
 virt_file=/etc/apache2/sites-available
+show_list=0
+apply_cmd=/usr/sbin/apache2ctl graceful
+test_config=1
+apachectl_path=/usr/sbin/apache2ctl
+test_always=0
+srm_conf=/etc/apache2/srm.conf
+stop_cmd=/etc/init.d/apache2 stop
+auto_mods=1
+test_manual=0
 link_dir=/etc/apache2/sites-enabled
-show_order=0
 mime_types=/etc/apache2/mime.types
+test_apachectl=1
+access_conf=/etc/apache2/access.conf
diff --git a/webmin/backup-config/config b/webmin/backup-config/config
index 5d1c57e87..3bdfb1231 100644
--- a/webmin/backup-config/config
+++ b/webmin/backup-config/config
@@ -1,3 +1,3 @@
 date_subs=0
-webmin_subs=0
 apply=1
+webmin_subs=0
diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config
index e5df5033c..a8a326da4 100644
--- a/webmin/bacula-backup/config
+++ b/webmin/bacula-backup/config
@@ -1,12 +1,12 @@
-btape=btape
-db=bacula
 wait=1
-bls=bls
+bextract=bextract
 showdirs=0
-init_start=0
+driver=Pg
+pass=
+btape=btape
 bacula_dir=/etc/bacula
 apply=1
 user=bacula
-pass=
-bextract=bextract
-driver=Pg
+db=bacula
+init_start=0
+bls=bls
diff --git a/webmin/bind8/config b/webmin/bind8/config
index 6c30f4eb7..992cd8d0e 100644
--- a/webmin/bind8/config
+++ b/webmin/bind8/config
@@ -1,45 +1,45 @@
-master_dir=/var/lib/bind
-signzone=dnssec-signzone
-spf_record=0
 whois_cmd=whois
-largezones=0
-pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
-keygen=dnssec-keygen
-max_zones=50
+updserial_man=1
+no_chroot=0
+master_ttl=1
+checkzone=named-checkzone
+allow_comments=0
 confirm_zone=1
-rev_must=0
-show_list=0
-named_conf=/etc/bind/named.conf
-relative_paths=0
-named_path=/usr/sbin/named
-support_aaaa=1
-slave_dir=/var/lib/bind
-ndc_cmd=ndc
-other_slaves=1
+zones_file=/etc/bind/named.conf.local
+spf_record=0
+allow_underscore=1
+records_order=0
+forwardzonefilename_format=ZONE.hosts
 rndc_conf=/etc/bind/rndc.conf
-ipv6_mode=1
+rev_must=0
+keygen=dnssec-keygen
+by_view=0
 allow_wild=1
-updserial_man=1
 updserial_def=0
-no_chroot=0
+pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
+master_dir=/var/lib/bind
+named_path=/usr/sbin/named
 rndc_cmd=rndc
-master_ttl=1
+named_conf=/etc/bind/named.conf
+largezones=0
+rev_def=0
+rndcconf_cmd=rndc-confgen
+force_random=0
+max_zones=50
+slave_dir=/var/lib/bind
+support_aaaa=1
+no_pid_chroot=0
 updserial_on=1
 short_names=0
-allow_comments=0
-no_pid_chroot=0
-rev_def=0
-allow_long=0
-confirm_rec=0
+soa_style=0
+other_slaves=1
+signzone=dnssec-signzone
 checkconf=named-checkconf
-reversezonefilename_format=ZONE.rev
-zones_file=/etc/bind/named.conf.local
-force_random=0
-by_view=0
-checkzone=named-checkzone
-rndcconf_cmd=rndc-confgen
-forwardzonefilename_format=ZONE.hosts
+relative_paths=0
+allow_long=0
 soa_start=0
-soa_style=0
-records_order=0
-allow_underscore=1
+reversezonefilename_format=ZONE.rev
+confirm_rec=0
+ndc_cmd=ndc
+show_list=0
+ipv6_mode=1
diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config
index 2ab4c6af1..75e5ffcde 100644
--- a/webmin/cluster-passwd/config
+++ b/webmin/cluster-passwd/config
@@ -1,3 +1,3 @@
 input_type=0
-sort_mode=0
 max_users=200
+sort_mode=0
diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config
index 470eaee86..fd788cb1e 100644
--- a/webmin/cluster-software/config
+++ b/webmin/cluster-software/config
@@ -1,2 +1,2 @@
-sort_mode=0
 table_mode=0
+sort_mode=0
diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config
index 0da24580e..18e19dc83 100644
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
-conf_add_group=1
-conf_add_user=1
 conf_host_links=1
-sort_mode=0
-conf_find_user=1
-conf_find_group=1
+conf_add_user=1
+conf_add_group=1
 table_mode=0
-conf_allow_refresh=1
+conf_find_user=1
 conf_allow_sync=1
+conf_allow_refresh=1
+sort_mode=0
+conf_find_group=1
diff --git a/webmin/cluster-usermin/config b/webmin/cluster-usermin/config
index fd788cb1e..470eaee86 100644
--- a/webmin/cluster-usermin/config
+++ b/webmin/cluster-usermin/config
@@ -1,2 +1,2 @@
-table_mode=0
 sort_mode=0
+table_mode=0
diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config
index 470eaee86..fd788cb1e 100644
--- a/webmin/cluster-webmin/config
+++ b/webmin/cluster-webmin/config
@@ -1,2 +1,2 @@
-sort_mode=0
 table_mode=0
+sort_mode=0
diff --git a/webmin/config b/webmin/config
index f00fec3a2..6867983b7 100644
--- a/webmin/config
+++ b/webmin/config
@@ -1,32 +1,32 @@
+hostnamedisplay=
+by_view=0
 nofeedbackcc=0
-dateformat=dd/mon/yyyy
+passwd_cindex=2
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
 referers_none=1
-showhost=0
-showlogin=0
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-ld_env=LD_LIBRARY_PATH
-os_version=9.0
-help_height=
-lang=en.UTF-8
-log=1
 passwd_uindex=0
+passwd_mindex=4
+hostnamemode=0
+passwd_file=/etc/shadow
+tempdelete_days=7
+help_width=
 feedback_to=
 sysinfo=0
-tempdelete_days=7
-product=webmin
+theme=authentic-theme
+lang_root=de.UTF-8
+os_type=debian-linux
 passwd_pindex=1
-passwd_cindex=2
 webprefix=
-passwd_file=/etc/shadow
-hostnamemode=0
-md5pass=1
+showhost=0
+help_height=
+lang=en.UTF-8
+showlogin=0
 real_os_type=Ubuntu Linux
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
 real_os_version=18.04.1
-theme=authentic-theme
-os_type=debian-linux
-lang_root=de.UTF-8
-passwd_mindex=4
-help_width=
-by_view=0
-hostnamedisplay=
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
+log=1
+ld_env=LD_LIBRARY_PATH
+product=webmin
+os_version=9.0
+dateformat=dd/mon/yyyy
+md5pass=1
diff --git a/webmin/cpan/config b/webmin/cpan/config
index 75e30348c..75c93f1c9 100644
--- a/webmin/cpan/config
+++ b/webmin/cpan/config
@@ -1,6 +1,6 @@
+save_partial=0
+refresh_days=30
 packages=http://www.cpan.org/modules/02packages.details.txt.gz
 incyum=1
 cpan=http://www.cpan.org/authors/id
-refresh_days=30
-save_partial=0
 incpackages=1
diff --git a/webmin/cron/config b/webmin/cron/config
index bebefea7c..cf04d1a3c 100644
--- a/webmin/cron/config
+++ b/webmin/cron/config
@@ -1,25 +1,25 @@
-cron_input=1
-cron_deny_all=2
-match_mode=0
+show_comment=0
+cron_delete_command=crontab -u USER -r
+cron_dir=/var/spool/cron/crontabs
+max_len=80
+show_run=0
+cron_user_delete_command=crontab -r
+cron_edit_command=crontab -u USER -e
+cron_allow_file=/var/spool/cron/allow
+cron_user_get_command=crontab -l
+cron_user_edit_command=crontab -e
+show_next=0
+max_jobs=100
 system_crontab=/etc/crontab
 hourly_only=0
-cron_delete_command=crontab -u USER -r
 match_user=1
-max_jobs=100
-cron_user_get_command=crontab -l
-show_run=0
-vixie_cron=1
 kill_subs=0
-cron_edit_command=crontab -u USER -e
 show_time=0
-cron_get_command=crontab -u USER -l
 run_parts=run-parts
-cron_deny_file=/var/spool/cron/deny
-cron_dir=/var/spool/cron/crontabs
-cron_user_delete_command=crontab -r
-show_next=0
-cron_user_edit_command=crontab -e
-show_comment=0
+vixie_cron=1
+cron_input=1
+cron_deny_all=2
+match_mode=0
 cronfiles_dir=/etc/cron.d
-max_len=80
-cron_allow_file=/var/spool/cron/allow
+cron_get_command=crontab -u USER -l
+cron_deny_file=/var/spool/cron/deny
diff --git a/webmin/custom/config b/webmin/custom/config
index aea470f3c..dec7928fb 100644
--- a/webmin/custom/config
+++ b/webmin/custom/config
@@ -1,4 +1,4 @@
 params_cmd=0
-columns=2
 params_file=0
+columns=2
 display_mode=0
diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index 52499e809..c04f38ddb 100644
--- a/webmin/dhcpd/config
+++ b/webmin/dhcpd/config
@@ -1,17 +1,17 @@
-pid_file=/var/run/dhcpd.pid
-display_max=100
-desc_name=0
 dhcpd_nocols=5
-stop_cmd=service isc-dhcp-server stop
-group_name=0
-show_mac=0
 show_ip=0
-lease_file=/var/lib/dhcp/dhcpd.leases
+stop_cmd=service isc-dhcp-server stop
+lease_sort=0
 dhcpd_path=/usr/sbin/dhcpd
-interfaces_type=debian
 lease_tz=0
-dhcpd_conf=/etc/dhcp/dhcpd.conf
-lease_sort=0
+group_name=0
 lease_vendor=0
-start_cmd=service isc-dhcp-server start
 restart_cmd=service isc-dhcp-server restart
+lease_file=/var/lib/dhcp/dhcpd.leases
+desc_name=0
+pid_file=/var/run/dhcpd.pid
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+display_max=100
+start_cmd=service isc-dhcp-server start
+show_mac=0
+interfaces_type=debian
diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index 345812ba1..139214874 100644
--- a/webmin/dovecot/config
+++ b/webmin/dovecot/config
@@ -1,4 +1,4 @@
-pid_file=/var/run/dovecot/master.pid
-dovecot_config=/etc/dovecot/dovecot.conf
 init_script=dovecot
+pid_file=/var/run/dovecot/master.pid
 dovecot=/usr/sbin/dovecot
+dovecot_config=/etc/dovecot/dovecot.conf
diff --git a/webmin/exim/config b/webmin/exim/config
index 492b81315..b96c9da4a 100644
--- a/webmin/exim/config
+++ b/webmin/exim/config
@@ -1,8 +1,8 @@
-exim_dbmfile=/etc/exim4/local_domains
-exim_dbmext=.dbm
+exim_addrfile=/etc/exim4/email-addresses
 exim_aliasfileext=
+exim_dbmfile=/etc/exim4/local_domains
+exim_dir=/etc/exim4
+exim_mail_file=Maildir
 mail_system=1
+exim_dbmext=.dbm
 exim_virt_dir=/etc/exim4/aliases
-exim_addrfile=/etc/exim4/email-addresses
-exim_mail_file=Maildir
-exim_dir=/etc/exim4
diff --git a/webmin/exports/config b/webmin/exports/config
index d23f7b7df..78081f81c 100644
--- a/webmin/exports/config
+++ b/webmin/exports/config
@@ -1,3 +1,3 @@
-restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi
-exports_file=/etc/exports
 apply_cmd=exportfs -r
+exports_file=/etc/exports
+restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi
diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config
index aebf23ff0..38e02282a 100644
--- a/webmin/fail2ban/config
+++ b/webmin/fail2ban/config
@@ -1,4 +1,4 @@
 client_cmd=/usr/bin/fail2ban-client
-config_dir=/etc/fail2ban
 server_cmd=/usr/bin/fail2ban-server
+config_dir=/etc/fail2ban
 init_script=fail2ban
diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config
index b7ac7bb6d..620ac7aa2 100644
--- a/webmin/fetchmail/config
+++ b/webmin/fetchmail/config
@@ -1,6 +1,6 @@
-fetchmail_path=fetchmail
-config_file=
-max_users=400
-daemon_user=root
 view_mode=0
+daemon_user=root
+max_users=400
+config_file=
+fetchmail_path=fetchmail
 pid_file=/var/run/fetchmail.pid
diff --git a/webmin/filter/config b/webmin/filter/config
index c5a7085ee..6b456aa04 100644
--- a/webmin/filter/config
+++ b/webmin/filter/config
@@ -1,6 +1,6 @@
-virtualmin_config=/etc/webmin/virtual-server
+warn_procmail=1
+virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
 forward_procmail=0
+virtualmin_config=/etc/webmin/virtual-server
 reply_force=0
-warn_procmail=1
 alias_files=/etc/aliases	/etc/postfix/aliases	/etc/mail/aliases
-virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
diff --git a/webmin/firewall/config b/webmin/firewall/config
index e55c04164..cb5940517 100644
--- a/webmin/firewall/config
+++ b/webmin/firewall/config
@@ -1,6 +1,6 @@
-view_condition=1
-comment_mod=0
-force_init=0
-direct=0
 cluster_mode=1
+comment_mod=0
 view_comment=0
+direct=0
+view_condition=1
+force_init=0
diff --git a/webmin/firewall6/config b/webmin/firewall6/config
index 8546d5339..6af3be516 100644
--- a/webmin/firewall6/config
+++ b/webmin/firewall6/config
@@ -1,6 +1,6 @@
-view_condition=1
-comment_mod=0
 force_init=0
 direct=0
 view_comment=0
+view_condition=1
 cluster_mode=1
+comment_mod=0
diff --git a/webmin/firewalld/config b/webmin/firewalld/config
index ff329a00d..0aae64fac 100644
--- a/webmin/firewalld/config
+++ b/webmin/firewalld/config
@@ -1,2 +1,2 @@
-firewall_cmd=firewall-cmd
 init_name=firewalld
+firewall_cmd=firewall-cmd
diff --git a/webmin/fsdump/config b/webmin/fsdump/config
index ef8d33dbd..5ba78efc2 100644
--- a/webmin/fsdump/config
+++ b/webmin/fsdump/config
@@ -1,7 +1,7 @@
-simple_sched=0
 date_subs=0
 nonewtape=0
 always_tar=0
-run_mode=0
-error_email=0
+simple_sched=0
 webmin_subs=0
+error_email=0
+run_mode=0
diff --git a/webmin/grub/config b/webmin/grub/config
index 49d2d2860..f6464eb2a 100644
--- a/webmin/grub/config
+++ b/webmin/grub/config
@@ -1,3 +1,3 @@
-menu_file=/boot/grub/menu.lst
-grub_path=grub
 install=(hd0)
+grub_path=grub
+menu_file=/boot/grub/menu.lst
diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config
index 2c681a4e8..53e4828c4 100644
--- a/webmin/heartbeat/config
+++ b/webmin/heartbeat/config
@@ -1,15 +1,15 @@
-stop_cmd=/etc/init.d/heartbeat stop
-serials=/dev/ttyS*
-ha_cf=
-pid_file=/var/run/heartbeat.pid
-heartbeat=/usr/lib/heartbeat/heartbeat
 haresources=
-authkeys=
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+ha_cf=
 ha_dir=/etc/ha.d
+req_resource_cmd=/usr/lib/heartbeat/req_resource
+apply_cmd=/etc/init.d/heartbeat reload
+resource_d=
+authkeys=
 alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
+stop_cmd=/etc/init.d/heartbeat stop
 start_cmd=/etc/init.d/heartbeat start
-req_resource_cmd=/usr/lib/heartbeat/req_resource
 alt_haresources=/usr/share/doc/packages/heartbeat/haresources
-resource_d=
-apply_cmd=/etc/init.d/heartbeat reload
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+serials=/dev/ttyS*
+pid_file=/var/run/heartbeat.pid
+heartbeat=/usr/lib/heartbeat/heartbeat
diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config
index f69f43bbe..78f336829 100644
--- a/webmin/htaccess-htpasswd/config
+++ b/webmin/htaccess-htpasswd/config
@@ -1,8 +1,8 @@
+extra_directives=
+htpasswd=.htpasswd
 sort=0
+htgroups=.htgroups
 sha1=0
-extra_directives=
 md5=1
-htpasswd=.htpasswd
-digest=1
 htaccess=.htaccess
-htgroups=.htgroups
+digest=1
diff --git a/webmin/idmapd/config b/webmin/idmapd/config
index bc70dab5e..bbb774e0d 100644
--- a/webmin/idmapd/config
+++ b/webmin/idmapd/config
@@ -1,3 +1,3 @@
+idmapd_conf=/etc/idmapd.conf
 idmapd_path=/usr/sbin/rpc.idmapd
 restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
-idmapd_conf=/etc/idmapd.conf
diff --git a/webmin/inetd/config b/webmin/inetd/config
index 787fce483..4a1795d77 100644
--- a/webmin/inetd/config
+++ b/webmin/inetd/config
@@ -1,16 +1,16 @@
-restart_command=killall -HUP inetd
-rpc_protocols=tcp udp
-qm_mode=0
-protocols_file=/etc/protocols
+sort_mode=0
 services_file=/etc/services
-show_empty=1
 inetd_conf_file=/etc/inetd.conf
-allow_file=/etc/hosts.allow
+restart_command=killall -HUP inetd
+qm_mode=0
 ipv6=0
-display_max=100
-tcpd_path=/usr/sbin/tcpd
-rpc_file=/etc/rpc
-extended_inetd=1
+show_empty=1
+rpc_protocols=tcp udp
 rpc_inetd=1
 deny_file=/etc/hosts.deny
-sort_mode=0
+rpc_file=/etc/rpc
+extended_inetd=1
+allow_file=/etc/hosts.allow
+tcpd_path=/usr/sbin/tcpd
+protocols_file=/etc/protocols
+display_max=100
diff --git a/webmin/init/config b/webmin/init/config
index 6435979ca..f3666c79c 100644
--- a/webmin/init/config
+++ b/webmin/init/config
@@ -1,17 +1,17 @@
-init_dir=/etc/init.d
+soft_links=1
+status_check=0
 init_base=/etc/
+desc=1
+no_chkconfig=0
+init_dir=/etc/init.d
 boot_levels=2 3 5
+reboot_command=reboot
+sort_mode=0
 init_info=1
+inittab_id=id
 order=0
-reboot_command=reboot
 atboot_product=webmin
-soft_links=1
-sort_mode=0
-expert=0
-status_check=0
+show_opts=0
 order_digits=2
-inittab_id=id
 shutdown_command=poweroff
-show_opts=0
-no_chkconfig=0
-desc=1
+expert=0
diff --git a/webmin/inittab/config b/webmin/inittab/config
index 31db3e7b1..c2b25728b 100644
--- a/webmin/inittab/config
+++ b/webmin/inittab/config
@@ -1,2 +1,2 @@
-inittab_file=/etc/inittab
 telinit=telinit
+inittab_file=/etc/inittab
diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config
index 3868167e4..79665cb81 100644
--- a/webmin/ipfilter/config
+++ b/webmin/ipfilter/config
@@ -1,9 +1,9 @@
-cluster_nat=1
 ipfstat=ipfstat
+cluster_mode=0
+ipf=ipf
 ipnat_conf=/etc/ipf/ipnat.conf
 ipf_conf=/etc/ipf/ipf.conf
+cluster_nat=1
+view_comment=0
 view_condition=1
 ipnat=ipnat
-cluster_mode=0
-ipf=ipf
-view_comment=0
diff --git a/webmin/ipfw/config b/webmin/ipfw/config
index b4f494a99..39a1c607f 100644
--- a/webmin/ipfw/config
+++ b/webmin/ipfw/config
@@ -1,6 +1,6 @@
 cluster_mode=0
-view_comment=0
-view_condition=1
 version=2
-ipfw=/sbin/ipfw
 view_counters=0
+view_condition=1
+view_comment=0
+ipfw=/sbin/ipfw
diff --git a/webmin/ipsec/config b/webmin/ipsec/config
index 742d950b0..e83c07059 100644
--- a/webmin/ipsec/config
+++ b/webmin/ipsec/config
@@ -1,8 +1,8 @@
 restart_cmd=/etc/init.d/ipsec restart
-start_cmd=/etc/init.d/ipsec start
-policies_dir=/etc/ipsec.d/policies
-stop_cmd=/etc/init.d/ipsec stop
 file=/etc/ipsec.conf
-ipsec=/usr/sbin/ipsec
+stop_cmd=/etc/init.d/ipsec stop
 logfile=/var/log/messages
+start_cmd=/etc/init.d/ipsec start
+policies_dir=/etc/ipsec.d/policies
 secrets=/etc/ipsec.secrets
+ipsec=/usr/sbin/ipsec
diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config
index 79e006bf4..c2f26a372 100644
--- a/webmin/iscsi-client/config
+++ b/webmin/iscsi-client/config
@@ -1,6 +1,6 @@
 iscsiiname=iscsi-iname
-init_name=open-iscsi
-ifaces_dir=/var/lib/iscsi/ifaces
 initiator_file=/etc/iscsi/initiatorname.iscsi
 iscsiadm=iscsiadm
+init_name=open-iscsi
+ifaces_dir=/var/lib/iscsi/ifaces
 config_file=/etc/iscsi/iscsid.conf
diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index d3e3570c5..04896656a 100644
--- a/webmin/iscsi-server/config
+++ b/webmin/iscsi-server/config
@@ -1,6 +1,6 @@
-pid_file=/var/run/iscsi-target.pid
+init_name=netbsd-iscsi
 iscsi_server=/usr/sbin/iscsi-target
+opts_file=/etc/sysconfig/netbsd-iscsi
+pid_file=/var/run/iscsi-target.pid
 auths_file=/etc/iscsi/auths
 targets_file=/etc/iscsi/targets
-init_name=netbsd-iscsi
-opts_file=/etc/sysconfig/netbsd-iscsi
diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config
index 877ab9b89..81e03b4c1 100644
--- a/webmin/iscsi-target/config
+++ b/webmin/iscsi-target/config
@@ -1,7 +1,7 @@
-config_file=/etc/iet/ietd.conf
-pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
 initiators_file=/etc/iet/initiators.allow
+config_file=/etc/iet/ietd.conf
 ietadm=ietadm
 init_name=iscsitarget
-targets_file=/etc/iet/targets.allow
 opts_file=/etc/default/iscsitarget
+pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
+targets_file=/etc/iet/targets.allow
diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config
index 919d3cc99..e55f742ea 100644
--- a/webmin/iscsi-tgtd/config
+++ b/webmin/iscsi-tgtd/config
@@ -1,5 +1,5 @@
-tgtadm=tgtadm
 tgtd=tgtd
-tgtadmin=tgt-admin
+tgtadm=tgtadm
 config_file=/etc/tgt/targets.conf
 init_name=tgtd
+tgtadmin=tgt-admin
diff --git a/webmin/jabber/config b/webmin/jabber/config
index 6290372db..ca2b8b95c 100644
--- a/webmin/jabber/config
+++ b/webmin/jabber/config
@@ -1,5 +1,5 @@
-jabber_daemon=/usr/sbin/jabberd
+start_cmd=/etc/init.d/jabberd start
 jabber_dir=/var/lib/jabber
+jabber_daemon=/usr/sbin/jabberd
 jabber_config=/etc/jabber/jabber.xml
-start_cmd=/etc/init.d/jabberd start
 stop_cmd=/etc/init.d/jabberd stop
diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config
index 4460f14f7..0f578e5fb 100644
--- a/webmin/ldap-client/config
+++ b/webmin/ldap-client/config
@@ -1,3 +1,3 @@
+init_name=nslcd
 auth_ldap=/etc/ldap.conf
 secret=/etc/ldap.secret
-init_name=nslcd
diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index 40830ef79..e17c9df10 100644
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
+apply_cmd=/etc/init.d/slapd restart
+start_cmd=/etc/init.d/slapd start
+attr_count=6
+config_file=/etc/ldap/slapd.d
+browse_max=100
 ldap_user=openldap
-stop_cmd=/etc/init.d/slapd stop
+init_name=slapd
 schema_dir=/etc/ldap/schema
 slapd=slapd
-init_name=slapd
-start_cmd=/etc/init.d/slapd start
-browse_max=100
-apply_cmd=/etc/init.d/slapd restart
-config_file=/etc/ldap/slapd.d
-attr_count=6
+stop_cmd=/etc/init.d/slapd stop
diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config
index 6f993f422..da073f014 100644
--- a/webmin/ldap-useradmin/config
+++ b/webmin/ldap-useradmin/config
@@ -1,24 +1,24 @@
+imap_foldersep=.
 membox=0
-imap_login=cyrus
-samba_def=0
-given=0
-samba_class=sambaSamAccount
-ldap_tls=0
-slappasswd=slappasswd
+samba_gclass=sambaGroup
 imap_folders=old	public	sent-mail
-imap_foldersep=.
-alias_same=0
-gecos=1
-imap_class=SuSEeMailObject
-person=1
 imap_def=0
-samba_gclass=sambaGroup
+imap_login=cyrus
 multi_fields=0
-mailfmt=0
+gecos=1
 md5=0
+given=0
+slappasswd=slappasswd
+imap_class=SuSEeMailObject
+samba_class=sambaSamAccount
+samba_def=0
 secmode=0
-auth_ldap=/etc/ldap.conf
+person=1
+other_class=inetOrgPerson
 shells=fixed,ldap,passwd,shells
+ldap_tls=0
+auth_ldap=/etc/ldap.conf
 quota_support=0
+alias_same=0
 given_order=0
-other_class=inetOrgPerson
+mailfmt=0
diff --git a/webmin/logrotate/config b/webmin/logrotate/config
index d0c77369e..1cb5ad4da 100644
--- a/webmin/logrotate/config
+++ b/webmin/logrotate/config
@@ -1,4 +1,4 @@
+sort_mode=0
+logrotate_conf=/etc/logrotate.conf
 logrotate=logrotate
 add_file=/etc/logrotate.d
-logrotate_conf=/etc/logrotate.conf
-sort_mode=0
diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config
index cf7436a9e..bf38d43b7 100644
--- a/webmin/lpadmin/config
+++ b/webmin/lpadmin/config
@@ -1,17 +1,17 @@
+gs_fontpath=
 start_cmd=/etc/init.d/cupsys start
-show_status=0
+display_mode=0
+iface_arg=
+iface_perms=755
+smbclient_path=smbclient
 iface_owner=lp:lp
-sort_mode=0
-print_style=cups
 model_path=/usr/share/foomatic/db /usr/share/ppd
-show_jobs=0
-smbclient_path=smbclient
-iface_perms=755
-gs_fontpath=
 spool_dir=/var/spool/cups
-gs_lib=
+sort_mode=0
 gs_path=gs
+show_jobs=0
+show_status=0
+print_style=cups
 stop_cmd=/etc/init.d/cupsys stop
-iface_arg=
+gs_lib=
 driver_style=cups
-display_mode=0
diff --git a/webmin/lvm/config b/webmin/lvm/config
index a5ef0ed4d..63b743f61 100644
--- a/webmin/lvm/config
+++ b/webmin/lvm/config
@@ -1,2 +1,2 @@
-show_table=0
 lvm_conf=/etc/lvm/lvm.conf
+show_table=0
diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config
index 603d491cc..889d60bfb 100644
--- a/webmin/mailboxes/config
+++ b/webmin/mailboxes/config
@@ -1,52 +1,52 @@
-noindex_hostname=0
-maildir_deleted=0
-vpopmail_dir=/home/vpopmail
 link_mode=0
-sync_delete=1
-show_body=0
-show_to=0
+auto=1
+perpage=20
 mailbox_user=.usermin/mailbox
+show_body=0
+sig_file=*
+html_quote=0
+open_mode=0
+sync_perms=0700
+no_orig_ip=0
+fwd_mode=0
 log_read=0
-view_html=0
+sync_create=0
+mail_style=0
 html_edit=0
+sync_delete=1
+noindex_hostname=0
+show_count=0
+sort_mode=1
+wrap_width=80
+date_fmt=dmy
+column_count=4
+arrows=1
+show_mail=0
 from_virtualmin=1
+mail_file=Mailbox
+ignore_users_enabled=0
+vpopmail_dir=/home/vpopmail
+top_buttons=2
+check_mod=1
+delete_warn=y
+spam_report=
 mail_usermin=mail
-auto=1
 show_unread=0
-mail_file=Mailbox
-sync_create=0
+spam_buttons=mail
 mail_system=3
-ignore_users=
-spam_report=
-check_mod=1
-top_buttons=2
 show_sent=0
-show_size_below=0
-mail_style=0
-column_count=4
-no_crlf=0
+no_mailer=0
 size_mode=1
-wrap_width=80
-fwd_mode=0
-show_size=1
+show_delall=0
+maildir_deleted=0
+no_crlf=0
+spam_del=0
+show_size_below=0
+show_to=0
 track_read=0
-spam_buttons=mail
-mail_dir=Maildir
-open_mode=0
-delete_warn=y
-no_mailer=0
+ignore_users=
 max_records=200
-perpage=20
-html_quote=0
-no_orig_ip=0
-sort_mode=1
-sync_perms=0700
-show_count=0
-spam_del=0
-arrows=1
-show_mail=0
-ignore_users_enabled=0
+show_size=1
 sync_modify=1
-date_fmt=dmy
-sig_file=*
-show_delall=0
+mail_dir=Maildir
+view_html=0
diff --git a/webmin/man/config b/webmin/man/config
index c9cb98fd5..3e4dbb0f6 100644
--- a/webmin/man/config
+++ b/webmin/man/config
@@ -1,9 +1,9 @@
-man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
-search_cmd=man -k PAGE
-man2html_path=man2html
 kernel_dir=/usr/src/linux/Documentation
 list_cmd=man -w PAGE
+search_cmd=man -k PAGE
 list_cmd_sect=man -w SECTION PAGE
-man_cmd=man PAGE
 doc_dir=/usr/share/doc
+man_cmd=man PAGE
+man2html_path=man2html
 man_cmd_sect=man SECTION PAGE
+man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index 41d5fb9e7..93a797c83 100644
--- a/webmin/miniserv.conf
+++ b/webmin/miniserv.conf
@@ -47,4 +47,4 @@ error_handler_404=404.cgi
 error_handler_401=401.cgi
 root=/usr/share/webmin
 mimetypes=/usr/share/webmin/mime.types
-server=MiniServ/1.970
+server=MiniServ/1.972
diff --git a/webmin/mon/config b/webmin/mon/config
index 236bd96e3..50f8a60b8 100644
--- a/webmin/mon/config
+++ b/webmin/mon/config
@@ -1,7 +1,7 @@
-monshow=/usr/bin/monshow
+start_cmd=/etc/init.d/mon start
 mon_cgi=/var/www/cgi-bin/mon.cgi
-pid_file=/var/run/mon.pid
 cfbasedir=/etc/mon
-start_cmd=/etc/init.d/mon start
 restart_cmd=/etc/init.d/mon restart
+monshow=/usr/bin/monshow
+pid_file=/var/run/mon.pid
 stop_cmd=/etc/init.d/mon stop
diff --git a/webmin/mount/config b/webmin/mount/config
index f8a41a882..c8933ba8a 100644
--- a/webmin/mount/config
+++ b/webmin/mount/config
@@ -1,10 +1,10 @@
-long_fstypes=1
+show_used=1
+auto_file=/etc/am-utils/amd.conf
 autofs_file=/etc/auto.master
 nfs_check=1
 sysinfo=1
-auto_file=/etc/am-utils/amd.conf
-show_used=1
+sort_mode=2
 nmblookup_path=nmblookup
-smbclient_path=smbclient
+long_fstypes=1
 fstab_file=/etc/fstab
-sort_mode=2
+smbclient_path=smbclient
diff --git a/webmin/mysql/config b/webmin/mysql/config
index c99062d3c..2ef027e87 100644
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -1,23 +1,23 @@
-date_subs=0
+mysql_libs=/usr/local/mysql/lib
+access=*: *
 mysqladmin=/usr/bin/mysqladmin
-mysqlshow=/usr/bin/mysqlshow
 max_text=1000
-mysql_data=/var/lib/mysql
-max_dbs=50
-access=*: *
-add_mode=1
-mysql_libs=/usr/local/mysql/lib
 my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
+mysqlshow=/usr/bin/mysqlshow
+login=root
+date_subs=0
+start_cmd=service mysql start
+nodbi=0
+webmin_subs=0
+perpage=25
+add_mode=1
+stop_cmd=service mysql stop
+mysqldump=/usr/bin/mysqldump
+blob_mode=0
 mysqlimport=/usr/bin/mysqlimport
-style=0
 mysql=/usr/bin/mysql
+style=0
+max_dbs=50
+mysql_data=/var/lib/mysql
 passwd_mode=0
-nodbi=0
-start_cmd=service mysql start
-login=root
-blob_mode=0
 nopwd=0
-stop_cmd=service mysql stop
-webmin_subs=0
-mysqldump=/usr/bin/mysqldump
-perpage=25
diff --git a/webmin/mysql/version b/webmin/mysql/version
index 85da24369..7ed0616f8 100644
--- a/webmin/mysql/version
+++ b/webmin/mysql/version
@@ -1 +1 @@
-8.0.22-0ubuntu0
+8.0.23-0ubuntu0
diff --git a/webmin/nis/config b/webmin/nis/config
index 27c816482..51b4fbca0 100644
--- a/webmin/nis/config
+++ b/webmin/nis/config
@@ -1,5 +1,5 @@
 max_size=100
-client_conf=/etc/yp.conf
+manual_build=0
 securenets=/etc/ypserv.securenets
 nsswitch_conf=/etc/nsswitch.conf
-manual_build=0
+client_conf=/etc/yp.conf
diff --git a/webmin/openslp/config b/webmin/openslp/config
index ceff8f2f3..2084e85ec 100644
--- a/webmin/openslp/config
+++ b/webmin/openslp/config
@@ -1,5 +1,5 @@
-slpd_conf=/etc/slp.conf
-slpd_reg=/etc/slp.reg
 slpd_log=/var/log/slpd.log
 slpd=/usr/sbin/slpd
 slpd_pid=/var/run/slpd.pid
+slpd_conf=/etc/slp.conf
+slpd_reg=/etc/slp.reg
diff --git a/webmin/package-updates/config b/webmin/package-updates/config
index 226c127d1..195d872e7 100644
--- a/webmin/package-updates/config
+++ b/webmin/package-updates/config
@@ -1,2 +1,2 @@
-cache_time=6
 update_multiple=1
+cache_time=6
diff --git a/webmin/pam/config b/webmin/pam/config
index bfa27bec4..4287bf606 100644
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
-pam_dir=/etc/pam.d
+lib_dirs=/lib/security /lib/*/security
 mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so
+pam_dir=/etc/pam.d
 ignore=README
-lib_dirs=/lib/security /lib/*/security
diff --git a/webmin/pap/config b/webmin/pap/config
index c71336d9d..79685d300 100644
--- a/webmin/pap/config
+++ b/webmin/pap/config
@@ -1,8 +1,8 @@
-login_config=/etc/mgetty+sendfax/login.config
 encrypt_pass=0
+serials=/dev/ttyS[0-9]*
+pppd=pppd
+dialin_config=/etc/mgetty+sendfax/dialin.config
 ppp_options=/etc/ppp/options
+login_config=/etc/mgetty+sendfax/login.config
 pap_file=/etc/ppp/pap-secrets
 mgetty=mgetty
-dialin_config=/etc/mgetty+sendfax/dialin.config
-serials=/dev/ttyS[0-9]*
-pppd=pppd
diff --git a/webmin/passwd/config b/webmin/passwd/config
index 02cf5b24f..1c1ed801d 100644
--- a/webmin/passwd/config
+++ b/webmin/passwd/config
@@ -1,3 +1,3 @@
 sort_mode=0
-input_type=0
 max_users=200
+input_type=0
diff --git a/webmin/postfix/config b/webmin/postfix/config
index 3ccd64ca8..b9f356822 100644
--- a/webmin/postfix/config
+++ b/webmin/postfix/config
@@ -1,29 +1,29 @@
-index_check=1
-show_cmts=0
+check_config=1
+postfix_config_command=/usr/sbin/postconf
+postfix_super_command=/usr/sbin/postsuper
+postfix_master=/etc/postfix/master.cf
+mailq_count=0
+fwd_mode=0
 columns=2
+ldap_doms=0
 delete_warn=1
-delete_confirm=1
-max_maps=100
+top_buttons=1
+perpage=20
 postcat_cmd=/usr/sbin/postcat
+index_check=1
+max_maps=100
+show_cmts=0
+max_records=200
 postfix_lookup_table_command=/usr/sbin/postmap
+mailq_cmd=postqueue -p
+postfix_aliases_table_command=/usr/sbin/postalias
+postfix_config_file=/etc/postfix/main.cf
 mailq_dir=/var/spool/postfix
-check_config=1
-fwd_mode=0
-wrap_width=80
 mailq_sort=0
-mailq_cmd=postqueue -p
-postfix_super_command=/usr/sbin/postsuper
+delete_confirm=1
 postfix_control_command=/usr/sbin/postfix
-postfix_master=/etc/postfix/master.cf
 prefix_cmts=0
 postfix_newaliases_command=/usr/bin/newaliases
-postfix_config_command=/usr/sbin/postconf
-ldap_doms=0
-postfix_aliases_table_command=/usr/sbin/postalias
-mailq_count=0
-top_buttons=1
-postfix_config_file=/etc/postfix/main.cf
-perpage=20
-max_records=200
-sort_mode=0
 postfix_queue_command=postqueue
+wrap_width=80
+sort_mode=0
diff --git a/webmin/postgresql/config b/webmin/postgresql/config
index ccf813b00..732f974fe 100644
--- a/webmin/postgresql/config
+++ b/webmin/postgresql/config
@@ -1,24 +1,24 @@
-max_text=1000
-dump_cmd=/usr/bin/pg_dump
-date_subs=0
-hba_conf=/etc/postgresql/*/main/pg_hba.conf
+simple_sched=0
 plib=
-add_mode=1
 access=*: *
-max_dbs=50
-blob_mode=0
-login=postgres
-nodbi=0
-rstr_cmd=/usr/bin/pg_restore
-start_cmd=/etc/init.d/postgresql* start
-access_own=0
-style=0
-pass=
+dump_cmd=/usr/bin/pg_dump
 perpage=25
-basedb=template1
+sameunix=1
 webmin_subs=0
+stop_cmd=/etc/init.d/postgresql* stop
+add_mode=1
 psql=/usr/bin/psql
-sameunix=1
+nodbi=0
+login=postgres
+max_dbs=50
+start_cmd=/etc/init.d/postgresql* start
+date_subs=0
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
+max_text=1000
+rstr_cmd=/usr/bin/pg_restore
+blob_mode=0
 pid_file=/var/run/postmaster.pid
-stop_cmd=/etc/init.d/postgresql* stop
-simple_sched=0
+basedb=template1
+pass=
+access_own=0
+style=0
diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config
index 7af13e89f..33a2029ee 100644
--- a/webmin/ppp-client/config
+++ b/webmin/ppp-client/config
@@ -1,3 +1,3 @@
-file=/etc/wvdial.conf
 wvdial=wvdial
+file=/etc/wvdial.conf
 wvdialconf=wvdialconf
diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config
index 24a51544b..5a8393949 100644
--- a/webmin/pptp-client/config
+++ b/webmin/pptp-client/config
@@ -1,5 +1,5 @@
 timeout=30
 pptp=pptp
-pap_file=/etc/ppp/chap-secrets
 peers_dir=/etc/ppp/peers
 pptp_options=/etc/ppp/options.pptp
+pap_file=/etc/ppp/chap-secrets
diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config
index 927f24917..7c7a4be15 100644
--- a/webmin/pptp-server/config
+++ b/webmin/pptp-server/config
@@ -1,9 +1,9 @@
-start_cmd=/etc/init.d/pptpd start
-log_file=/var/log/messages
-pap_file=/etc/ppp/chap-secrets
-ppp_options=/etc/ppp/options
 stop_cmd=/etc/init.d/pptpd stop
+log_file=/var/log/messages
 file=/etc/pptpd.conf
-pptpd=pptpd
 pid_file=/var/run/pptpd.pid
+ppp_options=/etc/ppp/options
+pptpd=pptpd
 pptp_ppp_options=/etc/ppp/pptpd-options
+pap_file=/etc/ppp/chap-secrets
+start_cmd=/etc/init.d/pptpd start
diff --git a/webmin/proc/config b/webmin/proc/config
index 44bdddc57..098b97543 100644
--- a/webmin/proc/config
+++ b/webmin/proc/config
@@ -1,6 +1,6 @@
-ps_style=linux
+hide_self=1
 cut_length=80
 base_ppid=1
+ps_style=linux
 trace_java=0
 default_mode=last
-hide_self=1
diff --git a/webmin/procmail/config b/webmin/procmail/config
index ff60bb0d1..71541070b 100644
--- a/webmin/procmail/config
+++ b/webmin/procmail/config
@@ -1,3 +1,3 @@
-procmailrc=/etc/procmailrc
-procmail=procmail
 includes=0
+procmail=procmail
+procmailrc=/etc/procmailrc
diff --git a/webmin/proftpd/config b/webmin/proftpd/config
index bfd0b30c6..6e591d68b 100644
--- a/webmin/proftpd/config
+++ b/webmin/proftpd/config
@@ -1,9 +1,9 @@
-stop_cmd=/etc/init.d/proftpd stop
-test_config=1
-pid_file=/var/run/proftpd.pid
-proftpd_conf=/etc/proftpd/proftpd.conf
-proftpd_path=/usr/sbin/proftpd
-test_manual=0
-ftpusers=/etc/ftpusers
 test_always=0
 start_cmd=/etc/init.d/proftpd start
+test_config=1
+ftpusers=/etc/ftpusers
+test_manual=0
+proftpd_path=/usr/sbin/proftpd
+stop_cmd=/etc/init.d/proftpd stop
+proftpd_conf=/etc/proftpd/proftpd.conf
+pid_file=/var/run/proftpd.pid
diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config
index bc7236b58..b0f16c6f7 100644
--- a/webmin/qmailadmin/config
+++ b/webmin/qmailadmin/config
@@ -1,14 +1,14 @@
-mail_file=Mailbox
-delete_warn=1
-mailq_sort=0
-columns=2
-mail_system=1
-fwd_mode=0
 qmail_dir=/var/qmail
 sort_mode=0
-index_min=1000000
-max_records=200
+columns=2
+mail_dir_qmail=Maildir
+delete_warn=1
+mailq_sort=0
 perpage=20
 mail_dir=
+mail_system=1
+index_min=1000000
 mailq_count=0
-mail_dir_qmail=Maildir
+mail_file=Mailbox
+fwd_mode=0
+max_records=200
diff --git a/webmin/quota/config b/webmin/quota/config
index 7f6dbfc1e..16511538b 100644
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
+group_quota_command=quota -v -g
+block_mode=1
+group_grace_command=edquota -g -t
+user_repquota_command=repquota -u -v
+user_quotaon_command=quotaon -u
+group_quotaon_command=quotaon -g
 user_edquota_command=edquota -u
-group_repquota_command=repquota -g -v
-email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the	allowed quota.		${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 user_copy_command=edquota -u -p
-user_setquota_command=setquota -u
-display_max=100
-pc_show=1
-quotacheck_command=quotacheck -u -g
 user_quotaoff_command=quotaoff -u
-group_grace_command=edquota -g -t
-user_grace_command=edquota -u -t
-group_quotaon_command=quotaon -g
-group_quota_command=quota -v -g
 group_edquota_command=edquota -g
-group_setquota_command=setquota -g
-hide_uids=0
+email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the	allowed quota.		${USED} of disk space is being used, out of a maximum of ${QUOTA}.
+group_quotaoff_command=quotaoff -g
+user_setquota_command=setquota -u
+quotacheck_command=quotacheck -u -g
 show_grace=1
-user_repquota_command=repquota -u -v
-user_quota_command=quota -v -u
-block_mode=1
-user_quotaon_command=quotaon -u
+group_repquota_command=repquota -g -v
 sort_mode=0
-group_copy_command=edquota -g -p
+group_setquota_command=setquota -g
+user_quota_command=quota -v -u
+display_max=100
 block_size=1024
-group_quotaoff_command=quotaoff -g
+user_grace_command=edquota -u -t
+group_copy_command=edquota -g -p
+pc_show=1
+hide_uids=0
diff --git a/webmin/raid/config b/webmin/raid/config
index 4bd2da90e..76eb03452 100644
--- a/webmin/raid/config
+++ b/webmin/raid/config
@@ -1,3 +1,3 @@
-mdstat=/proc/mdstat
-raidtab=/etc/raidtab
 mdadm=/etc/mdadm/mdadm.conf
+raidtab=/etc/raidtab
+mdstat=/proc/mdstat
diff --git a/webmin/samba/config b/webmin/samba/config
index 8894532e1..b18a90e39 100644
--- a/webmin/samba/config
+++ b/webmin/samba/config
@@ -1,18 +1,18 @@
-smb_passwd=/etc/samba/smbpasswd
+swat=/usr/sbin/swat
 smbgroupedit=/usr/bin/smbgroupedit
-text_lists=0
-start_cmd=service smbd start ; service nmbd start
 restart_cmd=service smbd restart ; service nmbd restart
-pdbedit=/usr/bin/pdbedit
-swat=/usr/sbin/swat
+smb_passwd=/etc/samba/smbpasswd
+samba_server=/usr/sbin/smbd
+net=/usr/bin/net
 run_from_inetd=0
-samba_password_program=/usr/bin/smbpasswd
-sort_mode=0
+text_lists=0
+start_cmd=service smbd start ; service nmbd start
 samba_status_program=/usr/bin/smbstatus
-dont_convert=-499
-smb_conf=/etc/samba/smb.conf
 name_server=/usr/sbin/nmbd
-list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
-samba_server=/usr/sbin/smbd
+dont_convert=-499
 stop_cmd=service smbd stop ; service nmbd stop
-net=/usr/bin/net
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+samba_password_program=/usr/bin/smbpasswd
+smb_conf=/etc/samba/smb.conf
+sort_mode=0
+pdbedit=/usr/bin/pdbedit
diff --git a/webmin/sarg/config b/webmin/sarg/config
index 0b89616c5..e572a9730 100644
--- a/webmin/sarg/config
+++ b/webmin/sarg/config
@@ -1,4 +1,4 @@
-naked=0
-clear=1
-sarg_conf=/etc/sarg/sarg.conf
 sarg=sarg
+sarg_conf=/etc/sarg/sarg.conf
+clear=1
+naked=0
diff --git a/webmin/sendmail/config b/webmin/sendmail/config
index b8ac25d44..616a9321d 100644
--- a/webmin/sendmail/config
+++ b/webmin/sendmail/config
@@ -1,30 +1,30 @@
-sendmail_features=/usr/share/sendmail/cf
-mail_file=mbox
-delete_confirm=1
+perpage=20
+top_buttons=1
 delete_warn=1
-order_mail=0
+sendmail_features=/usr/share/sendmail/cf
 columns=2
+sendmail_mc=/etc/mail/sendmail.mc
+sendmail_path=/usr/lib/sendmail
 smrsh_dir=/etc/smrsh
-show_cmts=0
-index_min=1000000
-wrap_width=80
 fwd_mode=0
-sendmail_pid=/var/run/sendmail/mta/sendmail.pid
-mail_dir=/var/spool/mail
-track_read=0
-show_to=0
-sendmail_mc=/etc/mail/sendmail.mc
-sendmail_cf=/etc/mail/sendmail.cf
-prefix_cmts=0
-mailq_sort=0
+mail_style=0
+mailq_count=0
 mailq_show=Date,From,To,Size,Status
-sendmail_command=/usr/lib/sendmail -bd -q1h
+mailq_sort=0
 sort_mode=0
+wrap_width=80
+prefix_cmts=0
+order_mail=0
+delete_confirm=1
 max_records=200
-perpage=20
-mail_style=0
-sendmail_path=/usr/lib/sendmail
-top_buttons=1
-mailq_count=0
+show_cmts=0
+sendmail_command=/usr/lib/sendmail -bd -q1h
+show_to=0
+track_read=0
 mail_type=0
+sendmail_pid=/var/run/sendmail/mta/sendmail.pid
+mail_file=mbox
 makemap_path=makemap
+sendmail_cf=/etc/mail/sendmail.cf
+index_min=1000000
+mail_dir=/var/spool/mail
diff --git a/webmin/servers/config b/webmin/servers/config
index 610a8a8da..f5250dffe 100644
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
-scan_time=5
+resolve=1
+display_mode=0
+deflink=0
+sort_mode=0
+deffast=2
+show_ip=0
 max_servers=100
 show_status=1
-deffast=2
 groups_dir=/etc/cluster/groups
-show_ip=0
-resolve=1
-sort_mode=0
 capath=/usr/share/ca-certificates
-display_mode=0
-deflink=0
+scan_time=5
diff --git a/webmin/shell/config b/webmin/shell/config
index 42aceaa41..af7728831 100644
--- a/webmin/shell/config
+++ b/webmin/shell/config
@@ -1,3 +1,3 @@
-clear_envs=0
 max_runtime=86400
+clear_envs=0
 max_output=100000
diff --git a/webmin/shorewall/config b/webmin/shorewall/config
index 5980d830f..5da058a58 100644
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
-actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
 config_dir=/etc/shorewall
-macros=/usr/share/shorewall
 display_zone_descriptions=1
+actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
+macros=/usr/share/shorewall
 shorewall=shorewall
diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config
index f253e44a0..a04080f0a 100644
--- a/webmin/shorewall6/config
+++ b/webmin/shorewall6/config
@@ -1,5 +1,5 @@
-display_zone_descriptions=1
-macros=/usr/share/shorewall6
-config_dir=/etc/shorewall6
 shorewall6=shorewall6
+macros=/usr/share/shorewall6
 actions=/etc/shorewall6/actions	/usr/share/shorewall6/actions.std
+config_dir=/etc/shorewall6
+display_zone_descriptions=1
diff --git a/webmin/smart-status/config b/webmin/smart-status/config
index f4c63c585..8da23caa9 100644
--- a/webmin/smart-status/config
+++ b/webmin/smart-status/config
@@ -1,4 +1,4 @@
-ata=0
 smartctl=smartctl
-mode=1
 attribs=1
+ata=0
+mode=1
diff --git a/webmin/software/config b/webmin/software/config
index facec37dd..037d899f3 100644
--- a/webmin/software/config
+++ b/webmin/software/config
@@ -1,3 +1,3 @@
-package_system=debian
-apt_mode=0
 update_system=apt
+apt_mode=0
+package_system=debian
diff --git a/webmin/spam/config b/webmin/spam/config
index 42d68db22..0267c7bc4 100644
--- a/webmin/spam/config
+++ b/webmin/spam/config
@@ -1,12 +1,12 @@
 sa_learn=sa-learn
+warn_procmail=1
+local_cf=/etc/spamassassin/local.cf
+spamassassin=spamassassin
+procmailrc=/etc/procmailrc
 call_spam=1
 addto=0
+mode=0
+restart_cmd=/etc/init.d/spamassassin restart
 processes=spamd amavisd
-warn_procmail=1
 procmail_cmd=*
-restart_cmd=/etc/init.d/spamassassin restart
-procmailrc=/etc/procmailrc
-mode=0
-local_cf=/etc/spamassassin/local.cf
 max_awl=200
-spamassassin=spamassassin
diff --git a/webmin/squid/config b/webmin/squid/config
index 2121d422c..85c025f7a 100644
--- a/webmin/squid/config
+++ b/webmin/squid/config
@@ -1,21 +1,21 @@
-cal_all=1
-cal_args=-aw
-log_dir=/var/log/squid
-restart_pos=0
-sync_create=0
-calamaris=calamaris
-cache_dir=/var/spool/squid
-squidclient=squidclient
-cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
-sync_modify=1
 squid_stop=service squid stop
 pid_file=/var/run/squid.pid
+cal_args=-aw
+sort_conf=0
+cache_dir=/var/spool/squid
+cal_all=1
 sync_delete=0
-squid_conf=/etc/squid/squid.conf
-squid_path=squid
 crypt_conf=0
-cal_max=50000
-sort_conf=0
 cal_fmt=w
+squid_conf=/etc/squid/squid.conf
+sync_create=0
 squid_start=service squid start
+sync_modify=1
+cal_max=50000
+cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
 squid_restart=service squid reload
+calamaris=calamaris
+squid_path=squid
+log_dir=/var/log/squid
+restart_pos=0
+squidclient=squidclient
diff --git a/webmin/sshd/config b/webmin/sshd/config
index 4383c82cc..6c46efb78 100644
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,11 +1,11 @@
-sync_pass=0
-keygen_path=/usr/bin/ssh-keygen
 client_config=/etc/ssh/ssh_config
-sshd_path=/usr/sbin/sshd
 stop_cmd=service ssh stop
-pid_file=/var/run/sshd.pid
-start_cmd=service ssh start
 sshd_config=/etc/ssh/sshd_config
 sync_gnupg=0
-sync_create=0
 sync_auth=1
+keygen_path=/usr/bin/ssh-keygen
+pid_file=/var/run/sshd.pid
+sync_pass=0
+sshd_path=/usr/sbin/sshd
+start_cmd=service ssh start
+sync_create=0
diff --git a/webmin/status/config b/webmin/status/config
index 62f8adbd5..a4e800fb3 100644
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,13 +1,13 @@
+pager_cmd=sms_client
 index_status=1
-sort_mode=0
+snmp_trap=1.3.6.1.4.1.10000.1.1
 sysinfo_users=0
-history_show=50
-sched_offset=0
-history_purge=30
-subject_mode=0
 output=0
-sysinfo=0
-snmp_trap=1.3.6.1.4.1.10000.1.1
-pager_cmd=sms_client
-columns=2
 snmp_version=2
+sched_offset=0
+columns=2
+history_show=50
+sysinfo=0
+sort_mode=0
+subject_mode=0
+history_purge=30
diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config
index d2eeada17..6b4b7b5f1 100644
--- a/webmin/syslog-ng/config
+++ b/webmin/syslog-ng/config
@@ -1,7 +1,7 @@
-compressed=1
-syslogng_cmd=syslog-ng
-syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 pid_file=/var/run/syslog-ng.pid
-lines=20
-start_cmd=/etc/init.d/syslog-ng start
+syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 stop_cmd=/etc/init.d/syslog-ng stop
+start_cmd=/etc/init.d/syslog-ng start
+syslogng_cmd=syslog-ng
+lines=20
+compressed=1
diff --git a/webmin/syslog/config b/webmin/syslog/config
index 15606bfc3..01a1f651b 100644
--- a/webmin/syslog/config
+++ b/webmin/syslog/config
@@ -1,19 +1,19 @@
-syslog_conf=/etc/rsyslog.conf
-sync=1
+pri_dir=1
+facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
 pipe=1
+m4_conf=0
 signal_cmd=/usr/sbin/service rsyslog restart
-tags=0
-others=1
 restart_cmd=/usr/sbin/service rsyslog restart
+pid_file=/var/run/rsyslogd.pid
 syslogd=/usr/sbin/rsyslogd
+m4_path=
+pri_all=1
+tags=0
 start_cmd=/usr/sbin/service rsyslog start
+syslog_conf=/etc/rsyslog.conf
+others=1
 socket=0
-m4_path=
+sync=1
 compressed=1
-m4_conf=0
-lines=20
 reverse=0
-pid_file=/var/run/rsyslogd.pid
-pri_dir=1
-pri_all=1
-facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
+lines=20
diff --git a/webmin/system-status/config b/webmin/system-status/config
index c627a9fec..b6a7e4155 100644
--- a/webmin/system-status/config
+++ b/webmin/system-status/config
@@ -1,2 +1,2 @@
-collect_pkgs=1
 collect_interval=5
+collect_pkgs=1
diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config
index 10eceba4d..ddc301405 100644
--- a/webmin/tcpwrappers/config
+++ b/webmin/tcpwrappers/config
@@ -1,3 +1,3 @@
-hosts_deny=/etc/hosts.deny
 hosts_allow=/etc/hosts.allow
 inetd_services=0
+hosts_deny=/etc/hosts.deny
diff --git a/webmin/telnet/config b/webmin/telnet/config
index a9d4fc375..15a13d538 100644
--- a/webmin/telnet/config
+++ b/webmin/telnet/config
@@ -1,5 +1,5 @@
+no_test=0
 proxy=0
 sizemode=0
-no_test=0
 detach=0
 mode=1
diff --git a/webmin/time/config b/webmin/time/config
index ba693e15b..92f68fae6 100644
--- a/webmin/time/config
+++ b/webmin/time/config
@@ -1,6 +1,6 @@
-lease=5
+timeserver_hardware=1
+zone_style=linux
 ntp_only=1
 timeserver=0.pool.ntp.org
-zone_style=linux
-timeserver_hardware=1
+lease=5
 seconds=1
diff --git a/webmin/updown/config b/webmin/updown/config
index 2d7e2b876..aba856c09 100644
--- a/webmin/updown/config
+++ b/webmin/updown/config
@@ -1,4 +1,4 @@
-user=root
 ddir=/
 duser=root
 dir=/
+user=root
diff --git a/webmin/useradmin/config b/webmin/useradmin/config
index 347639dd4..a7d884149 100644
--- a/webmin/useradmin/config
+++ b/webmin/useradmin/config
@@ -1,41 +1,41 @@
-default_group=users
-passwd_dict=0
 homedir_perms=0755
-home_base=/home
-sort_mode=0
+gid_mode=1
+new_user_group=0
+default_group=users
 membox=0
 delete_only=0
-selinux_con=user_u:object_r:user_home_dir_t
-base_gid=1000
-home_style=0
+uid_mode=1
 passwd_same=0
-uid_calc=0
-alias_check=0
+selinux_con=user_u:object_r:user_home_dir_t
+random_password=0
 user_files=/etc/skel
-uid_mode=1
-skip_md5=0
-base_uid=1000
+passwd_stars=0
+email_type=0
 gshadow_file=/etc/gshadow
-lock_string=*
-gid_calc=0
 md5=1
-shadow_file=/etc/shadow
-display_max=400
+new_user_gid=0
+home_base=/home
+home_style=0
 passwd_file=/etc/passwd
+default_other=1
+shells=fixed,passwd,shells
 display_mode=1
-empty_mode=0
-gid_mode=1
-passwd_progmode=0
+base_uid=1000
 group_file=/etc/group
+skip_md5=0
+display_max=400
+base_gid=1000
+alias_check=0
+secmode=0
 delete_root=0
-new_user_group=0
-default_other=1
-random_password=0
-passwd_stars=0
-new_user_gid=0
+extra_real=0
 last_show=0
-secmode=0
 from_files=0
-shells=fixed,passwd,shells
-email_type=0
-extra_real=0
+uid_calc=0
+sort_mode=0
+passwd_progmode=0
+gid_calc=0
+shadow_file=/etc/shadow
+passwd_dict=0
+lock_string=*
+empty_mode=0
diff --git a/webmin/usermin/config b/webmin/usermin/config
index e4c583b96..cc127b695 100644
--- a/webmin/usermin/config
+++ b/webmin/usermin/config
@@ -1,7 +1,7 @@
-update=0
 upshow=1
-uphour=4
 cron_mode=0
-updays=1
-upmissing=0
 usermin_dir=/etc/usermin
+update=0
+upmissing=0
+updays=1
+uphour=4
diff --git a/webmin/version b/webmin/version
index 84ad446c9..00c94413f 100644
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.970
+1.972
diff --git a/webmin/webalizer/config b/webmin/webalizer/config
index 047829112..259e50467 100644
--- a/webmin/webalizer/config
+++ b/webmin/webalizer/config
@@ -1,6 +1,6 @@
+naked=0
 alt_conf=/etc/webalizer/webalizer.conf.sample
-webalizer=/usr/bin/webalizer
 skip_old=0
-auto=apache,squid,proftpd,wuftpd
+webalizer=/usr/bin/webalizer
 webalizer_conf=/etc/webalizer/webalizer.conf
-naked=0
+auto=apache,squid,proftpd,wuftpd
diff --git a/webmin/webmin/config b/webmin/webmin/config
index 7de4b9733..13feb36a4 100644
--- a/webmin/webmin/config
+++ b/webmin/webmin/config
@@ -1,12 +1,12 @@
-update=0
-uphour=23
 cron_mode=0
-upmins=47
-upmissing=0
-letsencrypt_dns_wait=10
-last_version_number=1.900
-upshow=1
 last_version_check=1549050668
-updays=1
+upshow=1
+letsencrypt_dns_wait=10
 warn_days=7
 osdn=1
+uphour=23
+upmins=47
+updays=1
+upmissing=0
+last_version_number=1.900
+update=0
diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config
index f89453ddb..c1c69aaa3 100644
--- a/webmin/wuftpd/config
+++ b/webmin/wuftpd/config
@@ -1,8 +1,8 @@
-ftpusers=/etc/wu-ftpd/ftpusers
-ftpgroups=/etc/wu-ftpd/ftpgroups
-ftpconversions=/etc/wu-ftpd/ftpconversions
 ftphosts=/etc/wu-ftpd/ftphosts
-ftpd_path=/usr/sbin/wu-ftpd
+pid_file=/var/run/ftpd.pids-all
 log_file=/var/log/xferlog
+ftpconversions=/etc/wu-ftpd/ftpconversions
+ftpgroups=/etc/wu-ftpd/ftpgroups
+ftpusers=/etc/wu-ftpd/ftpusers
 ftpaccess=/etc/wu-ftpd/ftpaccess
-pid_file=/var/run/ftpd.pids-all
+ftpd_path=/usr/sbin/wu-ftpd
diff --git a/webmin/xinetd/config b/webmin/xinetd/config
index 14054cfe7..bcac73097 100644
--- a/webmin/xinetd/config
+++ b/webmin/xinetd/config
@@ -1,5 +1,5 @@
 start_cmd=/etc/init.d/xinetd start
+pid_file=/var/run/xinetd.pid
 protocols_file=/etc/protocols
 lookup_servs=1
-pid_file=/var/run/xinetd.pid
 xinetd_conf=/etc/xinetd.conf