From: mhoellein <mario@hoellein.online>
Date: Tue, 7 Dec 2021 19:37:05 +0000 (+0100)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=d67a1b6ae3ba556cd3c4ffe26d8ce1e5da84d5a8;p=vserver

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

Package changes:
-busybox-initramfs 1:1.30.1-4ubuntu6.3 amd64
-busybox-static 1:1.30.1-4ubuntu6.3 amd64
+busybox-initramfs 1:1.30.1-4ubuntu6.4 amd64
+busybox-static 1:1.30.1-4ubuntu6.4 amd64
-libgl1-mesa-dri 21.0.3-0ubuntu0.3~20.04.4 amd64
-libglapi-mesa 21.0.3-0ubuntu0.3~20.04.4 amd64
+libgl1-mesa-dri 21.0.3-0ubuntu0.3~20.04.5 amd64
+libglapi-mesa 21.0.3-0ubuntu0.3~20.04.5 amd64
-linux-libc-dev 5.4.0-90.101 amd64
+linux-libc-dev 5.4.0-91.102 amd64
-mesa-vulkan-drivers 21.0.3-0ubuntu0.3~20.04.4 amd64
+mesa-vulkan-drivers 21.0.3-0ubuntu0.3~20.04.5 amd64
-python3-django 2:2.2.12-1ubuntu0.7 all
+python3-django 2:2.2.12-1ubuntu0.8 all
-ubuntu-advantage-tools 27.4.1~20.04.1 amd64
+ubuntu-advantage-tools 27.4.2~20.04.1 amd64
-webmin 1.981 all
+webmin 1.983 all
---

diff --git a/webmin/acl/config b/webmin/acl/config
index ee9b4c16b..e5e83c2ab 100644
--- a/webmin/acl/config
+++ b/webmin/acl/config
@@ -1,3 +1,3 @@
+order=0
 display=1
 ssleay=/usr/bin/openssl
-order=0
diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config
index c722d3801..5f022136c 100644
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
-pppoe_conf=/etc/ppp/pppoe.conf
-stop_cmd=adsl-stop
 conf_style=0
-pppoe_cmd=pppoe
-status_cmd=adsl-status
 pap_file=/etc/ppp/pap-secrets
+pppoe_cmd=pppoe
+pppoe_conf=/etc/ppp/pppoe.conf
 start_cmd=adsl-start
+stop_cmd=adsl-stop
+status_cmd=adsl-status
diff --git a/webmin/apache/config b/webmin/apache/config
index 3e1dc8b86..fd5328a9d 100644
--- a/webmin/apache/config
+++ b/webmin/apache/config
@@ -1,24 +1,25 @@
-max_servers=100
-srm_conf=/etc/apache2/srm.conf
 start_cmd=/etc/init.d/apache2 start
-link_dir=/etc/apache2/sites-enabled
-test_apachectl=1
-apply_cmd=/usr/sbin/apache2ctl graceful
-httpd_path=/usr/sbin/apache2
-virt_file=/etc/apache2/sites-available
 access_conf=/etc/apache2/access.conf
-auto_mods=1
-defines_file=/etc/apache2/envvars
-show_order=0
-defines_name=APACHE_ARGUMENTS
-httpd_conf=/etc/apache2/apache2.conf
 allow_virtualmin=0
-stop_cmd=/etc/init.d/apache2 stop
-apachectl_path=/usr/sbin/apache2ctl
 show_names=0
+test_apachectl=1
+defines_name=APACHE_ARGUMENTS
 test_always=0
-mime_types=/etc/apache2/mime.types
-httpd_dir=/etc/apache2
+show_order=0
+max_servers=100
 show_list=0
+format_config=1
+auto_mods=1
+defines_file=/etc/apache2/envvars
+mime_types=/etc/apache2/mime.types
 test_manual=0
+httpd_dir=/etc/apache2
+link_dir=/etc/apache2/sites-enabled
+apachectl_path=/usr/sbin/apache2ctl
+httpd_conf=/etc/apache2/apache2.conf
+httpd_path=/usr/sbin/apache2
 test_config=1
+stop_cmd=/etc/init.d/apache2 stop
+srm_conf=/etc/apache2/srm.conf
+apply_cmd=/usr/sbin/apache2ctl graceful
+virt_file=/etc/apache2/sites-available
diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info
index 7ca364d51..76d82cefb 100644
--- a/webmin/apache/httpd-info
+++ b/webmin/apache/httpd-info
@@ -1,4 +1,5 @@
-time=1625166968
+time=1633634249
 cmd=/usr/sbin/apache2
 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
-version=2.448
+version=2.451
+fullversion=2.4.51
diff --git a/webmin/at/config b/webmin/at/config
index 6f83c111c..abf2f6455 100644
--- a/webmin/at/config
+++ b/webmin/at/config
@@ -1,2 +1,2 @@
-at_style=linux
 at_dir=/var/spool/cron/atjobs
+at_style=linux
diff --git a/webmin/backup-config/config b/webmin/backup-config/config
index 5d1c57e87..42c8775c3 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
+date_subs=0
diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config
index 5f42e3b50..ed73456d5 100644
--- a/webmin/bacula-backup/config
+++ b/webmin/bacula-backup/config
@@ -1,12 +1,12 @@
-wait=1
-bacula_dir=/etc/bacula
-showdirs=0
-db=bacula
+apply=1
 driver=Pg
 pass=
-init_start=0
+showdirs=0
+bacula_dir=/etc/bacula
+db=bacula
+btape=btape
 user=bacula
 bextract=bextract
+init_start=0
+wait=1
 bls=bls
-apply=1
-btape=btape
diff --git a/webmin/bind8/config b/webmin/bind8/config
index b5495dd2d..f3f0fe6ff 100644
--- a/webmin/bind8/config
+++ b/webmin/bind8/config
@@ -1,46 +1,46 @@
-zones_file=/etc/bind/named.conf.local
-checkzone=named-checkzone
-reversezonefilename_format=ZONE.rev
-spf_record=0
-relative_paths=0
-short_names=0
-support_aaaa=1
-other_slaves=1
-named_path=/usr/sbin/named
-slave_dir=/var/lib/bind
-updserial_def=0
-master_ttl=1
-largezones=0
-updserial_man=1
-rndc_conf=/etc/bind/rndc.conf
-allow_comments=0
-force_random=0
-rndc_cmd=rndc
-soa_start=0
-signzone=dnssec-signzone
-soa_style=0
-show_list=0
-ipv6_mode=1
-confirm_rec=0
 ndc_cmd=ndc
-confirm_zone=1
-rndcconf_cmd=rndc-confgen
+soa_start=0
+rndc_conf=/etc/bind/rndc.conf
 rev_def=0
-records_order=0
-forwardzonefilename_format=ZONE.hosts
-keygen=dnssec-keygen
+max_zones=50
 checkconf=named-checkconf
-no_pid_chroot=0
+named_conf=/etc/bind/named.conf
+forwardzonefilename_format=ZONE.hosts
+signzone=dnssec-signzone
+updserial_man=1
+largezones=0
+rndc_cmd=rndc
+allow_long=0
+spf_record=0
 allow_underscore=1
+records_order=0
+updserial_def=0
+updserial_on=1
+keygen=dnssec-keygen
+force_random=0
+slave_dir=/var/lib/bind
+soa_style=0
+relative_paths=0
 by_view=0
-named_conf=/etc/bind/named.conf
-rev_must=0
 master_dir=/var/lib/bind
+ipv6_mode=1
+support_aaaa=1
+pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
+dnssec_info=1
+other_slaves=1
+checkzone=named-checkzone
+no_pid_chroot=0
+confirm_rec=0
+show_list=0
+allow_comments=0
 whois_cmd=whois
+confirm_zone=1
+zones_file=/etc/bind/named.conf.local
 no_chroot=0
-updserial_on=1
-max_zones=50
-dnssec_info=1
+rndcconf_cmd=rndc-confgen
 allow_wild=1
