From: mhoellein <mario@hoellein.online>
Date: Mon, 23 Aug 2021 05:37:13 +0000 (+0200)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=e18c9c33fe9e8124e0746bea342d5cb775809c3c;p=vserver

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

Package changes:
-webmin 1.979 all
+webmin 1.980 all
---

diff --git a/.etckeeper b/.etckeeper
index 27c6d908e..b411da8b2 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1582,6 +1582,7 @@ maybe chmod 0755 'ldap/schema'
 maybe chmod 0644 'ldap/schema/amavis.schema'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
+maybe chmod 0600 'letsencrypt/.certbot.lock'
 maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt'
 maybe chmod 0700 'letsencrypt/accounts'
 maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'
diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
new file mode 100644
index 000000000..e69de29bb
diff --git a/webmin/acl/config b/webmin/acl/config
index 017dd0405..e5e83c2ab 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
diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config
index fd5b932c3..1dcf20e9c 100644
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
+pppoe_conf=/etc/ppp/pppoe.conf
 pppoe_cmd=pppoe
+conf_style=0
 stop_cmd=adsl-stop
-start_cmd=adsl-start
 status_cmd=adsl-status
-conf_style=0
+start_cmd=adsl-start
 pap_file=/etc/ppp/pap-secrets
-pppoe_conf=/etc/ppp/pppoe.conf
diff --git a/webmin/apache/config b/webmin/apache/config
index 87d7b9740..9681861bf 100644
--- a/webmin/apache/config
+++ b/webmin/apache/config
@@ -1,24 +1,24 @@
-test_config=1
+show_names=0
+show_list=0
+virt_file=/etc/apache2/sites-available
+test_always=0
+defines_file=/etc/apache2/envvars
+apachectl_path=/usr/sbin/apache2ctl
 apply_cmd=/usr/sbin/apache2ctl graceful
-test_apachectl=1
 test_manual=0
-virt_file=/etc/apache2/sites-available
-show_list=0
-defines_name=APACHE_ARGUMENTS
-max_servers=100
 mime_types=/etc/apache2/mime.types
-auto_mods=1
-defines_file=/etc/apache2/envvars
-httpd_dir=/etc/apache2
-stop_cmd=/etc/init.d/apache2 stop
 link_dir=/etc/apache2/sites-enabled
+stop_cmd=/etc/init.d/apache2 stop
+httpd_path=/usr/sbin/apache2
 start_cmd=/etc/init.d/apache2 start
-access_conf=/etc/apache2/access.conf
+test_apachectl=1
+auto_mods=1
+test_config=1
+max_servers=100
 show_order=0
-httpd_conf=/etc/apache2/apache2.conf
+httpd_dir=/etc/apache2
+access_conf=/etc/apache2/access.conf
 srm_conf=/etc/apache2/srm.conf
-apachectl_path=/usr/sbin/apache2ctl
-httpd_path=/usr/sbin/apache2
-show_names=0
+httpd_conf=/etc/apache2/apache2.conf
+defines_name=APACHE_ARGUMENTS
 allow_virtualmin=0
-test_always=0
diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info
index 37e584aae..7ca364d51 100644
--- a/webmin/apache/httpd-info
+++ b/webmin/apache/httpd-info
@@ -1,4 +1,4 @@
-time=1623136011
+time=1625166968
 cmd=/usr/sbin/apache2
 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
 version=2.448
diff --git a/webmin/at/config b/webmin/at/config
index abf2f6455..6f83c111c 100644
--- a/webmin/at/config
+++ b/webmin/at/config
@@ -1,2 +1,2 @@
-at_dir=/var/spool/cron/atjobs
 at_style=linux
+at_dir=/var/spool/cron/atjobs
diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config
index 264c5e47e..b72a43f26 100644
--- a/webmin/bacula-backup/config
+++ b/webmin/bacula-backup/config
@@ -1,12 +1,12 @@
+wait=1
+user=bacula
 init_start=0
-showdirs=0
+driver=Pg
+bextract=bextract
 bacula_dir=/etc/bacula
 pass=
-driver=Pg
-apply=1
-user=bacula
 btape=btape
-wait=1
 bls=bls
+showdirs=0
+apply=1
 db=bacula
-bextract=bextract
diff --git a/webmin/bind8/config b/webmin/bind8/config
index 57386ecc0..a687d022e 100644
--- a/webmin/bind8/config
+++ b/webmin/bind8/config
@@ -1,46 +1,46 @@
-rev_must=0
-named_conf=/etc/bind/named.conf
-confirm_zone=1
-other_slaves=1
-support_aaaa=1
-rndc_cmd=rndc
-named_path=/usr/sbin/named
-ipv6_mode=1
-show_list=0
-rndcconf_cmd=rndc-confgen
-checkconf=named-checkconf
-allow_underscore=1
-whois_cmd=whois
-forwardzonefilename_format=ZONE.hosts
-max_zones=50
-reversezonefilename_format=ZONE.rev
-updserial_man=1
+checkzone=named-checkzone
 master_dir=/var/lib/bind
 pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
-no_chroot=0
-confirm_rec=0
-spf_record=0
-updserial_def=0
 zones_file=/etc/bind/named.conf.local
-updserial_on=1
-force_random=0
-signzone=dnssec-signzone
-allow_wild=1
+rndc_cmd=rndc
 no_pid_chroot=0
-rev_def=0
-checkzone=named-checkzone
-ndc_cmd=ndc
+allow_underscore=1
+force_random=0
+checkconf=named-checkconf
 soa_style=0
 largezones=0
-allow_comments=0
-keygen=dnssec-keygen
-short_names=0
+forwardzonefilename_format=ZONE.hosts
+rndc_conf=/etc/bind/rndc.conf
+rev_must=0
+show_list=0
+signzone=dnssec-signzone
+allow_long=0
+by_view=0
+updserial_on=1
+rev_def=0
+ipv6_mode=1
+whois_cmd=whois
+max_zones=50
+confirm_rec=0
 relative_paths=0
+named_path=/usr/sbin/named
+allow_wild=1
+keygen=dnssec-keygen
+spf_record=0
+allow_comments=0
+updserial_def=0
+named_conf=/etc/bind/named.conf
+other_slaves=1
+rndcconf_cmd=rndc-confgen
 soa_start=0
 master_ttl=1
-rndc_conf=/etc/bind/rndc.conf
 dnssec_info=1
-allow_long=0
-records_order=0
+ndc_cmd=ndc
+reversezonefilename_format=ZONE.rev
+short_names=0
+updserial_man=1
+confirm_zone=1
 slave_dir=/var/lib/bind
-by_view=0
+no_chroot=0
+records_order=0
+support_aaaa=1
diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config
index 04110de95..2ab4c6af1 100644
--- a/webmin/cluster-passwd/config
+++ b/webmin/cluster-passwd/config
@@ -1,3 +1,3 @@
-max_users=200
 input_type=0
 sort_mode=0
+max_users=200
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 67c3e504f..0ff36670f 100644
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
-sort_mode=0
-conf_find_group=1
-conf_find_user=1
 conf_add_group=1
 conf_host_links=1
-conf_add_user=1
-conf_allow_sync=1
+sort_mode=0
 conf_allow_refresh=1
+conf_allow_sync=1
+conf_find_group=1
+conf_find_user=1
 table_mode=0
+conf_add_user=1
diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config
index fd788cb1e..470eaee86 100644
--- a/webmin/cluster-webmin/config
+++ b/webmin/cluster-webmin/config
@@ -1,2 +1,2 @@
-table_mode=0
 sort_mode=0
+table_mode=0
diff --git a/webmin/config b/webmin/config
index 9c1c9a30e..192e51b5e 100644
--- a/webmin/config
+++ b/webmin/config
@@ -1,32 +1,32 @@
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-real_os_version=18.04.1
-os_version=9.0
-lang=en.UTF-8
-tempdelete_days=7
-real_os_type=Ubuntu Linux
-webprefix=
-help_width=
-feedback_to=
 nofeedbackcc=0
+showlogin=0
+passwd_file=/etc/shadow
 product=webmin