-allow_long=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
+reversezonefilename_format=ZONE.rev
+named_path=/usr/sbin/named
+master_ttl=1
+short_names=0
+rev_must=0
diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config
index 2ab4c6af1..02cf5b24f 100644
--- a/webmin/cluster-passwd/config
+++ b/webmin/cluster-passwd/config
@@ -1,3 +1,3 @@
-input_type=0
 sort_mode=0
+input_type=0
 max_users=200
diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config
index 55c404f0e..f82119fb5 100644
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
-conf_allow_refresh=1
-conf_find_group=1
-conf_host_links=1
 conf_add_user=1
-sort_mode=0
-conf_find_user=1
 conf_add_group=1
+conf_allow_refresh=1
+sort_mode=0
 conf_allow_sync=1
+conf_host_links=1
+conf_find_user=1
 table_mode=0
+conf_find_group=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 f5afe06df..b20881cd4 100644
--- a/webmin/config
+++ b/webmin/config
@@ -1,32 +1,32 @@
-real_os_version=18.04.1
-passwd_mindex=4
-referers_none=1
-ld_env=LD_LIBRARY_PATH
-sysinfo=0
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+lang_root=de.UTF-8
+feedback_to=
+log=1
+product=webmin
+help_height=
+dateformat=dd/mon/yyyy
 by_view=0
-showlogin=0
-real_os_type=Ubuntu Linux
 lang=en.UTF-8
-help_height=
-feedback_to=
-passwd_file=/etc/shadow
-os_version=9.0
-hostnamedisplay=
+ld_env=LD_LIBRARY_PATH
+real_os_version=18.04.1
+passwd_pindex=1
+referers_none=1
+theme=authentic-theme
+hostnamemode=0
 os_type=debian-linux
+real_os_type=Ubuntu Linux
+help_width=
 passwd_uindex=0
+sysinfo=0
+showlogin=0
 tempdelete_days=7
-log=1
-md5pass=1
-dateformat=dd/mon/yyyy
-webprefix=
-lang_root=de.UTF-8
-passwd_cindex=2
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
 showhost=0
+passwd_cindex=2
+hostnamedisplay=
+passwd_file=/etc/shadow
 nofeedbackcc=0
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-theme=authentic-theme
-product=webmin
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-hostnamemode=0
-passwd_pindex=1
-help_width=
+webprefix=
+os_version=9.0
+passwd_mindex=4
+md5pass=1
diff --git a/webmin/cpan/config b/webmin/cpan/config
index da9235abb..38e7be8a3 100644
--- a/webmin/cpan/config
+++ b/webmin/cpan/config
@@ -1,6 +1,6 @@
-incyum=1
-refresh_days=30
-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
+incyum=1
+packages=http://www.cpan.org/modules/02packages.details.txt.gz
diff --git a/webmin/cron/config b/webmin/cron/config
index 2feb512cc..df378f10a 100644
--- a/webmin/cron/config
+++ b/webmin/cron/config
@@ -1,25 +1,25 @@
-cron_edit_command=crontab -u USER -e
-kill_subs=0
+hourly_only=0
+max_len=80
 run_parts=run-parts
-cron_get_command=crontab -u USER -l
+cron_deny_all=2
+max_jobs=100
+cron_deny_file=/var/spool/cron/deny
+cron_allow_file=/var/spool/cron/allow
+cron_delete_command=crontab -u USER -r
+cronfiles_dir=/etc/cron.d
+cron_input=1
+cron_user_get_command=crontab -l
+cron_dir=/var/spool/cron/crontabs
+kill_subs=0
 show_run=0
-vixie_cron=1
-cron_user_delete_command=crontab -r
 show_time=0
-match_user=1
-show_comment=0
-cron_deny_file=/var/spool/cron/deny
-cron_deny_all=2
+cron_get_command=crontab -u USER -l
 show_next=0
+match_mode=0
 cron_user_edit_command=crontab -e
-hourly_only=0
-cron_input=1
+vixie_cron=1
+cron_user_delete_command=crontab -r
+show_comment=0
+cron_edit_command=crontab -u USER -e
 system_crontab=/etc/crontab
-cronfiles_dir=/etc/cron.d
-match_mode=0
-max_len=80
-cron_dir=/var/spool/cron/crontabs
-cron_user_get_command=crontab -l
-cron_delete_command=crontab -u USER -r
-max_jobs=100
-cron_allow_file=/var/spool/cron/allow
+match_user=1
diff --git a/webmin/custom/config b/webmin/custom/config
index acfbdcae2..6d0b22ef3 100644
--- a/webmin/custom/config
+++ b/webmin/custom/config
@@ -1,4 +1,4 @@
-params_file=0
 display_mode=0
-columns=2
 params_cmd=0
+columns=2
+params_file=0
diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index 2434e23d9..13cbcca95 100644
--- a/webmin/dhcpd/config
+++ b/webmin/dhcpd/config
@@ -1,17 +1,17 @@
-group_name=0
-pid_file=/var/run/dhcpd.pid
-interfaces_type=debian
-dhcpd_path=/usr/sbin/dhcpd
-lease_vendor=0
-dhcpd_nocols=5
+start_cmd=service isc-dhcp-server start
+lease_file=/var/lib/dhcp/dhcpd.leases
+dhcpd_conf=/etc/dhcp/dhcpd.conf
 lease_sort=0
-lease_tz=0
+lease_vendor=0
 show_ip=0
-dhcpd_conf=/etc/dhcp/dhcpd.conf
 display_max=100
-lease_file=/var/lib/dhcp/dhcpd.leases
-desc_name=0
-start_cmd=service isc-dhcp-server start
+pid_file=/var/run/dhcpd.pid
 restart_cmd=service isc-dhcp-server restart
-stop_cmd=service isc-dhcp-server stop
+interfaces_type=debian
+lease_tz=0
+dhcpd_nocols=5
 show_mac=0
+stop_cmd=service isc-dhcp-server stop
+dhcpd_path=/usr/sbin/dhcpd
+desc_name=0
+group_name=0
diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index dd7cbf11c..2c130e983 100644
--- a/webmin/dovecot/config
+++ b/webmin/dovecot/config
@@ -1,4 +1,4 @@
-dovecot_config=/etc/dovecot/dovecot.conf
+pid_file=/var/run/dovecot/master.pid
 dovecot=/usr/sbin/dovecot
 init_script=dovecot
-pid_file=/var/run/dovecot/master.pid
+dovecot_config=/etc/dovecot/dovecot.conf
diff --git a/webmin/exim/config b/webmin/exim/config
index 381a482a5..22de02062 100644
--- a/webmin/exim/config
+++ b/webmin/exim/config
@@ -1,8 +1,8 @@
-exim_virt_dir=/etc/exim4/aliases
-mail_system=1
-exim_dbmext=.dbm
+exim_addrfile=/etc/exim4/email-addresses
 exim_dir=/etc/exim4
+mail_system=1
 exim_aliasfileext=
-exim_mail_file=Maildir
+exim_dbmext=.dbm
 exim_dbmfile=/etc/exim4/local_domains
-exim_addrfile=/etc/exim4/email-addresses
+exim_virt_dir=/etc/exim4/aliases
+exim_mail_file=Maildir
diff --git a/webmin/exports/config b/webmin/exports/config
index d23f7b7df..8f8b567ee 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
+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 0025be87b..6b240d5ac 100644
--- a/webmin/fail2ban/config
+++ b/webmin/fail2ban/config
@@ -1,4 +1,4 @@
-client_cmd=/usr/bin/fail2ban-client
 config_dir=/etc/fail2ban
+client_cmd=/usr/bin/fail2ban-client
 init_script=fail2ban
 server_cmd=/usr/bin/fail2ban-server
diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config
index 4d11b9f42..00a9f6dbf 100644
--- a/webmin/fetchmail/config
+++ b/webmin/fetchmail/config
@@ -1,6 +1,6 @@
-config_file=
+max_users=400
 daemon_user=root
-fetchmail_path=fetchmail
+config_file=
 view_mode=0
-max_users=400
 pid_file=/var/run/fetchmail.pid