-md5pass=1
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-passwd_mindex=4
-showhost=0
+feedback_to=
 by_view=0
-passwd_uindex=0
-ld_env=LD_LIBRARY_PATH
-sysinfo=0
+os_type=debian-linux
+tempdelete_days=7
+webprefix=
+showhost=0
 theme=authentic-theme
-passwd_file=/etc/shadow
-hostnamedisplay=
-lang_root=de.UTF-8
-passwd_cindex=2
-referers_none=1
-showlogin=0
 hostnamemode=0
-help_height=
-os_type=debian-linux
-passwd_pindex=1
 dateformat=dd/mon/yyyy
+lang_root=de.UTF-8
+sysinfo=0
+lang=en.UTF-8
+hostnamedisplay=
+ld_env=LD_LIBRARY_PATH
+help_height=
+real_os_version=18.04.1
+passwd_mindex=4
+real_os_type=Ubuntu Linux
 log=1
+passwd_uindex=0
+passwd_cindex=2
+passwd_pindex=1
+os_version=9.0
+md5pass=1
+help_width=
+referers_none=1
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
diff --git a/webmin/cpan/config b/webmin/cpan/config
index 54f5a54c3..3a86c158d 100644
--- a/webmin/cpan/config
+++ b/webmin/cpan/config
@@ -1,6 +1,6 @@
+incpackages=1
+refresh_days=30
 incyum=1
 packages=http://www.cpan.org/modules/02packages.details.txt.gz
-cpan=http://www.cpan.org/authors/id
-incpackages=1
 save_partial=0
-refresh_days=30
+cpan=http://www.cpan.org/authors/id
diff --git a/webmin/cron/config b/webmin/cron/config
index 3fec1d948..bd3099aca 100644
--- a/webmin/cron/config
+++ b/webmin/cron/config
@@ -1,25 +1,25 @@
-cron_delete_command=crontab -u USER -r
-match_mode=0
-run_parts=run-parts
-cron_user_edit_command=crontab -e
-system_crontab=/etc/crontab
 cron_allow_file=/var/spool/cron/allow
+cron_dir=/var/spool/cron/crontabs
 vixie_cron=1
+system_crontab=/etc/crontab
+show_run=0
+show_next=0
+cron_user_edit_command=crontab -e
+cron_user_get_command=crontab -l
 cron_deny_file=/var/spool/cron/deny
-cronfiles_dir=/etc/cron.d
-max_len=80
-cron_input=1
-match_user=1
 max_jobs=100
-hourly_only=0
-cron_deny_all=2
+cron_get_command=crontab -u USER -l
+cron_input=1
+kill_subs=0
+cron_edit_command=crontab -u USER -e
 show_time=0
+cron_deny_all=2
+hourly_only=0
+match_mode=0
+match_user=1
+cronfiles_dir=/etc/cron.d
 cron_user_delete_command=crontab -r
-show_next=0
-cron_user_get_command=crontab -l
+cron_delete_command=crontab -u USER -r
 show_comment=0
-show_run=0
-cron_dir=/var/spool/cron/crontabs
-cron_get_command=crontab -u USER -l
-cron_edit_command=crontab -u USER -e
-kill_subs=0
+run_parts=run-parts
+max_len=80
diff --git a/webmin/custom/config b/webmin/custom/config
index 55a8becd6..e04c3678d 100644
--- a/webmin/custom/config
+++ b/webmin/custom/config
@@ -1,4 +1,4 @@
-columns=2
 params_file=0
 display_mode=0
 params_cmd=0
+columns=2
diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index 54654dad5..0dcd06b2c 100644
--- a/webmin/dhcpd/config
+++ b/webmin/dhcpd/config
@@ -1,17 +1,17 @@
+pid_file=/var/run/dhcpd.pid
+interfaces_type=debian
+dhcpd_path=/usr/sbin/dhcpd
+lease_tz=0
 show_mac=0
-lease_sort=0
-dhcpd_nocols=5
+lease_vendor=0
 desc_name=0
-lease_tz=0
-display_max=100
+lease_file=/var/lib/dhcp/dhcpd.leases
 restart_cmd=service isc-dhcp-server restart
+group_name=0
 show_ip=0
-lease_vendor=0
-interfaces_type=debian
+lease_sort=0
 dhcpd_conf=/etc/dhcp/dhcpd.conf
-stop_cmd=service isc-dhcp-server stop
-lease_file=/var/lib/dhcp/dhcpd.leases
+display_max=100
+dhcpd_nocols=5
 start_cmd=service isc-dhcp-server start
-pid_file=/var/run/dhcpd.pid
-dhcpd_path=/usr/sbin/dhcpd
-group_name=0
+stop_cmd=service isc-dhcp-server stop
diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index 106ee6dbb..2c130e983 100644
--- a/webmin/dovecot/config
+++ b/webmin/dovecot/config
@@ -1,4 +1,4 @@
-init_script=dovecot
-dovecot_config=/etc/dovecot/dovecot.conf
 pid_file=/var/run/dovecot/master.pid
 dovecot=/usr/sbin/dovecot
+init_script=dovecot
+dovecot_config=/etc/dovecot/dovecot.conf
diff --git a/webmin/exim/config b/webmin/exim/config
index 7615024b8..6dfd501de 100644
--- a/webmin/exim/config
+++ b/webmin/exim/config
@@ -1,8 +1,8 @@
-exim_virt_dir=/etc/exim4/aliases
-exim_dbmext=.dbm
+exim_addrfile=/etc/exim4/email-addresses
 exim_dbmfile=/etc/exim4/local_domains
+exim_dbmext=.dbm
+exim_virt_dir=/etc/exim4/aliases
+exim_mail_file=Maildir
 exim_aliasfileext=
 mail_system=1
 exim_dir=/etc/exim4
-exim_mail_file=Maildir
-exim_addrfile=/etc/exim4/email-addresses
diff --git a/webmin/exports/config b/webmin/exports/config
index 8f8b567ee..b8864bec5 100644
--- a/webmin/exports/config
+++ b/webmin/exports/config
@@ -1,3 +1,3 @@
 exports_file=/etc/exports
-apply_cmd=exportfs -r
 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
+apply_cmd=exportfs -r
diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config
index d058f9824..73862c6ef 100644
--- a/webmin/fail2ban/config
+++ b/webmin/fail2ban/config
@@ -1,4 +1,4 @@
 server_cmd=/usr/bin/fail2ban-server
+client_cmd=/usr/bin/fail2ban-client
 config_dir=/etc/fail2ban
 init_script=fail2ban
-client_cmd=/usr/bin/fail2ban-client
diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config
index c20ad8cc1..90ee56a38 100644
--- a/webmin/fetchmail/config
+++ b/webmin/fetchmail/config
@@ -1,6 +1,6 @@
-max_users=400
-daemon_user=root
+fetchmail_path=fetchmail
 view_mode=0
 config_file=
-fetchmail_path=fetchmail
 pid_file=/var/run/fetchmail.pid
+max_users=400
+daemon_user=root
diff --git a/webmin/filter/config b/webmin/filter/config
index 946703895..7bbb6217e 100644
--- a/webmin/filter/config
+++ b/webmin/filter/config
@@ -1,6 +1,6 @@
 warn_procmail=1
-virtualmin_config=/etc/webmin/virtual-server
-virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
 forward_procmail=0
 reply_force=0
+virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
+virtualmin_config=/etc/webmin/virtual-server
 alias_files=/etc/aliases	/etc/postfix/aliases	/etc/mail/aliases
diff --git a/webmin/firewall/config b/webmin/firewall/config
index c7a2d7d24..57c4e83b8 100644
--- a/webmin/firewall/config
+++ b/webmin/firewall/config
@@ -1,6 +1,6 @@
-comment_mod=0
-view_comment=0
-cluster_mode=1
 direct=0
 force_init=0
 view_condition=1
+cluster_mode=1
+view_comment=0
+comment_mod=0
diff --git a/webmin/firewall6/config b/webmin/firewall6/config
index 3f182ff0a..06fb63d1d 100644
--- a/webmin/firewall6/config
+++ b/webmin/firewall6/config
@@ -1,6 +1,6 @@
-view_comment=0
 cluster_mode=1