+fetchmail_path=fetchmail
diff --git a/webmin/filter/config b/webmin/filter/config
index f961b46de..30615aada 100644
--- a/webmin/filter/config
+++ b/webmin/filter/config
@@ -1,6 +1,6 @@
 alias_files=/etc/aliases	/etc/postfix/aliases	/etc/mail/aliases
+virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
 virtualmin_config=/etc/webmin/virtual-server
+reply_force=0
 forward_procmail=0
 warn_procmail=1
-virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
-reply_force=0
diff --git a/webmin/firewall/config b/webmin/firewall/config
index 4729c399e..a02e2c43a 100644
--- a/webmin/firewall/config
+++ b/webmin/firewall/config
@@ -1,6 +1,6 @@
-force_init=0
 comment_mod=0
 cluster_mode=1
-view_condition=1
+force_init=0
 view_comment=0
+view_condition=1
 direct=0
diff --git a/webmin/firewall6/config b/webmin/firewall6/config
index 2e13e3ab7..5c1f27174 100644
--- a/webmin/firewall6/config
+++ b/webmin/firewall6/config
@@ -1,6 +1,6 @@
-view_condition=1
-cluster_mode=1
 direct=0
 view_comment=0
 force_init=0
+view_condition=1
+cluster_mode=1
 comment_mod=0
diff --git a/webmin/fsdump/config b/webmin/fsdump/config
index b9d0f0b35..f6e0efca7 100644
--- a/webmin/fsdump/config
+++ b/webmin/fsdump/config
@@ -1,7 +1,7 @@
 always_tar=0
 webmin_subs=0
+run_mode=0
+nonewtape=0
+date_subs=0
 simple_sched=0
 error_email=0
-date_subs=0
-nonewtape=0
-run_mode=0
diff --git a/webmin/grub/config b/webmin/grub/config
index 084704907..2bb2e4e49 100644
--- a/webmin/grub/config
+++ b/webmin/grub/config
@@ -1,3 +1,3 @@
+grub_path=grub
 install=(hd0)
 menu_file=/boot/grub/menu.lst
-grub_path=grub
diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config
index e2a720765..5e2f0f025 100644
--- a/webmin/heartbeat/config
+++ b/webmin/heartbeat/config
@@ -1,15 +1,15 @@
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
 stop_cmd=/etc/init.d/heartbeat stop
-ha_cf=
-start_cmd=/etc/init.d/heartbeat start
+ha_dir=/etc/ha.d
+haresources=
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+authkeys=
 serials=/dev/ttyS*
+apply_cmd=/etc/init.d/heartbeat reload
 alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
-req_resource_cmd=/usr/lib/heartbeat/req_resource
-heartbeat=/usr/lib/heartbeat/heartbeat
-haresources=
 alt_haresources=/usr/share/doc/packages/heartbeat/haresources
-apply_cmd=/etc/init.d/heartbeat reload
 resource_d=
-authkeys=
+start_cmd=/etc/init.d/heartbeat start
 pid_file=/var/run/heartbeat.pid
-ha_dir=/etc/ha.d
+heartbeat=/usr/lib/heartbeat/heartbeat
+req_resource_cmd=/usr/lib/heartbeat/req_resource
+ha_cf=
diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config
index d8eb45226..c3a636d54 100644
--- a/webmin/htaccess-htpasswd/config
+++ b/webmin/htaccess-htpasswd/config
@@ -1,8 +1,8 @@
-sort=0
-htpasswd=.htpasswd
-extra_directives=
 sha1=0
-digest=1
 htgroups=.htgroups
+extra_directives=
+digest=1
+htpasswd=.htpasswd
 htaccess=.htaccess
 md5=1
+sort=0
diff --git a/webmin/idmapd/config b/webmin/idmapd/config
index d6cd4227f..f32798d4d 100644
--- a/webmin/idmapd/config
+++ b/webmin/idmapd/config
@@ -1,3 +1,3 @@
+idmapd_path=/usr/sbin/rpc.idmapd
 idmapd_conf=/etc/idmapd.conf
 restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
-idmapd_path=/usr/sbin/rpc.idmapd
diff --git a/webmin/inetd/config b/webmin/inetd/config
index 439b34f2b..1473c95c2 100644
--- a/webmin/inetd/config
+++ b/webmin/inetd/config
@@ -1,16 +1,16 @@
 extended_inetd=1
-rpc_inetd=1
-deny_file=/etc/hosts.deny
-services_file=/etc/services
 ipv6=0
-qm_mode=0
+rpc_protocols=tcp udp
 sort_mode=0
-show_empty=1
 restart_command=killall -HUP inetd
-protocols_file=/etc/protocols
-rpc_file=/etc/rpc
-rpc_protocols=tcp udp
 display_max=100
-allow_file=/etc/hosts.allow
+deny_file=/etc/hosts.deny
+qm_mode=0
+rpc_inetd=1
 tcpd_path=/usr/sbin/tcpd
+show_empty=1
+protocols_file=/etc/protocols
 inetd_conf_file=/etc/inetd.conf
+allow_file=/etc/hosts.allow
+rpc_file=/etc/rpc
+services_file=/etc/services
diff --git a/webmin/init/config b/webmin/init/config
index bc46ded79..8ef7dd80a 100644
--- a/webmin/init/config
+++ b/webmin/init/config
@@ -1,17 +1,17 @@
-no_chkconfig=0
-reboot_command=reboot
-inittab_id=id
 sort_mode=0
-expert=0
+desc=1
 init_dir=/etc/init.d
-order_digits=2
-status_check=0
-show_opts=0
-soft_links=1
-boot_levels=2 3 5
 shutdown_command=poweroff
+boot_levels=2 3 5
+show_opts=0
+inittab_id=id
 order=0
-init_info=1
 atboot_product=webmin
-desc=1
+expert=0
 init_base=/etc/
+soft_links=1
+init_info=1
+no_chkconfig=0
+status_check=0
+reboot_command=reboot
+order_digits=2
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 2f48c2f71..d7012f35a 100644
--- a/webmin/ipfilter/config
+++ b/webmin/ipfilter/config
@@ -1,9 +1,9 @@
+view_comment=0
+ipf=ipf
 view_condition=1
-cluster_mode=0
+cluster_nat=1
 ipfstat=ipfstat
 ipnat=ipnat
-ipf=ipf
-cluster_nat=1
-ipnat_conf=/etc/ipf/ipnat.conf
-view_comment=0
 ipf_conf=/etc/ipf/ipf.conf
+cluster_mode=0
+ipnat_conf=/etc/ipf/ipnat.conf
diff --git a/webmin/ipfw/config b/webmin/ipfw/config
index 15cb78cd7..dedab80b7 100644
--- a/webmin/ipfw/config
+++ b/webmin/ipfw/config
@@ -1,6 +1,6 @@
-version=2
 view_condition=1
-cluster_mode=0
-ipfw=/sbin/ipfw
 view_counters=0
 view_comment=0
+ipfw=/sbin/ipfw
+version=2
+cluster_mode=0
diff --git a/webmin/ipsec/config b/webmin/ipsec/config
index 8b2781d0c..cf7d2de26 100644
--- a/webmin/ipsec/config
+++ b/webmin/ipsec/config
@@ -1,8 +1,8 @@
-logfile=/var/log/messages
-ipsec=/usr/sbin/ipsec
-secrets=/etc/ipsec.secrets
-start_cmd=/etc/init.d/ipsec start
 restart_cmd=/etc/init.d/ipsec restart
 policies_dir=/etc/ipsec.d/policies
-stop_cmd=/etc/init.d/ipsec stop
+secrets=/etc/ipsec.secrets
+ipsec=/usr/sbin/ipsec
 file=/etc/ipsec.conf
+start_cmd=/etc/init.d/ipsec start
+stop_cmd=/etc/init.d/ipsec stop
+logfile=/var/log/messages
diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config
index 86cc9f702..b96fd28d6 100644
--- a/webmin/iscsi-client/config
+++ b/webmin/iscsi-client/config
@@ -1,6 +1,6 @@
-initiator_file=/etc/iscsi/initiatorname.iscsi
 config_file=/etc/iscsi/iscsid.conf
-iscsiadm=iscsiadm
 ifaces_dir=/var/lib/iscsi/ifaces
 init_name=open-iscsi
 iscsiiname=iscsi-iname
+initiator_file=/etc/iscsi/initiatorname.iscsi
+iscsiadm=iscsiadm
diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index ce0f9fa80..98fae4f09 100644
--- a/webmin/iscsi-server/config
+++ b/webmin/iscsi-server/config
@@ -1,6 +1,6 @@
-pid_file=/var/run/iscsi-target.pid
+opts_file=/etc/sysconfig/netbsd-iscsi
 init_name=netbsd-iscsi
-auths_file=/etc/iscsi/auths
 targets_file=/etc/iscsi/targets
+auths_file=/etc/iscsi/auths
 iscsi_server=/usr/sbin/iscsi-target
-opts_file=/etc/sysconfig/netbsd-iscsi
+pid_file=/var/run/iscsi-target.pid
diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config
index 316f34ea3..bdbc6a6ee 100644
--- a/webmin/iscsi-target/config
+++ b/webmin/iscsi-target/config
@@ -1,7 +1,7 @@
-init_name=iscsitarget
-pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
 opts_file=/etc/default/iscsitarget
 config_file=/etc/iet/ietd.conf
-ietadm=ietadm
 initiators_file=/etc/iet/initiators.allow
+ietadm=ietadm
 targets_file=/etc/iet/targets.allow
+init_name=iscsitarget
+pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config
index 32ef099ea..7bc34bff3 100644
--- a/webmin/iscsi-tgtd/config
+++ b/webmin/iscsi-tgtd/config
@@ -1,5 +1,5 @@
-tgtadm=tgtadm
-init_name=tgtd
 tgtd=tgtd
+init_name=tgtd
 tgtadmin=tgt-admin
 config_file=/etc/tgt/targets.conf
+tgtadm=tgtadm
diff --git a/webmin/jabber/config b/webmin/jabber/config
index 846252cf8..c0fd4a355 100644
--- a/webmin/jabber/config
+++ b/webmin/jabber/config
@@ -1,5 +1,5 @@
-start_cmd=/etc/init.d/jabberd start
 jabber_daemon=/usr/sbin/jabberd
-jabber_config=/etc/jabber/jabber.xml
-jabber_dir=/var/lib/jabber
 stop_cmd=/etc/init.d/jabberd stop
+jabber_dir=/var/lib/jabber
+start_cmd=/etc/init.d/jabberd start
+jabber_config=/etc/jabber/jabber.xml
diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config
index 55d1e7111..d45286770 100644
--- a/webmin/ldap-client/config
+++ b/webmin/ldap-client/config
@@ -1,3 +1,3 @@
 secret=/etc/ldap.secret
-init_name=nslcd
 auth_ldap=/etc/ldap.conf
+init_name=nslcd
diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index b9727ffde..48ba61309 100644
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
-attr_count=6
+apply_cmd=/etc/init.d/slapd restart
+start_cmd=/etc/init.d/slapd start
+ldap_user=openldap
+schema_dir=/etc/ldap/schema
+init_name=slapd
 stop_cmd=/etc/init.d/slapd stop
 config_file=/etc/ldap/slapd.d
-schema_dir=/etc/ldap/schema
+attr_count=6
 slapd=slapd
-ldap_user=openldap
-apply_cmd=/etc/init.d/slapd restart
-init_name=slapd
 browse_max=100
-start_cmd=/etc/init.d/slapd start
diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config
index f4450b6dd..61dd0c2eb 100644
--- a/webmin/ldap-useradmin/config
+++ b/webmin/ldap-useradmin/config
@@ -1,24 +1,24 @@
-samba_def=0
-person=1
+alias_same=0
+other_class=inetOrgPerson
+shells=fixed,ldap,passwd,shells
 secmode=0
+imap_foldersep=.
+gecos=1
+auth_ldap=/etc/ldap.conf
+person=1
+given=0
+samba_gclass=sambaGroup
+md5=0
+multi_fields=0
 given_order=0
+slappasswd=slappasswd
+quota_support=0
+ldap_tls=0
 imap_class=SuSEeMailObject
-auth_ldap=/etc/ldap.conf
-imap_folders=old	public	sent-mail
+imap_login=cyrus
 samba_class=sambaSamAccount
-multi_fields=0
+samba_def=0
 membox=0
-quota_support=0
-md5=0
-samba_gclass=sambaGroup
-shells=fixed,ldap,passwd,shells
-other_class=inetOrgPerson
 imap_def=0
-slappasswd=slappasswd
-given=0
-imap_login=cyrus
-gecos=1
-alias_same=0
-ldap_tls=0
-imap_foldersep=.
+imap_folders=old	public	sent-mail
 mailfmt=0
diff --git a/webmin/logrotate/config b/webmin/logrotate/config
index 901f855de..89a1a0d84 100644
--- a/webmin/logrotate/config
+++ b/webmin/logrotate/config
@@ -1,4 +1,4 @@
+sort_mode=0
 logrotate=logrotate
 add_file=/etc/logrotate.d
-sort_mode=0
 logrotate_conf=/etc/logrotate.conf
diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config
index 1c9c8185a..49ff60590 100644
--- a/webmin/lpadmin/config
+++ b/webmin/lpadmin/config
@@ -1,17 +1,17 @@
-sort_mode=0
-driver_style=cups
-show_status=0
-gs_fontpath=
-smbclient_path=smbclient
-gs_path=gs
 iface_owner=lp:lp
-stop_cmd=/etc/init.d/cupsys stop
 iface_perms=755
+stop_cmd=/etc/init.d/cupsys stop
+driver_style=cups
 print_style=cups
-start_cmd=/etc/init.d/cupsys start
-display_mode=0
 model_path=/usr/share/foomatic/db /usr/share/ppd
-iface_arg=
-gs_lib=
+smbclient_path=smbclient
+sort_mode=0
+start_cmd=/etc/init.d/cupsys start
+show_status=0
+gs_fontpath=
+gs_path=gs
 show_jobs=0
+gs_lib=
 spool_dir=/var/spool/cups
+display_mode=0
+iface_arg=
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 2108534fb..fe0743e7b 100644
--- a/webmin/mailboxes/config
+++ b/webmin/mailboxes/config
@@ -1,52 +1,52 @@
-noindex_hostname=0
-ignore_users_enabled=0
-view_html=0
-sync_delete=1
+sync_perms=0700
+column_count=4
+spam_del=0
+check_mod=1
 mailbox_user=.usermin/mailbox
-sync_create=0
-open_mode=0
-show_size=1
+no_crlf=0
+show_mail=0
 html_edit=0
-sync_modify=1
-spam_del=0
-html_quote=0
-show_size_below=0
-no_orig_ip=0
-show_body=0
-no_mailer=0
-mail_file=Mailbox
+wrap_width=80
+link_mode=0
+mail_usermin=mail
+date_fmt=dmy
+spam_buttons=mail
+top_buttons=2
 mail_system=3
+auto=1
 sig_file=*
-sort_mode=1
+vpopmail_dir=/home/vpopmail
+perpage=20
+show_size=1
+view_html=0
+fwd_mode=0
 show_unread=0
-delete_warn=y
-size_mode=1
-auto=1
-arrows=1
 ignore_users=
-show_to=0
+sync_delete=1
+no_orig_ip=0
+arrows=1
+show_body=0
+log_read=0
+mail_file=Mailbox
+size_mode=1
 mail_dir=Maildir
 track_read=0
+show_size_below=0
+sync_create=0
+maildir_deleted=0
+ignore_users_enabled=0
 show_delall=0
-link_mode=0
-check_mod=1
-log_read=0
-date_fmt=dmy
+spam_report=
+from_virtualmin=1
+noindex_hostname=0
+max_records=200
+sort_mode=1
+show_to=0
 mail_style=0
-maildir_deleted=0
-spam_buttons=mail
-fwd_mode=0
-sync_perms=0700
+delete_warn=y
+no_mailer=0
+sync_modify=1
+html_quote=0
+open_mode=0
 show_sent=0