-comment_mod=0
+view_condition=1
 direct=0
 force_init=0
-view_condition=1
+comment_mod=0
+view_comment=0
diff --git a/webmin/firewalld/config b/webmin/firewalld/config
index 0aae64fac..ff329a00d 100644
--- a/webmin/firewalld/config
+++ b/webmin/firewalld/config
@@ -1,2 +1,2 @@
-init_name=firewalld
 firewall_cmd=firewall-cmd
+init_name=firewalld
diff --git a/webmin/fsdump/config b/webmin/fsdump/config
index 6f0f9254c..1387f5ef0 100644
--- a/webmin/fsdump/config
+++ b/webmin/fsdump/config
@@ -1,7 +1,7 @@
-nonewtape=0
 date_subs=0
-always_tar=0
-run_mode=0
-simple_sched=0
 error_email=0
+nonewtape=0
 webmin_subs=0
+always_tar=0
+simple_sched=0
+run_mode=0
diff --git a/webmin/grub/config b/webmin/grub/config
index f6464eb2a..084704907 100644
--- a/webmin/grub/config
+++ b/webmin/grub/config
@@ -1,3 +1,3 @@
 install=(hd0)
-grub_path=grub
 menu_file=/boot/grub/menu.lst
+grub_path=grub
diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config
index defab373e..026860a28 100644
--- a/webmin/heartbeat/config
+++ b/webmin/heartbeat/config
@@ -1,15 +1,15 @@
-alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
-apply_cmd=/etc/init.d/heartbeat reload
 authkeys=
+ha_dir=/etc/ha.d
 resource_d=
 serials=/dev/ttyS*
-req_resource_cmd=/usr/lib/heartbeat/req_resource
-heartbeat=/usr/lib/heartbeat/heartbeat
-ha_cf=
+alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
+pid_file=/var/run/heartbeat.pid
+apply_cmd=/etc/init.d/heartbeat reload
+alt_haresources=/usr/share/doc/packages/heartbeat/haresources
 stop_cmd=/etc/init.d/heartbeat stop
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
 haresources=
-alt_haresources=/usr/share/doc/packages/heartbeat/haresources
-ha_dir=/etc/ha.d
-pid_file=/var/run/heartbeat.pid
+heartbeat=/usr/lib/heartbeat/heartbeat
 start_cmd=/etc/init.d/heartbeat start
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+req_resource_cmd=/usr/lib/heartbeat/req_resource
+ha_cf=
diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config
index 7907b3f7f..878c6bb88 100644
--- a/webmin/htaccess-htpasswd/config
+++ b/webmin/htaccess-htpasswd/config
@@ -1,8 +1,8 @@
-htgroups=.htgroups
 htaccess=.htaccess
-digest=1
-md5=1
-sha1=0
 sort=0
 extra_directives=
+sha1=0
 htpasswd=.htpasswd
+htgroups=.htgroups
+md5=1
+digest=1
diff --git a/webmin/idmapd/config b/webmin/idmapd/config
index d6cd4227f..f25eeba97 100644
--- a/webmin/idmapd/config
+++ b/webmin/idmapd/config
@@ -1,3 +1,3 @@
-idmapd_conf=/etc/idmapd.conf
 restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
+idmapd_conf=/etc/idmapd.conf
 idmapd_path=/usr/sbin/rpc.idmapd
diff --git a/webmin/inetd/config b/webmin/inetd/config
index e8d1d75fa..b4e3b0583 100644
--- a/webmin/inetd/config
+++ b/webmin/inetd/config
@@ -1,16 +1,16 @@
-show_empty=1
+ipv6=0
+extended_inetd=1
+deny_file=/etc/hosts.deny
+rpc_inetd=1
 protocols_file=/etc/protocols
-services_file=/etc/services
 allow_file=/etc/hosts.allow
-ipv6=0
-sort_mode=0
+show_empty=1
+restart_command=killall -HUP inetd
 display_max=100
-extended_inetd=1
-inetd_conf_file=/etc/inetd.conf
 tcpd_path=/usr/sbin/tcpd
-rpc_inetd=1
+qm_mode=0
+sort_mode=0
 rpc_protocols=tcp udp
 rpc_file=/etc/rpc
-restart_command=killall -HUP inetd
-deny_file=/etc/hosts.deny
-qm_mode=0
+services_file=/etc/services
+inetd_conf_file=/etc/inetd.conf
diff --git a/webmin/init/config b/webmin/init/config
index 3c3fc5108..07350a9f0 100644
--- a/webmin/init/config
+++ b/webmin/init/config
@@ -1,17 +1,17 @@
+no_chkconfig=0
+atboot_product=webmin
+init_dir=/etc/init.d
 init_info=1
-init_base=/etc/
-order=0
+order_digits=2
+boot_levels=2 3 5
+show_opts=0
 status_check=0
-no_chkconfig=0
-sort_mode=0
 inittab_id=id
-expert=0
-reboot_command=reboot
-show_opts=0
 soft_links=1
-atboot_product=webmin
-order_digits=2
-desc=1
+expert=0
 shutdown_command=poweroff
-boot_levels=2 3 5
-init_dir=/etc/init.d
+order=0
+desc=1
+init_base=/etc/
+sort_mode=0
+reboot_command=reboot
diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config
index 7cb54a2de..dcf4b72bb 100644
--- a/webmin/ipfilter/config
+++ b/webmin/ipfilter/config
@@ -1,9 +1,9 @@
 ipf_conf=/etc/ipf/ipf.conf
-ipf=ipf
-view_condition=1
-ipnat_conf=/etc/ipf/ipnat.conf
+cluster_mode=0
 ipfstat=ipfstat
-ipnat=ipnat
+ipnat_conf=/etc/ipf/ipnat.conf
+view_condition=1
 cluster_nat=1
+ipnat=ipnat
 view_comment=0
-cluster_mode=0
+ipf=ipf
diff --git a/webmin/ipfw/config b/webmin/ipfw/config
index 0593c117d..9680f89a1 100644
--- a/webmin/ipfw/config
+++ b/webmin/ipfw/config
@@ -1,6 +1,6 @@
-view_counters=0
+view_comment=0
 view_condition=1
 version=2
+view_counters=0
 ipfw=/sbin/ipfw
-view_comment=0
 cluster_mode=0
diff --git a/webmin/ipsec/config b/webmin/ipsec/config
index 6caa0bd68..17002686d 100644
--- a/webmin/ipsec/config
+++ b/webmin/ipsec/config
@@ -1,8 +1,8 @@
-stop_cmd=/etc/init.d/ipsec stop
-secrets=/etc/ipsec.secrets
-policies_dir=/etc/ipsec.d/policies
-restart_cmd=/etc/init.d/ipsec restart
 ipsec=/usr/sbin/ipsec
-start_cmd=/etc/init.d/ipsec start
 file=/etc/ipsec.conf
+policies_dir=/etc/ipsec.d/policies
+secrets=/etc/ipsec.secrets
+restart_cmd=/etc/init.d/ipsec restart
+stop_cmd=/etc/init.d/ipsec stop
 logfile=/var/log/messages
+start_cmd=/etc/init.d/ipsec start
diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config
index ab04a7b87..12ee07c59 100644
--- a/webmin/iscsi-client/config
+++ b/webmin/iscsi-client/config
@@ -1,6 +1,6 @@
+initiator_file=/etc/iscsi/initiatorname.iscsi
 iscsiadm=iscsiadm
-iscsiiname=iscsi-iname
 config_file=/etc/iscsi/iscsid.conf
-initiator_file=/etc/iscsi/initiatorname.iscsi
 init_name=open-iscsi
 ifaces_dir=/var/lib/iscsi/ifaces