-column_count=4
 show_count=0
-top_buttons=2
-wrap_width=80
-vpopmail_dir=/home/vpopmail
-from_virtualmin=1
-perpage=20
-show_mail=0
-mail_usermin=mail
-max_records=200
-spam_report=
-no_crlf=0
diff --git a/webmin/man/config b/webmin/man/config
index 315af208b..dc072e208 100644
--- a/webmin/man/config
+++ b/webmin/man/config
@@ -1,9 +1,9 @@
-man_cmd_sect=man SECTION PAGE
-list_cmd_sect=man -w SECTION PAGE
+man2html_path=man2html
 man_cmd=man PAGE
-search_cmd=man -k PAGE
-man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
 doc_dir=/usr/share/doc
+list_cmd_sect=man -w SECTION PAGE
 list_cmd=man -w PAGE
-man2html_path=man2html
+search_cmd=man -k PAGE
+man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
+man_cmd_sect=man SECTION PAGE
 kernel_dir=/usr/src/linux/Documentation
diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index 1a2f2b389..d8179dc77 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.981
+server=MiniServ/1.983
diff --git a/webmin/mon/config b/webmin/mon/config
index 3b23f434c..b435eb76e 100644
--- a/webmin/mon/config
+++ b/webmin/mon/config
@@ -1,7 +1,7 @@
+cfbasedir=/etc/mon
 start_cmd=/etc/init.d/mon start
-restart_cmd=/etc/init.d/mon restart
 mon_cgi=/var/www/cgi-bin/mon.cgi
 stop_cmd=/etc/init.d/mon stop
-cfbasedir=/etc/mon
 monshow=/usr/bin/monshow
 pid_file=/var/run/mon.pid
+restart_cmd=/etc/init.d/mon restart
diff --git a/webmin/mount/config b/webmin/mount/config
index cd80d6932..fbe35f717 100644
--- a/webmin/mount/config
+++ b/webmin/mount/config
@@ -1,10 +1,10 @@
-nfs_check=1
+sysinfo=1
+autofs_file=/etc/auto.master
+auto_file=/etc/am-utils/amd.conf
 show_used=1
 fstab_file=/etc/fstab
-sort_mode=2
-auto_file=/etc/am-utils/amd.conf
+long_fstypes=1
 smbclient_path=smbclient
-autofs_file=/etc/auto.master
-sysinfo=1
+sort_mode=2
 nmblookup_path=nmblookup
-long_fstypes=1
+nfs_check=1
diff --git a/webmin/mysql/config b/webmin/mysql/config
index 2973c65f4..2d14e9bad 100644
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -1,23 +1,23 @@
-mysqladmin=/usr/bin/mysqladmin
+mysql=/usr/bin/mysql
 mysqlshow=/usr/bin/mysqlshow
+blob_mode=0
+login=root
+mysql_libs=/usr/local/mysql/lib
 max_dbs=50
-style=0
-mysql_data=/var/lib/mysql
-passwd_mode=0
+date_subs=0
+stop_cmd=service mysql stop
+max_text=1000
 my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
-mysql_libs=/usr/local/mysql/lib
 mysqlimport=/usr/bin/mysqlimport
-blob_mode=0
-login=root
+passwd_mode=0
+mysql_data=/var/lib/mysql
+start_cmd=service mysql start
 perpage=25
+style=0
+mysqladmin=/usr/bin/mysqladmin
+add_mode=1
+mysqldump=/usr/bin/mysqldump
+webmin_subs=0
 nodbi=0
 access=*: *
-start_cmd=service mysql start
-max_text=1000
-date_subs=0
-mysqldump=/usr/bin/mysqldump
-add_mode=1
-mysql=/usr/bin/mysql
 nopwd=0
-webmin_subs=0
-stop_cmd=service mysql stop
diff --git a/webmin/mysql/version b/webmin/mysql/version
index 2f6b6823f..7f1529f4e 100644
--- a/webmin/mysql/version
+++ b/webmin/mysql/version
@@ -1 +1 @@
-8.0.26-0ubuntu0
+8.0.27-0ubuntu0
diff --git a/webmin/net/config b/webmin/net/config
index 04c0295d5..56c61c18e 100644
--- a/webmin/net/config
+++ b/webmin/net/config
@@ -1,2 +1,2 @@
-def_netmask=255.255.255.0
 hosts_file=/etc/hosts
+def_netmask=255.255.255.0
diff --git a/webmin/nis/config b/webmin/nis/config
index 88bb4ded0..7ef8b7e54 100644
--- a/webmin/nis/config
+++ b/webmin/nis/config
@@ -1,5 +1,5 @@
+nsswitch_conf=/etc/nsswitch.conf
 max_size=100
-manual_build=0
 securenets=/etc/ypserv.securenets
 client_conf=/etc/yp.conf
-nsswitch_conf=/etc/nsswitch.conf
+manual_build=0
diff --git a/webmin/openslp/config b/webmin/openslp/config
index a54a2b2b8..d422f0269 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_conf=/etc/slp.conf
-slpd_pid=/var/run/slpd.pid
 slpd_reg=/etc/slp.reg
diff --git a/webmin/pam/config b/webmin/pam/config
index 2d867ee25..b3d9581d6 100644
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
-lib_dirs=/lib/security /lib/*/security
-pam_dir=/etc/pam.d
 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
+lib_dirs=/lib/security /lib/*/security
 ignore=README
diff --git a/webmin/pap/config b/webmin/pap/config
index 172fbca7b..d0ca6c837 100644
--- a/webmin/pap/config
+++ b/webmin/pap/config
@@ -1,8 +1,8 @@
-pppd=pppd
 mgetty=mgetty
-login_config=/etc/mgetty+sendfax/login.config
-dialin_config=/etc/mgetty+sendfax/dialin.config
 encrypt_pass=0
 ppp_options=/etc/ppp/options
-pap_file=/etc/ppp/pap-secrets
+login_config=/etc/mgetty+sendfax/login.config
+dialin_config=/etc/mgetty+sendfax/dialin.config
 serials=/dev/ttyS[0-9]*
+pap_file=/etc/ppp/pap-secrets
+pppd=pppd
diff --git a/webmin/postfix/config b/webmin/postfix/config
index ef16209f6..4beebaee4 100644
--- a/webmin/postfix/config
+++ b/webmin/postfix/config
@@ -1,29 +1,29 @@
-index_check=1
-mailq_count=0
-show_cmts=0
-postfix_queue_command=postqueue
-wrap_width=80
-top_buttons=1
-postfix_newaliases_command=/usr/bin/newaliases
-columns=2
 fwd_mode=0
-mailq_dir=/var/spool/postfix
-check_config=1
+postfix_control_command=/usr/sbin/postfix
+mailq_count=0
+postfix_aliases_table_command=/usr/sbin/postalias
+sort_mode=0
+postfix_lookup_table_command=/usr/sbin/postmap
 perpage=20
+postfix_config_command=/usr/sbin/postconf
+prefix_cmts=0
+delete_warn=1
+check_config=1
+top_buttons=1
+max_records=200
 postfix_super_command=/usr/sbin/postsuper
-postfix_config_file=/etc/postfix/main.cf
-postfix_lookup_table_command=/usr/sbin/postmap
-delete_confirm=1
-mailq_cmd=postqueue -p
+postcat_cmd=/usr/sbin/postcat
+postfix_master=/etc/postfix/master.cf
+wrap_width=80
 max_maps=100
 ldap_doms=0
-postfix_master=/etc/postfix/master.cf
-postfix_aliases_table_command=/usr/sbin/postalias
-max_records=200
-prefix_cmts=0
-postfix_config_command=/usr/sbin/postconf
-postcat_cmd=/usr/sbin/postcat
-delete_warn=1
-sort_mode=0
-postfix_control_command=/usr/sbin/postfix
+index_check=1
+postfix_newaliases_command=/usr/bin/newaliases
+mailq_dir=/var/spool/postfix
+show_cmts=0
 mailq_sort=0
+postfix_queue_command=postqueue
+delete_confirm=1
+columns=2
+postfix_config_file=/etc/postfix/main.cf
+mailq_cmd=postqueue -p
diff --git a/webmin/postgresql/config b/webmin/postgresql/config
index f07586613..126d1226c 100644
--- a/webmin/postgresql/config
+++ b/webmin/postgresql/config
@@ -1,24 +1,24 @@
-pid_file=/var/run/postmaster.pid
-plib=
-access_own=0
+dump_cmd=/usr/bin/pg_dump
 rstr_cmd=/usr/bin/pg_restore
+stop_cmd=/etc/init.d/postgresql* stop
 max_text=1000
-date_subs=0
-psql=/usr/bin/psql
-add_mode=1
+blob_mode=0
+login=postgres
 simple_sched=0
-webmin_subs=0
-stop_cmd=/etc/init.d/postgresql* stop
-sameunix=1
-style=0
+date_subs=0
+basedb=template1
 max_dbs=50
-hba_conf=/etc/postgresql/*/main/pg_hba.conf
+plib=
+access_own=0
 pass=
-dump_cmd=/usr/bin/pg_dump
-basedb=template1
-blob_mode=0
-login=postgres
-perpage=25
-start_cmd=/etc/init.d/postgresql* start
+webmin_subs=0
+psql=/usr/bin/psql
 nodbi=0
 access=*: *
+sameunix=1
+perpage=25
+start_cmd=/etc/init.d/postgresql* start
+style=0
+pid_file=/var/run/postmaster.pid
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
+add_mode=1
diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config
index 5fd0f800c..237c75238 100644
--- a/webmin/ppp-client/config
+++ b/webmin/ppp-client/config
@@ -1,3 +1,3 @@
+wvdial=wvdial
 wvdialconf=wvdialconf
 file=/etc/wvdial.conf
-wvdial=wvdial
diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config
index 9c34fb084..4004e3f7f 100644
--- a/webmin/pptp-client/config
+++ b/webmin/pptp-client/config
@@ -1,5 +1,5 @@
-pptp=pptp
 timeout=30
+pap_file=/etc/ppp/chap-secrets
+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 e522fe651..43f163360 100644
--- a/webmin/pptp-server/config
+++ b/webmin/pptp-server/config
@@ -1,9 +1,9 @@
-pid_file=/var/run/pptpd.pid
-pptpd=pptpd
 pptp_ppp_options=/etc/ppp/pptpd-options
-ppp_options=/etc/ppp/options
-pap_file=/etc/ppp/chap-secrets
 start_cmd=/etc/init.d/pptpd start
-log_file=/var/log/messages
-stop_cmd=/etc/init.d/pptpd stop
 file=/etc/pptpd.conf
+stop_cmd=/etc/init.d/pptpd stop
+log_file=/var/log/messages
+ppp_options=/etc/ppp/options
+pptpd=pptpd
+pap_file=/etc/ppp/chap-secrets
+pid_file=/var/run/pptpd.pid
diff --git a/webmin/proc/config b/webmin/proc/config
index b8226c2a4..3ecab3230 100644
--- a/webmin/proc/config
+++ b/webmin/proc/config
@@ -1,6 +1,6 @@
-hide_self=1
-trace_java=0
 base_ppid=1
+trace_java=0
+ps_style=linux
 default_mode=last
 cut_length=80
-ps_style=linux
+hide_self=1
diff --git a/webmin/procmail/config b/webmin/procmail/config
index 5dae99ba1..71541070b 100644
--- a/webmin/procmail/config
+++ b/webmin/procmail/config
@@ -1,3 +1,3 @@
-procmail=procmail
 includes=0
+procmail=procmail
 procmailrc=/etc/procmailrc
diff --git a/webmin/proftpd/config b/webmin/proftpd/config
index 408919c90..29f6376e4 100644
--- a/webmin/proftpd/config
+++ b/webmin/proftpd/config
@@ -1,9 +1,9 @@
-test_always=0
-pid_file=/var/run/proftpd.pid
+test_config=1
 proftpd_conf=/etc/proftpd/proftpd.conf
-ftpusers=/etc/ftpusers
 start_cmd=/etc/init.d/proftpd start
-proftpd_path=/usr/sbin/proftpd
 stop_cmd=/etc/init.d/proftpd stop
+proftpd_path=/usr/sbin/proftpd
 test_manual=0
-test_config=1
+ftpusers=/etc/ftpusers
+test_always=0
+pid_file=/var/run/proftpd.pid
diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config
index e42ea83a9..44998a8dd 100644
--- a/webmin/qmailadmin/config
+++ b/webmin/qmailadmin/config
@@ -1,14 +1,14 @@
+mail_system=1
+mail_file=Mailbox
+max_records=200
+mailq_sort=0
+qmail_dir=/var/qmail
+columns=2
+fwd_mode=0
 mailq_count=0
-perpage=20
-index_min=1000000
 mail_dir_qmail=Maildir
 mail_dir=
-qmail_dir=/var/qmail
-columns=2
-max_records=200
-delete_warn=1
 sort_mode=0
-mailq_sort=0
-mail_file=Mailbox
-fwd_mode=0
-mail_system=1
+perpage=20
+delete_warn=1
+index_min=1000000
diff --git a/webmin/quota/config b/webmin/quota/config
index 67b4b1675..8c8b0a7e7 100644
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
-show_grace=1
+block_mode=1
+quotacheck_command=quotacheck -u -g
 hide_uids=0
-display_max=100
-user_quota_command=quota -v -u
+user_grace_command=edquota -u -t
+group_quota_command=quota -v -g
+sort_mode=0
 group_repquota_command=repquota -g -v
-user_copy_command=edquota -u -p
-user_quotaoff_command=quotaoff -u
-group_quotaoff_command=quotaoff -g
+show_grace=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_quotaon_command=quotaon -g
-group_setquota_command=setquota -g
-block_size=1024
+display_max=100
 user_repquota_command=repquota -u -v
+group_copy_command=edquota -g -p
+user_quotaoff_command=quotaoff -u
+group_setquota_command=setquota -g
+user_quota_command=quota -v -u
+group_edquota_command=edquota -g
+user_setquota_command=setquota -u
 user_edquota_command=edquota -u
-quotacheck_command=quotacheck -u -g
-group_quota_command=quota -v -g
+block_size=1024
 pc_show=1
-block_mode=1
-user_setquota_command=setquota -u
-group_edquota_command=edquota -g
-user_grace_command=edquota -u -t
 group_grace_command=edquota -g -t
-sort_mode=0
+group_quotaoff_command=quotaoff -g
 user_quotaon_command=quotaon -u
-group_copy_command=edquota -g -p
+user_copy_command=edquota -u -p
+group_quotaon_command=quotaon -g
diff --git a/webmin/raid/config b/webmin/raid/config
index 3314566d0..7e973e1af 100644
--- a/webmin/raid/config
+++ b/webmin/raid/config
@@ -1,3 +1,3 @@
 raidtab=/etc/raidtab
-mdadm=/etc/mdadm/mdadm.conf
 mdstat=/proc/mdstat
+mdadm=/etc/mdadm/mdadm.conf
diff --git a/webmin/samba/config b/webmin/samba/config
index 5670aaa1c..af265ef2b 100644
--- a/webmin/samba/config
+++ b/webmin/samba/config
@@ -1,18 +1,18 @@
-smb_passwd=/etc/samba/smbpasswd
-run_from_inetd=0
-sort_mode=0
-smb_conf=/etc/samba/smb.conf
-net=/usr/bin/net
-samba_server=/usr/sbin/smbd
-text_lists=0
 samba_password_program=/usr/bin/smbpasswd
 dont_convert=-499
-name_server=/usr/sbin/nmbd
-list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+text_lists=0
 swat=/usr/sbin/swat
+samba_server=/usr/sbin/smbd
 stop_cmd=service smbd stop ; service nmbd stop
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+samba_status_program=/usr/bin/smbstatus
+pdbedit=/usr/bin/pdbedit
+smbgroupedit=/usr/bin/smbgroupedit
+name_server=/usr/sbin/nmbd
+net=/usr/bin/net
+smb_conf=/etc/samba/smb.conf
+smb_passwd=/etc/samba/smbpasswd
+sort_mode=0
 start_cmd=service smbd start ; service nmbd start
 restart_cmd=service smbd restart ; service nmbd restart
-smbgroupedit=/usr/bin/smbgroupedit
-pdbedit=/usr/bin/pdbedit
-samba_status_program=/usr/bin/smbstatus
+run_from_inetd=0
diff --git a/webmin/sarg/config b/webmin/sarg/config
index 7f6e01c01..94490ca6c 100644
--- a/webmin/sarg/config
+++ b/webmin/sarg/config
@@ -1,4 +1,4 @@
-naked=0
+sarg=sarg
 sarg_conf=/etc/sarg/sarg.conf
+naked=0
 clear=1
-sarg=sarg
diff --git a/webmin/sendmail/config b/webmin/sendmail/config
index c0eefa2b3..35dae77bd 100644
--- a/webmin/sendmail/config
+++ b/webmin/sendmail/config
@@ -1,30 +1,30 @@
-fwd_mode=0
-wrap_width=80
-top_buttons=1
-columns=2
-order_mail=0
-sendmail_mc=/etc/mail/sendmail.mc
-sendmail_features=/usr/share/sendmail/cf
-show_cmts=0
+mail_style=0
+delete_warn=1
+sendmail_command=/usr/lib/sendmail -bd -q1h
+show_to=0
+sort_mode=0
+perpage=20
 sendmail_pid=/var/run/sendmail/mta/sendmail.pid
+prefix_cmts=0
 mailq_count=0
-sendmail_command=/usr/lib/sendmail -bd -q1h
-sendmail_path=/usr/lib/sendmail
-mail_style=0
 sendmail_cf=/etc/mail/sendmail.cf
-mail_file=mbox
+fwd_mode=0
+sendmail_path=/usr/lib/sendmail
+sendmail_mc=/etc/mail/sendmail.mc
 makemap_path=makemap
-delete_warn=1
-sort_mode=0
-mailq_sort=0
-max_records=200
-smrsh_dir=/etc/smrsh
 mailq_show=Date,From,To,Size,Status
-show_to=0
-mail_dir=/var/spool/mail
-prefix_cmts=0
-track_read=0
+max_records=200
+top_buttons=1
+order_mail=0
 index_min=1000000
+track_read=0
+sendmail_features=/usr/share/sendmail/cf
+mail_dir=/var/spool/mail
 mail_type=0
-perpage=20
+wrap_width=80
 delete_confirm=1
+columns=2
+mailq_sort=0
+show_cmts=0
+mail_file=mbox
+smrsh_dir=/etc/smrsh
diff --git a/webmin/servers/config b/webmin/servers/config
index 871dc8bcf..a4ec76b5c 100644
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
-deflink=0
-resolve=1
 display_mode=0
 capath=/usr/share/ca-certificates
+resolve=1
+deffast=2
+show_status=1
 groups_dir=/etc/cluster/groups
-max_servers=100
-scan_time=5
 show_ip=0
-deffast=2
 sort_mode=0
-show_status=1
+scan_time=5
+deflink=0
+max_servers=100
diff --git a/webmin/shorewall/config b/webmin/shorewall/config
index e40988a1d..8ff1c2d22 100644
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
-display_zone_descriptions=1
-shorewall=shorewall
-actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
 macros=/usr/share/shorewall
 config_dir=/etc/shorewall
+display_zone_descriptions=1
+actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
+shorewall=shorewall
diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config
index d0d859976..a9434ece0 100644
--- a/webmin/shorewall6/config
+++ b/webmin/shorewall6/config
@@ -1,5 +1,5 @@
-display_zone_descriptions=1
 actions=/etc/shorewall6/actions	/usr/share/shorewall6/actions.std
-shorewall6=shorewall6
 macros=/usr/share/shorewall6
 config_dir=/etc/shorewall6
+shorewall6=shorewall6
+display_zone_descriptions=1
diff --git a/webmin/smart-status/config b/webmin/smart-status/config
index 24acb0766..fadfec290 100644
--- a/webmin/smart-status/config
+++ b/webmin/smart-status/config
@@ -1,4 +1,4 @@
+smartctl=smartctl
+ata=0
 attribs=1
 mode=1
-ata=0
-smartctl=smartctl
diff --git a/webmin/software/config b/webmin/software/config
index 037d899f3..c93f3edb6 100644
--- a/webmin/software/config
+++ b/webmin/software/config
@@ -1,3 +1,3 @@
 update_system=apt
-apt_mode=0
 package_system=debian
+apt_mode=0
diff --git a/webmin/spam/config b/webmin/spam/config
index fa00ca1d5..8dd12b06d 100644
--- a/webmin/spam/config
+++ b/webmin/spam/config
@@ -1,12 +1,12 @@
-max_awl=200
+call_spam=1
 spamassassin=spamassassin
-procmail_cmd=*
-warn_procmail=1
-local_cf=/etc/spamassassin/local.cf
-addto=0
-mode=0
 restart_cmd=/etc/init.d/spamassassin restart
-processes=spamd amavisd
-sa_learn=sa-learn
 procmailrc=/etc/procmailrc
-call_spam=1
+mode=0
+procmail_cmd=*
+sa_learn=sa-learn
+processes=spamd amavisd
+addto=0
+local_cf=/etc/spamassassin/local.cf
+warn_procmail=1
+max_awl=200
diff --git a/webmin/squid/config b/webmin/squid/config
index 79f9dcdd9..50e6b1009 100644
--- a/webmin/squid/config
+++ b/webmin/squid/config
@@ -1,21 +1,21 @@
-squid_stop=service squid stop
-crypt_conf=0
 sort_conf=0
-log_dir=/var/log/squid
+cal_fmt=w
+calamaris=calamaris
+squid_path=squid
+cal_all=1
+sync_delete=0
+crypt_conf=0
+squidclient=squidclient
+cal_max=50000
+sync_create=0
 squid_start=service squid start
-pid_file=/var/run/squid.pid
 cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+squid_conf=/etc/squid/squid.conf
 cache_dir=/var/spool/squid
+pid_file=/var/run/squid.pid
 sync_modify=1
-squid_conf=/etc/squid/squid.conf
-squidclient=squidclient
-cal_all=1
 restart_pos=0
-calamaris=calamaris
-squid_restart=service squid reload
 cal_args=-aw
-cal_max=50000
-cal_fmt=w
-sync_create=0
-sync_delete=0
-squid_path=squid
+log_dir=/var/log/squid
+squid_stop=service squid stop
+squid_restart=service squid reload
diff --git a/webmin/sshd/config b/webmin/sshd/config
index dc12fd70e..59a500e15 100644
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,11 +1,11 @@
+sshd_path=/usr/sbin/sshd
+sync_pass=0
 client_config=/etc/ssh/ssh_config
+stop_cmd=service ssh stop
 sync_gnupg=0
-pid_file=/var/run/sshd.pid
-sshd_config=/etc/ssh/sshd_config
-sync_pass=0
 start_cmd=service ssh start
-stop_cmd=service ssh stop
 keygen_path=/usr/bin/ssh-keygen
+pid_file=/var/run/sshd.pid
 sync_auth=1
+sshd_config=/etc/ssh/sshd_config
 sync_create=0
-sshd_path=/usr/sbin/sshd
diff --git a/webmin/status/config b/webmin/status/config
index 9763d0c90..87f9fb3a2 100644
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,13 +1,14 @@
+snmp_version=2
 snmp_trap=1.3.6.1.4.1.10000.1.1
-output=0
-index_status=1
-sysinfo_users=0
+subject_mode=0
 sched_offset=0
-snmp_version=2
-history_purge=30
 sort_mode=0
-pager_cmd=sms_client
+output=0
+sysinfo_users=0
+index_status=1
 history_show=50
 sysinfo=0
-subject_mode=0
+pinger=linux
+pager_cmd=sms_client
+history_purge=30
 columns=2
diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config
index 2358ea3eb..0c4bd6a67 100644
--- a/webmin/syslog-ng/config
+++ b/webmin/syslog-ng/config
@@ -1,7 +1,7 @@
+pid_file=/var/run/syslog-ng.pid
+compressed=1
+stop_cmd=/etc/init.d/syslog-ng stop
 start_cmd=/etc/init.d/syslog-ng start
+syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 syslogng_cmd=syslog-ng
 lines=20
-stop_cmd=/etc/init.d/syslog-ng stop
-pid_file=/var/run/syslog-ng.pid
-syslogng_conf=/etc/syslog-ng/syslog-ng.conf
-compressed=1
diff --git a/webmin/syslog/config b/webmin/syslog/config
index 5b0786f14..76f6c26e3 100644
--- a/webmin/syslog/config
+++ b/webmin/syslog/config
@@ -1,19 +1,19 @@
+pri_all=1
+others=1
+lines=20
+tags=0
+facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
+socket=0
+signal_cmd=/usr/sbin/service rsyslog restart
 pid_file=/var/run/rsyslogd.pid
+restart_cmd=/usr/sbin/service rsyslog restart
+m4_conf=0
 compressed=1
-socket=0
 syslogd=/usr/sbin/rsyslogd
+start_cmd=/usr/sbin/service rsyslog start
+reverse=0
 syslog_conf=/etc/rsyslog.conf
 pri_dir=1
-tags=0
-facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
-m4_path=
-pipe=1
-m4_conf=0
-pri_all=1
 sync=1
-reverse=0
-start_cmd=/usr/sbin/service rsyslog start
-restart_cmd=/usr/sbin/service rsyslog restart
-lines=20
-signal_cmd=/usr/sbin/service rsyslog restart
-others=1
+pipe=1
+m4_path=
diff --git a/webmin/telnet/config b/webmin/telnet/config
index a9fa7a3b3..bd4ffb297 100644
--- a/webmin/telnet/config
+++ b/webmin/telnet/config
@@ -1,5 +1,5 @@
 sizemode=0
 no_test=0
-mode=1
-proxy=0
 detach=0
+proxy=0
+mode=1
diff --git a/webmin/time/config b/webmin/time/config
index cc71dbc98..97f47250e 100644
--- a/webmin/time/config
+++ b/webmin/time/config
@@ -1,6 +1,6 @@
-zone_style=linux
-timeserver_hardware=1
-timeserver=0.pool.ntp.org
-lease=5
 seconds=1
+timeserver=0.pool.ntp.org
+timeserver_hardware=1
+zone_style=linux
 ntp_only=1
+lease=5
diff --git a/webmin/updown/config b/webmin/updown/config
index 1e688dff7..f6605280c 100644
--- a/webmin/updown/config
+++ b/webmin/updown/config
@@ -1,4 +1,4 @@
-user=root
 duser=root
-ddir=/
+user=root
 dir=/
+ddir=/
diff --git a/webmin/useradmin/config b/webmin/useradmin/config
index e83a1de07..343496bf3 100644
--- a/webmin/useradmin/config
+++ b/webmin/useradmin/config
@@ -1,41 +1,41 @@
-passwd_file=/etc/passwd
-passwd_dict=0
-empty_mode=0
-gid_mode=1
-gshadow_file=/etc/gshadow
+passwd_progmode=0
 email_type=0
-passwd_stars=0
-new_user_gid=0
-homedir_perms=0755
-shadow_file=/etc/shadow
+gshadow_file=/etc/gshadow
 base_uid=1000
-extra_real=0
+skip_md5=0
+uid_calc=0
+shadow_file=/etc/shadow
+passwd_same=0
 home_base=/home
-base_gid=1000
+random_password=0
+md5=1
+last_show=0
+passwd_file=/etc/passwd
 default_other=1
-passwd_progmode=0
-default_group=users
-uid_calc=0
-shells=fixed,passwd,shells
+alias_check=0
+home_style=0
+passwd_dict=0
+uid_mode=1
+passwd_stars=0
 sort_mode=0
-lock_string=*
-last_show=0
-new_user_group=0
-selinux_con=user_u:object_r:user_home_dir_t
-skip_md5=0
-gid_calc=0
-from_files=0
-md5=1
-membox=0
-display_max=400
-display_mode=1
 user_files=/etc/skel
+empty_mode=0
+base_gid=1000
+display_max=400
+membox=0
 delete_root=0
-uid_mode=1
-group_file=/etc/group
-alias_check=0
+lock_string=*
 secmode=0
-home_style=0
-random_password=0
+extra_real=0
+selinux_con=user_u:object_r:user_home_dir_t
+from_files=0
+new_user_group=0
+gid_calc=0
+shells=fixed,passwd,shells
+default_group=users
+new_user_gid=0
 delete_only=0
-passwd_same=0
+group_file=/etc/group
+display_mode=1
+gid_mode=1
+homedir_perms=0755
diff --git a/webmin/usermin/config b/webmin/usermin/config
index 7f7f23499..30c69584c 100644
--- a/webmin/usermin/config
+++ b/webmin/usermin/config
@@ -1,7 +1,7 @@
-uphour=4
-updays=1
-cron_mode=0
 upmissing=0
-upshow=1
 usermin_dir=/etc/usermin
+cron_mode=0
 update=0
+upshow=1
+uphour=4
+updays=1
diff --git a/webmin/version b/webmin/version
index 9306af7c5..586788aa9 100644
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.981
+1.983
diff --git a/webmin/webalizer/config b/webmin/webalizer/config
index a18e18741..164463222 100644
--- a/webmin/webalizer/config
+++ b/webmin/webalizer/config
@@ -1,6 +1,6 @@
-webalizer_conf=/etc/webalizer/webalizer.conf
 auto=apache,squid,proftpd,wuftpd
-naked=0
-alt_conf=/etc/webalizer/webalizer.conf.sample
 skip_old=0
+alt_conf=/etc/webalizer/webalizer.conf.sample
 webalizer=/usr/bin/webalizer
+webalizer_conf=/etc/webalizer/webalizer.conf
+naked=0
diff --git a/webmin/webmin/config b/webmin/webmin/config
index 200afad5a..19da63f74 100644
--- a/webmin/webmin/config
+++ b/webmin/webmin/config
@@ -1,12 +1,12 @@
-last_version_number=1.900
-uphour=23
-upmins=47
-warn_days=7
-upshow=1
 osdn=1
-cron_mode=0
 updays=1
-upmissing=0
-update=0
+uphour=23
+upshow=1
 letsencrypt_dns_wait=10
+last_version_number=1.900
+upmins=47
+upmissing=0
 last_version_check=1549050668
+warn_days=7
+update=0
+cron_mode=0
diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config
index 26868e3b5..48b976174 100644
--- a/webmin/wuftpd/config
+++ b/webmin/wuftpd/config
@@ -1,8 +1,8 @@
-ftpconversions=/etc/wu-ftpd/ftpconversions
+ftpusers=/etc/wu-ftpd/ftpusers
+ftpgroups=/etc/wu-ftpd/ftpgroups
+pid_file=/var/run/ftpd.pids-all
+ftpd_path=/usr/sbin/wu-ftpd
 ftpaccess=/etc/wu-ftpd/ftpaccess
 log_file=/var/log/xferlog
-ftpd_path=/usr/sbin/wu-ftpd
-pid_file=/var/run/ftpd.pids-all
+ftpconversions=/etc/wu-ftpd/ftpconversions
 ftphosts=/etc/wu-ftpd/ftphosts
-ftpgroups=/etc/wu-ftpd/ftpgroups
-ftpusers=/etc/wu-ftpd/ftpusers
diff --git a/webmin/xinetd/config b/webmin/xinetd/config
index df998e156..c388770ef 100644
--- a/webmin/xinetd/config
+++ b/webmin/xinetd/config
@@ -1,5 +1,5 @@
+start_cmd=/etc/init.d/xinetd start
 lookup_servs=1
-protocols_file=/etc/protocols
 pid_file=/var/run/xinetd.pid
-start_cmd=/etc/init.d/xinetd start
 xinetd_conf=/etc/xinetd.conf
+protocols_file=/etc/protocols