+iscsiiname=iscsi-iname
diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index 185ca6178..15d716421 100644
--- a/webmin/iscsi-server/config
+++ b/webmin/iscsi-server/config
@@ -1,6 +1,6 @@
-init_name=netbsd-iscsi
-targets_file=/etc/iscsi/targets
 opts_file=/etc/sysconfig/netbsd-iscsi
 auths_file=/etc/iscsi/auths
 iscsi_server=/usr/sbin/iscsi-target
+targets_file=/etc/iscsi/targets
+init_name=netbsd-iscsi
 pid_file=/var/run/iscsi-target.pid
diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config
index 5071f24b3..94411cc72 100644
--- a/webmin/iscsi-target/config
+++ b/webmin/iscsi-target/config
@@ -1,7 +1,7 @@
-init_name=iscsitarget
-initiators_file=/etc/iet/initiators.allow
-targets_file=/etc/iet/targets.allow
-opts_file=/etc/default/iscsitarget
 pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
-ietadm=ietadm
 config_file=/etc/iet/ietd.conf
+ietadm=ietadm
+init_name=iscsitarget
+opts_file=/etc/default/iscsitarget
+targets_file=/etc/iet/targets.allow
+initiators_file=/etc/iet/initiators.allow
diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config
index 2cf30091b..e9c5dde4e 100644
--- a/webmin/iscsi-tgtd/config
+++ b/webmin/iscsi-tgtd/config
@@ -1,5 +1,5 @@
 tgtadm=tgtadm
+tgtadmin=tgt-admin
 tgtd=tgtd
 config_file=/etc/tgt/targets.conf
 init_name=tgtd
-tgtadmin=tgt-admin
diff --git a/webmin/jabber/config b/webmin/jabber/config
index e37142113..54d570ee5 100644
--- a/webmin/jabber/config
+++ b/webmin/jabber/config
@@ -1,5 +1,5 @@
+start_cmd=/etc/init.d/jabberd start
 stop_cmd=/etc/init.d/jabberd stop
-jabber_config=/etc/jabber/jabber.xml
 jabber_daemon=/usr/sbin/jabberd
+jabber_config=/etc/jabber/jabber.xml
 jabber_dir=/var/lib/jabber
-start_cmd=/etc/init.d/jabberd start
diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config
index 4587ce571..4460f14f7 100644
--- a/webmin/ldap-client/config
+++ b/webmin/ldap-client/config
@@ -1,3 +1,3 @@
 auth_ldap=/etc/ldap.conf
-init_name=nslcd
 secret=/etc/ldap.secret
+init_name=nslcd
diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index 33facfa15..31f988818 100644
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
-slapd=slapd
+ldap_user=openldap
 init_name=slapd
 apply_cmd=/etc/init.d/slapd restart
+config_file=/etc/ldap/slapd.d
 attr_count=6
-stop_cmd=/etc/init.d/slapd stop
 schema_dir=/etc/ldap/schema
-config_file=/etc/ldap/slapd.d
+stop_cmd=/etc/init.d/slapd stop
+slapd=slapd
 browse_max=100
-ldap_user=openldap
 start_cmd=/etc/init.d/slapd start
diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config
index 531ddbcfa..1445c1d4d 100644
--- a/webmin/ldap-useradmin/config
+++ b/webmin/ldap-useradmin/config
@@ -1,24 +1,24 @@
-samba_class=sambaSamAccount
-imap_class=SuSEeMailObject
-samba_gclass=sambaGroup
-membox=0
-mailfmt=0
-auth_ldap=/etc/ldap.conf
-samba_def=0
-slappasswd=slappasswd
-shells=fixed,ldap,passwd,shells
-imap_foldersep=.
-imap_login=cyrus
-person=1
+secmode=0
 md5=0
+shells=fixed,ldap,passwd,shells
 quota_support=0
 given_order=0
+membox=0
+samba_gclass=sambaGroup
 imap_folders=old	public	sent-mail
-secmode=0
-given=0
+other_class=inetOrgPerson
 imap_def=0
-ldap_tls=0
+samba_def=0
 alias_same=0
-multi_fields=0
-other_class=inetOrgPerson
+given=0
+imap_login=cyrus
+ldap_tls=0
+person=1
+mailfmt=0
 gecos=1
+auth_ldap=/etc/ldap.conf
+multi_fields=0
+imap_class=SuSEeMailObject
+imap_foldersep=.
+slappasswd=slappasswd
+samba_class=sambaSamAccount
diff --git a/webmin/logrotate/config b/webmin/logrotate/config
index 7633e98b5..13d7f4354 100644
--- a/webmin/logrotate/config
+++ b/webmin/logrotate/config
@@ -1,4 +1,4 @@
-add_file=/etc/logrotate.d
 logrotate_conf=/etc/logrotate.conf
 sort_mode=0
 logrotate=logrotate
+add_file=/etc/logrotate.d
diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config
index b1e039129..35c6b9307 100644
--- a/webmin/lpadmin/config
+++ b/webmin/lpadmin/config
@@ -1,17 +1,17 @@
-print_style=cups
-sort_mode=0
-spool_dir=/var/spool/cups
-display_mode=0
-iface_arg=
+show_status=0
 iface_owner=lp:lp
-iface_perms=755
-start_cmd=/etc/init.d/cupsys start
+iface_arg=
 gs_lib=
-gs_path=gs
+display_mode=0
 model_path=/usr/share/foomatic/db /usr/share/ppd
-gs_fontpath=
+sort_mode=0
+iface_perms=755
+print_style=cups
 show_jobs=0
+spool_dir=/var/spool/cups
 stop_cmd=/etc/init.d/cupsys stop
+gs_path=gs
+start_cmd=/etc/init.d/cupsys start
+gs_fontpath=
 driver_style=cups
 smbclient_path=smbclient
-show_status=0
diff --git a/webmin/lvm/config b/webmin/lvm/config
index 63b743f61..a5ef0ed4d 100644
--- a/webmin/lvm/config
+++ b/webmin/lvm/config
@@ -1,2 +1,2 @@
-lvm_conf=/etc/lvm/lvm.conf
 show_table=0
+lvm_conf=/etc/lvm/lvm.conf
diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config
index 9b9ce7858..17109f883 100644
--- a/webmin/mailboxes/config
+++ b/webmin/mailboxes/config
@@ -1,52 +1,52 @@
-noindex_hostname=0
-mail_usermin=mail
-html_quote=0
-sync_perms=0700
-sync_modify=1
 wrap_width=80
-show_count=0
-show_unread=0
-ignore_users_enabled=0
-sync_create=0
-sync_delete=1
-show_size=1
-log_read=0
-show_to=0
-no_mailer=0
-open_mode=0
 no_crlf=0
-max_records=200
-mail_file=Mailbox
-date_fmt=dmy
-no_orig_ip=0
-mail_style=0
-spam_del=0
-vpopmail_dir=/home/vpopmail
+show_delall=0
+view_html=0
+ignore_users_enabled=0
 show_mail=0
 mail_system=3
-link_mode=0
-track_read=0
+mailbox_user=.usermin/mailbox
 show_body=0
-perpage=20
-top_buttons=2
-arrows=1
-from_virtualmin=1
-maildir_deleted=0
-sig_file=*
-html_edit=0
-size_mode=1
 check_mod=1
-column_count=4
+size_mode=1
+fwd_mode=0
 show_size_below=0
-show_delall=0
-mail_dir=Maildir
+arrows=1
+sig_file=*
+sync_create=0
 sort_mode=1
+sync_perms=0700
+spam_del=0
+top_buttons=2
+no_orig_ip=0
+delete_warn=y
+track_read=0
+vpopmail_dir=/home/vpopmail
+sync_modify=1
+show_size=1
+html_edit=0
+open_mode=0
+noindex_hostname=0
+show_count=0
+html_quote=0
 show_sent=0
+column_count=4
+link_mode=0
+max_records=200
+sync_delete=1
+no_mailer=0
 auto=1
-fwd_mode=0
+mail_usermin=mail
 spam_report=
-delete_warn=y
-view_html=0
+show_unread=0
 ignore_users=
+maildir_deleted=0
 spam_buttons=mail
-mailbox_user=.usermin/mailbox
+mail_style=0
+show_to=0
+mail_file=Mailbox
+date_fmt=dmy
+from_virtualmin=1
+perpage=20
+log_read=0
+mail_dir=Maildir
diff --git a/webmin/man/config b/webmin/man/config
index 08a3bbed3..9652e1e9b 100644
--- a/webmin/man/config
+++ b/webmin/man/config
@@ -1,9 +1,9 @@
-list_cmd=man -w PAGE
-kernel_dir=/usr/src/linux/Documentation
-man_cmd_sect=man SECTION PAGE
-man2html_path=man2html
-list_cmd_sect=man -w SECTION PAGE
 search_cmd=man -k PAGE
-man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
+list_cmd_sect=man -w SECTION PAGE
 man_cmd=man PAGE
+list_cmd=man -w PAGE
 doc_dir=/usr/share/doc
+man2html_path=man2html
+man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
+kernel_dir=/usr/src/linux/Documentation
+man_cmd_sect=man SECTION PAGE
diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index eedfddb52..83c6c0cd1 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.979
+server=MiniServ/1.980
diff --git a/webmin/mon/config b/webmin/mon/config
index fce12211e..509453890 100644
--- a/webmin/mon/config
+++ b/webmin/mon/config
@@ -1,7 +1,7 @@
-stop_cmd=/etc/init.d/mon stop
-restart_cmd=/etc/init.d/mon restart
-start_cmd=/etc/init.d/mon start
+cfbasedir=/etc/mon
 monshow=/usr/bin/monshow
 pid_file=/var/run/mon.pid
 mon_cgi=/var/www/cgi-bin/mon.cgi
-cfbasedir=/etc/mon
+start_cmd=/etc/init.d/mon start
+stop_cmd=/etc/init.d/mon stop
+restart_cmd=/etc/init.d/mon restart
diff --git a/webmin/mount/config b/webmin/mount/config
index d2c8c36cb..8d81b5932 100644
--- a/webmin/mount/config
+++ b/webmin/mount/config
@@ -1,10 +1,10 @@
-autofs_file=/etc/auto.master
 fstab_file=/etc/fstab
-auto_file=/etc/am-utils/amd.conf
-nfs_check=1
 show_used=1
+nmblookup_path=nmblookup
+autofs_file=/etc/auto.master
 sysinfo=1
+nfs_check=1
+auto_file=/etc/am-utils/amd.conf
 smbclient_path=smbclient
-long_fstypes=1
 sort_mode=2
-nmblookup_path=nmblookup
+long_fstypes=1
diff --git a/webmin/mysql/config b/webmin/mysql/config
index aca5132b5..686fab6a7 100644
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -1,23 +1,23 @@
-nopwd=0
-max_text=1000
-max_dbs=50
-login=root
+passwd_mode=0
+mysqlimport=/usr/bin/mysqlimport
 style=0
-mysql=/usr/bin/mysql
+start_cmd=service mysql start
+stop_cmd=service mysql stop
+blob_mode=0
+mysqladmin=/usr/bin/mysqladmin
+mysql_libs=/usr/local/mysql/lib
+max_dbs=50
 date_subs=0
-my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
-mysqlshow=/usr/bin/mysqlshow
-mysqlimport=/usr/bin/mysqlimport
 perpage=25
-mysqladmin=/usr/bin/mysqladmin
-mysql_data=/var/lib/mysql
-blob_mode=0
 nodbi=0
-mysql_libs=/usr/local/mysql/lib
 add_mode=1
-access=*: *
-stop_cmd=service mysql stop
-mysqldump=/usr/bin/mysqldump
+nopwd=0
 webmin_subs=0
-passwd_mode=0
-start_cmd=service mysql start
+mysqlshow=/usr/bin/mysqlshow
+max_text=1000
+mysql=/usr/bin/mysql
+mysqldump=/usr/bin/mysqldump
+my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
+access=*: *
+mysql_data=/var/lib/mysql
+login=root
diff --git a/webmin/mysql/version b/webmin/mysql/version
index d5cc598b7..2f6b6823f 100644
--- a/webmin/mysql/version
+++ b/webmin/mysql/version
@@ -1 +1 @@
-8.0.25-0ubuntu0
+8.0.26-0ubuntu0
diff --git a/webmin/nis/config b/webmin/nis/config
index 83bb5285e..d1dcdf5f1 100644
--- a/webmin/nis/config
+++ b/webmin/nis/config
@@ -1,5 +1,5 @@
-nsswitch_conf=/etc/nsswitch.conf
 manual_build=0
 max_size=100
-securenets=/etc/ypserv.securenets
 client_conf=/etc/yp.conf
+nsswitch_conf=/etc/nsswitch.conf
+securenets=/etc/ypserv.securenets
diff --git a/webmin/openslp/config b/webmin/openslp/config
index af734bea6..3aff94095 100644
--- a/webmin/openslp/config
+++ b/webmin/openslp/config
@@ -1,5 +1,5 @@
+slpd_pid=/var/run/slpd.pid
 slpd=/usr/sbin/slpd
 slpd_log=/var/log/slpd.log
 slpd_reg=/etc/slp.reg
-slpd_pid=/var/run/slpd.pid
 slpd_conf=/etc/slp.conf
diff --git a/webmin/pap/config b/webmin/pap/config
index cfff8e90e..3abe55bc5 100644
--- a/webmin/pap/config
+++ b/webmin/pap/config
@@ -1,8 +1,8 @@
+login_config=/etc/mgetty+sendfax/login.config
+pppd=pppd
 ppp_options=/etc/ppp/options
 serials=/dev/ttyS[0-9]*
-pppd=pppd
-pap_file=/etc/ppp/pap-secrets
-login_config=/etc/mgetty+sendfax/login.config
 dialin_config=/etc/mgetty+sendfax/dialin.config
 encrypt_pass=0
+pap_file=/etc/ppp/pap-secrets
 mgetty=mgetty
diff --git a/webmin/postfix/config b/webmin/postfix/config
index 54bbb7cba..48bbda139 100644
--- a/webmin/postfix/config
+++ b/webmin/postfix/config
@@ -1,29 +1,29 @@
-postfix_queue_command=postqueue
-fwd_mode=0
+top_buttons=1
+check_config=1
+postfix_config_file=/etc/postfix/main.cf
+postfix_config_command=/usr/sbin/postconf
 delete_warn=1
-mailq_dir=/var/spool/postfix
-sort_mode=0
+perpage=20
+ldap_doms=0
+fwd_mode=0
+index_check=1
 postfix_control_command=/usr/sbin/postfix
+postfix_aliases_table_command=/usr/sbin/postalias
+postfix_master=/etc/postfix/master.cf
+sort_mode=0
 postfix_super_command=/usr/sbin/postsuper
 mailq_count=0
-postfix_config_command=/usr/sbin/postconf
-mailq_sort=0
-max_records=200
-postcat_cmd=/usr/sbin/postcat
-postfix_master=/etc/postfix/master.cf
-perpage=20
-top_buttons=1
-index_check=1
+max_maps=100
+show_cmts=0
+postfix_newaliases_command=/usr/bin/newaliases
+mailq_dir=/var/spool/postfix
 mailq_cmd=postqueue -p
 prefix_cmts=0
-postfix_newaliases_command=/usr/bin/newaliases
-postfix_config_file=/etc/postfix/main.cf
-ldap_doms=0
-columns=2
+max_records=200
+mailq_sort=0
 delete_confirm=1
-postfix_aliases_table_command=/usr/sbin/postalias
-postfix_lookup_table_command=/usr/sbin/postmap
-max_maps=100
-show_cmts=0
+postcat_cmd=/usr/sbin/postcat
+columns=2
+postfix_queue_command=postqueue
 wrap_width=80
-check_config=1
+postfix_lookup_table_command=/usr/sbin/postmap
diff --git a/webmin/postgresql/config b/webmin/postgresql/config
index 30c7f595f..c4bcd3000 100644
--- a/webmin/postgresql/config
+++ b/webmin/postgresql/config
@@ -1,24 +1,24 @@
-stop_cmd=/etc/init.d/postgresql* stop
-sameunix=1
-pass=
+access_own=0
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
 rstr_cmd=/usr/bin/pg_restore
-start_cmd=/etc/init.d/postgresql* start
 pid_file=/var/run/postmaster.pid
+plib=
+access=*: *
+login=postgres
+webmin_subs=0
+max_text=1000
 dump_cmd=/usr/bin/pg_dump
+pass=
+perpage=25
 basedb=template1
-hba_conf=/etc/postgresql/*/main/pg_hba.conf
-date_subs=0
-max_text=1000
+nodbi=0
 simple_sched=0
-access=*: *
-psql=/usr/bin/psql
-webmin_subs=0
 add_mode=1
-nodbi=0
-access_own=0
-perpage=25
-blob_mode=0
-plib=
 style=0
+sameunix=1
+start_cmd=/etc/init.d/postgresql* start
+date_subs=0
 max_dbs=50
-login=postgres
+blob_mode=0
+stop_cmd=/etc/init.d/postgresql* stop
+psql=/usr/bin/psql
diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config
index 54849d0a2..7af13e89f 100644
--- a/webmin/ppp-client/config
+++ b/webmin/ppp-client/config
@@ -1,3 +1,3 @@
-wvdialconf=wvdialconf
-wvdial=wvdial
 file=/etc/wvdial.conf
+wvdial=wvdial
+wvdialconf=wvdialconf
diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config
index bb3ddbef2..5a8393949 100644
--- a/webmin/pptp-client/config
+++ b/webmin/pptp-client/config
@@ -1,5 +1,5 @@
-pptp=pptp
 timeout=30
-pptp_options=/etc/ppp/options.pptp
+pptp=pptp
 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 68798ff77..8741217ac 100644
--- a/webmin/pptp-server/config
+++ b/webmin/pptp-server/config
@@ -1,9 +1,9 @@
+stop_cmd=/etc/init.d/pptpd stop
+log_file=/var/log/messages
+start_cmd=/etc/init.d/pptpd start
 pap_file=/etc/ppp/chap-secrets
 file=/etc/pptpd.conf
 pptpd=pptpd
 ppp_options=/etc/ppp/options
-stop_cmd=/etc/init.d/pptpd stop
-log_file=/var/log/messages
-start_cmd=/etc/init.d/pptpd start
 pptp_ppp_options=/etc/ppp/pptpd-options
 pid_file=/var/run/pptpd.pid
diff --git a/webmin/proc/config b/webmin/proc/config
index 1f0df31bf..5624a1567 100644
--- a/webmin/proc/config
+++ b/webmin/proc/config
@@ -1,6 +1,6 @@
-cut_length=80
-base_ppid=1
-ps_style=linux
-trace_java=0
 default_mode=last
 hide_self=1
+base_ppid=1
+trace_java=0
+ps_style=linux
+cut_length=80
diff --git a/webmin/procmail/config b/webmin/procmail/config
index 5dae99ba1..ff60bb0d1 100644
--- a/webmin/procmail/config
+++ b/webmin/procmail/config
@@ -1,3 +1,3 @@
+procmailrc=/etc/procmailrc
 procmail=procmail
 includes=0
-procmailrc=/etc/procmailrc
diff --git a/webmin/proftpd/config b/webmin/proftpd/config
index 08670b304..d11e1406e 100644
--- a/webmin/proftpd/config
+++ b/webmin/proftpd/config
@@ -1,9 +1,9 @@
+test_always=0
 test_config=1
-pid_file=/var/run/proftpd.pid
-start_cmd=/etc/init.d/proftpd start
-proftpd_conf=/etc/proftpd/proftpd.conf
 stop_cmd=/etc/init.d/proftpd stop
-proftpd_path=/usr/sbin/proftpd
-test_always=0
+start_cmd=/etc/init.d/proftpd start
 ftpusers=/etc/ftpusers
+proftpd_path=/usr/sbin/proftpd
 test_manual=0
+proftpd_conf=/etc/proftpd/proftpd.conf
+pid_file=/var/run/proftpd.pid
diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config
index cf56e223e..2157f65e6 100644
--- a/webmin/qmailadmin/config
+++ b/webmin/qmailadmin/config
@@ -1,14 +1,14 @@
-mailq_sort=0
-max_records=200
-mail_system=1
-mail_dir=
-index_min=1000000
-qmail_dir=/var/qmail
 columns=2
-mail_dir_qmail=Maildir
+sort_mode=0
+index_min=1000000
 mailq_count=0
-perpage=20
 fwd_mode=0
+mail_dir_qmail=Maildir
 delete_warn=1
+max_records=200
+mailq_sort=0
+qmail_dir=/var/qmail
+mail_dir=
+perpage=20
 mail_file=Mailbox
-sort_mode=0
+mail_system=1
diff --git a/webmin/quota/config b/webmin/quota/config
index 92c0693d7..62ee2a903 100644
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
-user_quota_command=quota -v -u
-group_edquota_command=edquota -g
-group_quotaoff_command=quotaoff -g
-group_quotaon_command=quotaon -g
-hide_uids=0
-sort_mode=0
-user_grace_command=edquota -u -t
-display_max=100
-show_grace=1
-group_setquota_command=setquota -g
-user_repquota_command=repquota -u -v
-block_mode=1
-block_size=1024
-quotacheck_command=quotacheck -u -g
-user_quotaon_command=quotaon -u
-group_grace_command=edquota -g -t
+user_copy_command=edquota -u -p
 user_setquota_command=setquota -u
 user_quotaoff_command=quotaoff -u
-user_edquota_command=edquota -u
-user_copy_command=edquota -u -p
-group_repquota_command=repquota -g -v
+block_size=1024
 group_copy_command=edquota -g -p
+group_edquota_command=edquota -g
+user_repquota_command=repquota -u -v
 group_quota_command=quota -v -g
+group_repquota_command=repquota -g -v
+quotacheck_command=quotacheck -u -g
+display_max=100
+user_grace_command=edquota -u -t
+block_mode=1
 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
 pc_show=1
+user_quotaon_command=quotaon -u
+user_edquota_command=edquota -u
+group_grace_command=edquota -g -t
+sort_mode=0
+group_setquota_command=setquota -g
+show_grace=1
+hide_uids=0
+user_quota_command=quota -v -u
+group_quotaon_command=quotaon -g
diff --git a/webmin/raid/config b/webmin/raid/config
index 8ffe6d468..7e973e1af 100644
--- a/webmin/raid/config
+++ b/webmin/raid/config
@@ -1,3 +1,3 @@
-mdadm=/etc/mdadm/mdadm.conf
-mdstat=/proc/mdstat
 raidtab=/etc/raidtab
+mdstat=/proc/mdstat
+mdadm=/etc/mdadm/mdadm.conf
diff --git a/webmin/samba/config b/webmin/samba/config
index 450b83ae7..3d447d740 100644
--- a/webmin/samba/config
+++ b/webmin/samba/config
@@ -1,18 +1,18 @@
-run_from_inetd=0
-start_cmd=service smbd start ; service nmbd start
-list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
-pdbedit=/usr/bin/pdbedit
+restart_cmd=service smbd restart ; service nmbd restart
+samba_password_program=/usr/bin/smbpasswd
 net=/usr/bin/net
-stop_cmd=service smbd stop ; service nmbd stop
+pdbedit=/usr/bin/pdbedit
+smb_passwd=/etc/samba/smbpasswd
+text_lists=0
+dont_convert=-499
+name_server=/usr/sbin/nmbd
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
 swat=/usr/sbin/swat
+run_from_inetd=0
 sort_mode=0
-dont_convert=-499
-restart_cmd=service smbd restart ; service nmbd restart
-samba_server=/usr/sbin/smbd
+stop_cmd=service smbd stop ; service nmbd stop
+start_cmd=service smbd start ; service nmbd start
 samba_status_program=/usr/bin/smbstatus
-samba_password_program=/usr/bin/smbpasswd
-smbgroupedit=/usr/bin/smbgroupedit
-text_lists=0
 smb_conf=/etc/samba/smb.conf
-smb_passwd=/etc/samba/smbpasswd
-name_server=/usr/sbin/nmbd
+samba_server=/usr/sbin/smbd
+smbgroupedit=/usr/bin/smbgroupedit
diff --git a/webmin/sarg/config b/webmin/sarg/config
index 125c56c89..b9009faeb 100644
--- a/webmin/sarg/config
+++ b/webmin/sarg/config
@@ -1,4 +1,4 @@
-sarg=sarg
-clear=1
 sarg_conf=/etc/sarg/sarg.conf
+sarg=sarg
 naked=0
+clear=1
diff --git a/webmin/sendmail/config b/webmin/sendmail/config
index 6751d3324..7ca317b16 100644
--- a/webmin/sendmail/config
+++ b/webmin/sendmail/config
@@ -1,30 +1,30 @@
-sendmail_path=/usr/lib/sendmail
-smrsh_dir=/etc/smrsh
-mail_dir=/var/spool/mail
-show_to=0
-max_records=200
 mailq_sort=0
-sort_mode=0
-mail_file=mbox
-delete_warn=1
-fwd_mode=0
+max_records=200
+smrsh_dir=/etc/smrsh
+sendmail_path=/usr/lib/sendmail
+prefix_cmts=0
 sendmail_command=/usr/lib/sendmail -bd -q1h
-mailq_count=0
-mailq_show=Date,From,To,Size,Status
-makemap_path=makemap
-sendmail_pid=/var/run/sendmail/mta/sendmail.pid
-mail_style=0
 delete_confirm=1
-columns=2
+sendmail_pid=/var/run/sendmail/mta/sendmail.pid
+mail_type=0
+sendmail_features=/usr/share/sendmail/cf
+order_mail=0
 index_min=1000000
+columns=2
 wrap_width=80
-order_mail=0
-sendmail_mc=/etc/mail/sendmail.mc
-show_cmts=0
+mailq_show=Date,From,To,Size,Status
+makemap_path=makemap
+delete_warn=1
 track_read=0
-top_buttons=1
-sendmail_features=/usr/share/sendmail/cf
 perpage=20
+mail_dir=/var/spool/mail
+show_to=0
+mail_file=mbox
+top_buttons=1
+sort_mode=0
+mailq_count=0
+show_cmts=0
+mail_style=0
+sendmail_mc=/etc/mail/sendmail.mc
+fwd_mode=0
 sendmail_cf=/etc/mail/sendmail.cf
-mail_type=0
-prefix_cmts=0
diff --git a/webmin/servers/config b/webmin/servers/config
index 7097c4113..0fa674154 100644
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
-deflink=0
 scan_time=5
-sort_mode=0
-show_ip=0
-display_mode=0
-resolve=1
 deffast=2
+show_ip=0
+show_status=1
+deflink=0
 capath=/usr/share/ca-certificates
+sort_mode=0
+display_mode=0
 max_servers=100
-show_status=1
+resolve=1
 groups_dir=/etc/cluster/groups
diff --git a/webmin/shorewall/config b/webmin/shorewall/config
index 4a911a946..c7f719b0e 100644
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
+macros=/usr/share/shorewall
 display_zone_descriptions=1
 actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
-macros=/usr/share/shorewall
 config_dir=/etc/shorewall
 shorewall=shorewall
diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config
index 3be7e69b7..8cef3f71b 100644
--- a/webmin/shorewall6/config
+++ b/webmin/shorewall6/config
@@ -1,5 +1,5 @@
-shorewall6=shorewall6
 display_zone_descriptions=1
 config_dir=/etc/shorewall6
-macros=/usr/share/shorewall6
 actions=/etc/shorewall6/actions	/usr/share/shorewall6/actions.std
+macros=/usr/share/shorewall6
+shorewall6=shorewall6
diff --git a/webmin/smart-status/config b/webmin/smart-status/config
index 89a62e9fe..a75445eff 100644
--- a/webmin/smart-status/config
+++ b/webmin/smart-status/config
@@ -1,4 +1,4 @@
 mode=1
-ata=0
-smartctl=smartctl
 attribs=1
+smartctl=smartctl
+ata=0
diff --git a/webmin/software/config b/webmin/software/config
index facec37dd..9476e6757 100644
--- a/webmin/software/config
+++ b/webmin/software/config
@@ -1,3 +1,3 @@
-package_system=debian
 apt_mode=0
 update_system=apt
+package_system=debian
diff --git a/webmin/spam/config b/webmin/spam/config
index f9402f2d2..35c18f200 100644
--- a/webmin/spam/config
+++ b/webmin/spam/config
@@ -1,12 +1,12 @@
-sa_learn=sa-learn
+procmailrc=/etc/procmailrc
+restart_cmd=/etc/init.d/spamassassin restart
 addto=0
+spamassassin=spamassassin
 call_spam=1
-restart_cmd=/etc/init.d/spamassassin restart
-procmail_cmd=*
+sa_learn=sa-learn
 mode=0
-max_awl=200
-spamassassin=spamassassin
-local_cf=/etc/spamassassin/local.cf
-procmailrc=/etc/procmailrc
 processes=spamd amavisd
+local_cf=/etc/spamassassin/local.cf
 warn_procmail=1
+procmail_cmd=*
+max_awl=200
diff --git a/webmin/squid/config b/webmin/squid/config
index 8813d5f94..01e7ea4f8 100644
--- a/webmin/squid/config
+++ b/webmin/squid/config
@@ -1,21 +1,21 @@
-cal_fmt=w
-restart_pos=0
+sort_conf=0
 calamaris=calamaris
+cal_max=50000
+squid_restart=service squid reload
+cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+squid_conf=/etc/squid/squid.conf
 squid_start=service squid start
-cache_dir=/var/spool/squid
 crypt_conf=0
+squidclient=squidclient
 sync_modify=1
-squid_stop=service squid stop
-sort_conf=0
-log_dir=/var/log/squid
+cal_fmt=w
 squid_path=squid
 sync_delete=0
 cal_args=-aw
+squid_stop=service squid stop
+log_dir=/var/log/squid
+restart_pos=0
 cal_all=1
+cache_dir=/var/spool/squid
 pid_file=/var/run/squid.pid
-squidclient=squidclient
-squid_restart=service squid reload
-cal_max=50000
 sync_create=0
-squid_conf=/etc/squid/squid.conf
-cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
diff --git a/webmin/sshd/config b/webmin/sshd/config
index 1f0f82b42..8e612638d 100644
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,11 +1,11 @@
-sshd_path=/usr/sbin/sshd
-sshd_config=/etc/ssh/sshd_config
-sync_create=0
-sync_gnupg=0
 start_cmd=service ssh start
-pid_file=/var/run/sshd.pid
-client_config=/etc/ssh/ssh_config
-sync_pass=0
 stop_cmd=service ssh stop
 keygen_path=/usr/bin/ssh-keygen
 sync_auth=1
+sshd_config=/etc/ssh/sshd_config
+pid_file=/var/run/sshd.pid
+sync_create=0
+client_config=/etc/ssh/ssh_config
+sync_pass=0
+sshd_path=/usr/sbin/sshd
+sync_gnupg=0
diff --git a/webmin/status/config b/webmin/status/config
index 54961cdd7..ebeea6981 100644
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,13 +1,13 @@
-snmp_trap=1.3.6.1.4.1.10000.1.1
+history_show=50
 snmp_version=2
-output=0
-sort_mode=0
-subject_mode=0
-index_status=1
 history_purge=30
+snmp_trap=1.3.6.1.4.1.10000.1.1
 pager_cmd=sms_client
 sched_offset=0
-history_show=50
 sysinfo_users=0
 sysinfo=0
+subject_mode=0
+output=0
+index_status=1
+sort_mode=0
 columns=2
diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config
index 462458d50..5f3dd8271 100644
--- a/webmin/syslog-ng/config
+++ b/webmin/syslog-ng/config
@@ -1,7 +1,7 @@
-compressed=1
-syslogng_cmd=syslog-ng
 start_cmd=/etc/init.d/syslog-ng start
-pid_file=/var/run/syslog-ng.pid
+syslogng_cmd=syslog-ng
+stop_cmd=/etc/init.d/syslog-ng stop
 syslogng_conf=/etc/syslog-ng/syslog-ng.conf
+compressed=1
 lines=20
-stop_cmd=/etc/init.d/syslog-ng stop
+pid_file=/var/run/syslog-ng.pid
diff --git a/webmin/syslog/config b/webmin/syslog/config
index 23e7d5100..4fd8bf50b 100644
--- a/webmin/syslog/config
+++ b/webmin/syslog/config
@@ -1,19 +1,19 @@
-syslog_conf=/etc/rsyslog.conf
 compressed=1
-socket=0
-syslogd=/usr/sbin/rsyslogd
-tags=0
+pri_dir=1
 pri_all=1
 pid_file=/var/run/rsyslogd.pid
-start_cmd=/usr/sbin/service rsyslog start
-sync=1
+restart_cmd=/usr/sbin/service rsyslog restart
+socket=0
+facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
+pipe=1
+tags=0
 reverse=0
+syslog_conf=/etc/rsyslog.conf
+m4_path=
 m4_conf=0
-pipe=1
-signal_cmd=/usr/sbin/service rsyslog restart
-facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
-restart_cmd=/usr/sbin/service rsyslog restart
-pri_dir=1
+syslogd=/usr/sbin/rsyslogd
 others=1
-m4_path=
 lines=20
+signal_cmd=/usr/sbin/service rsyslog restart
+sync=1
+start_cmd=/usr/sbin/service rsyslog start
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 bfd2d19d4..9539a8514 100644
--- a/webmin/tcpwrappers/config
+++ b/webmin/tcpwrappers/config
@@ -1,3 +1,3 @@
+hosts_deny=/etc/hosts.deny
 inetd_services=0
 hosts_allow=/etc/hosts.allow
-hosts_deny=/etc/hosts.deny
diff --git a/webmin/telnet/config b/webmin/telnet/config
index b5cbb0cf2..ba8e81dd5 100644
--- a/webmin/telnet/config
+++ b/webmin/telnet/config
@@ -1,5 +1,5 @@
-sizemode=0
-detach=0
-proxy=0
 no_test=0
+detach=0
 mode=1
+sizemode=0
+proxy=0
diff --git a/webmin/time/config b/webmin/time/config
index 767c675be..70283f1b3 100644
--- a/webmin/time/config
+++ b/webmin/time/config
@@ -1,6 +1,6 @@
+seconds=1
+timeserver=0.pool.ntp.org
 zone_style=linux
 timeserver_hardware=1
 ntp_only=1
-seconds=1
-timeserver=0.pool.ntp.org
 lease=5
diff --git a/webmin/updown/config b/webmin/updown/config
index 9eddc8fbb..6153634f5 100644
--- a/webmin/updown/config
+++ b/webmin/updown/config
@@ -1,4 +1,4 @@
-duser=root
-dir=/
 user=root
+dir=/
+duser=root
 ddir=/
diff --git a/webmin/useradmin/config b/webmin/useradmin/config
index 11e3f233e..2242fc36a 100644
--- a/webmin/useradmin/config
+++ b/webmin/useradmin/config
@@ -1,41 +1,41 @@
-group_file=/etc/group
-uid_calc=0
-base_uid=1000
-passwd_progmode=0
-email_type=0
-base_gid=1000
-lock_string=*
+passwd_dict=0
 new_user_group=0
-extra_real=0
-last_show=0
-display_max=400
+skip_md5=0
+uid_calc=0
+delete_root=0
+home_style=0
 sort_mode=0
-display_mode=1
+uid_mode=1
+lock_string=*
+passwd_stars=0
 from_files=0
+alias_check=0
+default_group=users
+shadow_file=/etc/shadow
 gshadow_file=/etc/gshadow
-md5=1
-uid_mode=1
+random_password=0
+base_gid=1000
 passwd_same=0
-delete_only=0
-shadow_file=/etc/shadow
-selinux_con=user_u:object_r:user_home_dir_t
-default_group=users
-default_other=1
-empty_mode=0
+display_max=400
 secmode=0
-passwd_file=/etc/passwd
-passwd_dict=0
-user_files=/etc/skel
+gid_mode=1
 new_user_gid=0
-passwd_stars=0
+empty_mode=0
 home_base=/home
+last_show=0
 shells=fixed,passwd,shells
-gid_mode=1
-delete_root=0
-skip_md5=0
-home_style=0
+display_mode=1
+default_other=1
+md5=1
+email_type=0
+base_uid=1000
+passwd_file=/etc/passwd
+delete_only=0
+passwd_progmode=0
+group_file=/etc/group
+extra_real=0
 membox=0
-random_password=0
-gid_calc=0
-alias_check=0
 homedir_perms=0755
+gid_calc=0
+selinux_con=user_u:object_r:user_home_dir_t
+user_files=/etc/skel
diff --git a/webmin/usermin/config b/webmin/usermin/config
index 6991ccf53..9553623ff 100644
--- a/webmin/usermin/config
+++ b/webmin/usermin/config
@@ -1,7 +1,7 @@
-cron_mode=0
-updays=1
 usermin_dir=/etc/usermin
+updays=1
 upshow=1
 upmissing=0
+cron_mode=0
 update=0
 uphour=4
diff --git a/webmin/version b/webmin/version
index ecba942f0..01738d629 100644
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.979
+1.980
diff --git a/webmin/webalizer/config b/webmin/webalizer/config
index b382cbf16..5f6257fcd 100644
--- a/webmin/webalizer/config
+++ b/webmin/webalizer/config
@@ -1,6 +1,6 @@
-naked=0
 webalizer_conf=/etc/webalizer/webalizer.conf
 skip_old=0
-alt_conf=/etc/webalizer/webalizer.conf.sample
-auto=apache,squid,proftpd,wuftpd
 webalizer=/usr/bin/webalizer
+auto=apache,squid,proftpd,wuftpd
+alt_conf=/etc/webalizer/webalizer.conf.sample
+naked=0
diff --git a/webmin/webmin/config b/webmin/webmin/config
index 29b9d5d84..b07a2419a 100644
--- a/webmin/webmin/config
+++ b/webmin/webmin/config
@@ -1,12 +1,12 @@
-cron_mode=0
 upmissing=0
-update=0
-letsencrypt_dns_wait=10
-osdn=1
 upshow=1
-upmins=47
 updays=1
+letsencrypt_dns_wait=10
+cron_mode=0
 last_version_check=1549050668
+upmins=47
 uphour=23
 warn_days=7
 last_version_number=1.900
+osdn=1
+update=0
diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config
index 7deb33731..5abe5d960 100644
--- a/webmin/wuftpd/config
+++ b/webmin/wuftpd/config
@@ -1,8 +1,8 @@
-ftpaccess=/etc/wu-ftpd/ftpaccess
-pid_file=/var/run/ftpd.pids-all
+ftpd_path=/usr/sbin/wu-ftpd
+ftpusers=/etc/wu-ftpd/ftpusers
 log_file=/var/log/xferlog
+ftpconversions=/etc/wu-ftpd/ftpconversions
+ftpaccess=/etc/wu-ftpd/ftpaccess
 ftphosts=/etc/wu-ftpd/ftphosts
 ftpgroups=/etc/wu-ftpd/ftpgroups
-ftpusers=/etc/wu-ftpd/ftpusers
-ftpd_path=/usr/sbin/wu-ftpd
-ftpconversions=/etc/wu-ftpd/ftpconversions
+pid_file=/var/run/ftpd.pids-all
diff --git a/webmin/xinetd/config b/webmin/xinetd/config
index 653c3a4bc..d5dfaa872 100644
--- a/webmin/xinetd/config
+++ b/webmin/xinetd/config
@@ -1,5 +1,5 @@
-pid_file=/var/run/xinetd.pid
 start_cmd=/etc/init.d/xinetd start
 protocols_file=/etc/protocols
+pid_file=/var/run/xinetd.pid
 xinetd_conf=/etc/xinetd.conf
 lookup_servs=1