From: mhoellein <mario@hoellein.online>
Date: Thu, 11 Aug 2022 12:19:00 +0000 (+0200)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=523750142db8de044569270b4965f0e0e1165a5c;p=vserver

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

Package changes:
-libapache2-mod-wsgi-py3 4.6.8-1ubuntu3 amd64
+libapache2-mod-wsgi-py3 4.6.8-1ubuntu3.1 amd64
-libgdk-pixbuf2.0-0 2.40.0+dfsg-3ubuntu0.2 amd64
-libgdk-pixbuf2.0-bin 2.40.0+dfsg-3ubuntu0.2 amd64
-libgdk-pixbuf2.0-common 2.40.0+dfsg-3ubuntu0.2 all
+libgdk-pixbuf2.0-0 2.40.0+dfsg-3ubuntu0.3 amd64
+libgdk-pixbuf2.0-bin 2.40.0+dfsg-3ubuntu0.3 amd64
+libgdk-pixbuf2.0-common 2.40.0+dfsg-3ubuntu0.3 all
-libgnutls30 3.6.13-2ubuntu1.6 amd64
+libgnutls30 3.6.13-2ubuntu1.7 amd64
-libxml2 2.9.10+dfsg-5ubuntu0.20.04.3 amd64
+libxml2 2.9.10+dfsg-5ubuntu0.20.04.4 amd64
-linux-libc-dev 5.4.0-122.138 amd64
+linux-libc-dev 5.4.0-124.140 amd64
-python3-django 2:2.2.12-1ubuntu0.12 all
+python3-django 2:2.2.12-1ubuntu0.13 all
-webmin 1.998 all
+webmin 1.999-2 all
---

diff --git a/webmin/.stop-init b/webmin/.stop-init
index 8dc90f5b0..2f84153f3 100755
--- a/webmin/.stop-init
+++ b/webmin/.stop-init
@@ -5,7 +5,7 @@ else
   echo Stopping Webmin server in /usr/share/webmin
 fi
 pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
-pid=`cat $pidfile` 2>/dev/null
+pid=`cat $pidfile 2>/dev/null`
 if [ "$pid" != "" ]; then
   kill $pid || exit 1
   touch /var/webmin/stop-flag
diff --git a/webmin/acl/config b/webmin/acl/config
index 017dd0405..c572bfa88 100644
--- a/webmin/acl/config
+++ b/webmin/acl/config
@@ -1,3 +1,3 @@
-order=0
 ssleay=/usr/bin/openssl
+order=0
 display=1
diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config
index a3ddb6067..e6fded24b 100644
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
 conf_style=0
+pap_file=/etc/ppp/pap-secrets
 start_cmd=adsl-start
-stop_cmd=adsl-stop
 pppoe_cmd=pppoe
-status_cmd=adsl-status
-pap_file=/etc/ppp/pap-secrets
 pppoe_conf=/etc/ppp/pppoe.conf
+status_cmd=adsl-status
+stop_cmd=adsl-stop
diff --git a/webmin/apache/config b/webmin/apache/config
index a12f03854..457aaae3f 100644
--- a/webmin/apache/config
+++ b/webmin/apache/config
@@ -1,25 +1,25 @@
-httpd_dir=/etc/apache2
-test_apachectl=1
-defines_name=APACHE_ARGUMENTS
-httpd_path=/usr/sbin/apache2
-test_always=0
+allow_virtualmin=0
+show_order=0
+auto_mods=1
 link_dir=/etc/apache2/sites-enabled
-show_list=0
-virt_file=/etc/apache2/sites-available
 format_config=1
 show_names=0
-show_order=0
-defines_file=/etc/apache2/envvars
-access_conf=/etc/apache2/access.conf
+test_config=1
+test_apachectl=1
 mime_types=/etc/apache2/mime.types
+httpd_dir=/etc/apache2
+show_list=0
+httpd_path=/usr/sbin/apache2
+apachectl_path=/usr/sbin/apache2ctl
+stop_cmd=/etc/init.d/apache2 stop
 test_manual=0
+srm_conf=/etc/apache2/srm.conf
+virt_file=/etc/apache2/sites-available
 apply_cmd=/usr/sbin/apache2ctl graceful
 httpd_conf=/etc/apache2/apache2.conf
 max_servers=100
-allow_virtualmin=0
-auto_mods=1
-srm_conf=/etc/apache2/srm.conf
-apachectl_path=/usr/sbin/apache2ctl
-stop_cmd=/etc/init.d/apache2 stop
 start_cmd=/etc/init.d/apache2 start
-test_config=1
+access_conf=/etc/apache2/access.conf
+defines_file=/etc/apache2/envvars
+test_always=0
+defines_name=APACHE_ARGUMENTS
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 f4c14d654..09fa47546 100644
--- a/webmin/bacula-backup/config
+++ b/webmin/bacula-backup/config
@@ -1,12 +1,12 @@
-bls=bls
 showdirs=0
-apply=1
-btape=btape
+init_start=0
+driver=Pg
+bls=bls
+wait=1
 pass=
+bacula_dir=/etc/bacula
 db=bacula
 bextract=bextract
-wait=1
-bacula_dir=/etc/bacula
-driver=Pg
-init_start=0
 user=bacula
+btape=btape
+apply=1
diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config
index db38d7751..da72c415d 100644
--- a/webmin/bandwidth/config
+++ b/webmin/bandwidth/config
@@ -1,2 +1,2 @@
-firewall_system=firewall
 bandwidth_log=/var/log/bandwidth
+firewall_system=firewall
diff --git a/webmin/bind8/config b/webmin/bind8/config
index 6786aaae9..5e5337b90 100644
--- a/webmin/bind8/config
+++ b/webmin/bind8/config
@@ -1,46 +1,46 @@
-forwardzonefilename_format=ZONE.hosts
-updserial_man=1
-slave_dir=/var/lib/bind
-relative_paths=0
-other_slaves=1
 updserial_on=1
-spf_record=0
+ndc_cmd=ndc
+largezones=0
+ipv6_mode=1
+soa_style=0
+updserial_def=0
+updserial_man=1
+max_zones=50
+support_aaaa=1
 show_list=0
+signzone=dnssec-signzone
+slave_dir=/var/lib/bind
+allow_comments=0
+allow_wild=1
 rndcconf_cmd=rndc-confgen
-named_path=/usr/sbin/named
+dnssec_info=1
+rev_must=0
 whois_cmd=whois
-allow_comments=0
 master_ttl=1
-no_chroot=0
-confirm_zone=1
-max_zones=50
 allow_long=0
-dnssec_info=1
-soa_style=0
-master_dir=/var/lib/bind
 checkconf=named-checkconf
-rev_must=0
+named_path=/usr/sbin/named
+soa_start=0
 reversezonefilename_format=ZONE.rev
-keygen=dnssec-keygen
-ipv6_mode=1
-checkzone=named-checkzone
-signzone=dnssec-signzone
 force_random=0
-rndc_cmd=rndc
+confirm_zone=1
+spf_record=0
+forwardzonefilename_format=ZONE.hosts
+by_view=0
+allow_underscore=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
 named_conf=/etc/bind/named.conf
-confirm_rec=0
-ndc_cmd=ndc
+other_slaves=1
+no_chroot=0
 records_order=0
-allow_underscore=1
-support_aaaa=1
-no_pid_chroot=0
-rev_def=0
-soa_start=0
-updserial_def=0
-allow_wild=1
-largezones=0
-zones_file=/etc/bind/named.conf.local
 rndc_conf=/etc/bind/rndc.conf
+checkzone=named-checkzone
 short_names=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
-by_view=0
+keygen=dnssec-keygen
+zones_file=/etc/bind/named.conf.local
+rndc_cmd=rndc
+confirm_rec=0
+no_pid_chroot=0
+relative_paths=0
+master_dir=/var/lib/bind
+rev_def=0
diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config
index 505a81477..084b9a997 100644
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
-conf_find_user=1
-conf_allow_refresh=1
 sort_mode=0
-conf_allow_sync=1
+conf_allow_refresh=1
 conf_add_group=1
-conf_add_user=1
 conf_host_links=1
+conf_find_user=1
+conf_allow_sync=1
+conf_add_user=1
 table_mode=0
 conf_find_group=1
diff --git a/webmin/cluster-usermin/config b/webmin/cluster-usermin/config
index fd788cb1e..470eaee86 100644
--- a/webmin/cluster-usermin/config
+++ b/webmin/cluster-usermin/config
@@ -1,2 +1,2 @@
-table_mode=0
 sort_mode=0
+table_mode=0
diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config
index 470eaee86..fd788cb1e 100644
--- a/webmin/cluster-webmin/config
+++ b/webmin/cluster-webmin/config
@@ -1,2 +1,2 @@
-sort_mode=0
 table_mode=0
+sort_mode=0
diff --git a/webmin/config b/webmin/config
index 5a1ae55a6..88851493c 100644
--- a/webmin/config
+++ b/webmin/config
@@ -1,33 +1,33 @@
-log=1
-referers_none=1
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-feedback_to=
-lang_root=de.UTF-8
-showhost=0
-by_view=0
-dateformat=dd/mon/yyyy
-ld_env=LD_LIBRARY_PATH
-theme=authentic-theme
-lang=en.UTF-8
-hostnamemode=0
-md5pass=0
-product=webmin
-showlogin=0
-help_height=
 passwd_pindex=1
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-hostnamedisplay=
+theme=authentic-theme
+by_view=0
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
+sysinfo=0
+log=1
 webprefix=
-help_width=
 passwd_file=/etc/shadow
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+help_width=
 passwd_uindex=0
-os_version=9.0
-real_os_type=Ubuntu Linux
+help_height=
 os_type=debian-linux
-nofeedbackcc=0
-real_os_version=18.04.1
+feedback_to=
+hostnamedisplay=
+os_version=9.0
+ld_env=LD_LIBRARY_PATH
+showhost=0
+referers_none=1
 passwd_cindex=2
+product=webmin
+md5pass=0
+showlogin=0
 tempdelete_days=7
+nofeedbackcc=0
 passwd_mindex=4
-sysinfo=0
+dateformat=dd/mon/yyyy
+lang_root=de.UTF-8
+lang=en.UTF-8
+real_os_type=Ubuntu Linux
+hostnamemode=0
+real_os_version=18.04.1
 md5pass=0
diff --git a/webmin/cpan/config b/webmin/cpan/config
index ef15a6f6f..b3a487f25 100644
--- a/webmin/cpan/config
+++ b/webmin/cpan/config
@@ -1,6 +1,6 @@
+packages=http://www.cpan.org/modules/02packages.details.txt.gz
 cpan=http://www.cpan.org/authors/id
-incpackages=1
 save_partial=0
 incyum=1
 refresh_days=30
-packages=http://www.cpan.org/modules/02packages.details.txt.gz
+incpackages=1
diff --git a/webmin/cron/config b/webmin/cron/config
index e82890ddc..8b568b308 100644
--- a/webmin/cron/config
+++ b/webmin/cron/config
@@ -1,26 +1,26 @@
-hourly_only=0
-cron_user_edit_command=crontab -e
-init_name=cron
-cron_dir=/var/spool/cron/crontabs
-match_user=1
-kill_subs=0
+match_mode=0
+cron_user_get_command=crontab -l
 run_parts=run-parts
-cron_deny_all=2
+cron_get_command=crontab -u USER -l
+show_next=0
+cron_allow_file=/var/spool/cron/allow
 show_time=0
-cron_edit_command=crontab -u USER -e
-system_crontab=/etc/crontab
 cron_deny_file=/var/spool/cron/deny
-show_comment=0
 cron_delete_command=crontab -u USER -r
-cron_allow_file=/var/spool/cron/allow
-match_mode=0
-show_run=0
-cron_user_get_command=crontab -l
 cronfiles_dir=/etc/cron.d
-cron_user_delete_command=crontab -r
-cron_get_command=crontab -u USER -l
+cron_dir=/var/spool/cron/crontabs
 max_jobs=100
-show_next=0
-max_len=80
+cron_edit_command=crontab -u USER -e
+cron_user_edit_command=crontab -e
 cron_input=1
+cron_deny_all=2
 vixie_cron=1
+match_user=1
+show_comment=0
+kill_subs=0
+max_len=80
+init_name=cron
+system_crontab=/etc/crontab
+hourly_only=0
+show_run=0
+cron_user_delete_command=crontab -r
diff --git a/webmin/custom/config b/webmin/custom/config
index 6d0b22ef3..1a8539208 100644
--- a/webmin/custom/config
+++ b/webmin/custom/config
@@ -1,4 +1,4 @@
-display_mode=0
 params_cmd=0
-columns=2
+display_mode=0
 params_file=0
+columns=2
diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index 09607af74..f61278ccd 100644
--- a/webmin/dhcpd/config
+++ b/webmin/dhcpd/config
@@ -1,17 +1,17 @@
-dhcpd_conf=/etc/dhcp/dhcpd.conf
 desc_name=0
-dhcpd_nocols=5
-lease_file=/var/lib/dhcp/dhcpd.leases
-dhcpd_path=/usr/sbin/dhcpd
-start_cmd=service isc-dhcp-server start
-stop_cmd=service isc-dhcp-server stop
-lease_sort=0
+pid_file=/var/run/dhcpd.pid
 lease_vendor=0
-show_ip=0
-show_mac=0
+interfaces_type=debian
 group_name=0
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+lease_sort=0
+stop_cmd=service isc-dhcp-server stop
+lease_file=/var/lib/dhcp/dhcpd.leases
 restart_cmd=service isc-dhcp-server restart
+dhcpd_path=/usr/sbin/dhcpd
 lease_tz=0
-pid_file=/var/run/dhcpd.pid
+start_cmd=service isc-dhcp-server start
+show_ip=0
 display_max=100
-interfaces_type=debian
+show_mac=0
+dhcpd_nocols=5
diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index c9ec1754c..d6e9d8483 100644
--- a/webmin/dovecot/config
+++ b/webmin/dovecot/config
@@ -1,4 +1,4 @@
 dovecot_config=/etc/dovecot/dovecot.conf
-init_script=dovecot
 pid_file=/var/run/dovecot/master.pid
 dovecot=/usr/sbin/dovecot
+init_script=dovecot
diff --git a/webmin/exim/config b/webmin/exim/config
index 87bb91acc..cb21c4f73 100644
--- a/webmin/exim/config
+++ b/webmin/exim/config
@@ -1,8 +1,8 @@
-exim_addrfile=/etc/exim4/email-addresses
-exim_virt_dir=/etc/exim4/aliases
-mail_system=1
-exim_dir=/etc/exim4
+exim_mail_file=Maildir
 exim_dbmext=.dbm
-exim_dbmfile=/etc/exim4/local_domains
+exim_virt_dir=/etc/exim4/aliases
 exim_aliasfileext=
-exim_mail_file=Maildir
+exim_dbmfile=/etc/exim4/local_domains
+exim_addrfile=/etc/exim4/email-addresses
+exim_dir=/etc/exim4
+mail_system=1
diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config
index aebf23ff0..00afde779 100644
--- a/webmin/fail2ban/config
+++ b/webmin/fail2ban/config
@@ -1,4 +1,4 @@
-client_cmd=/usr/bin/fail2ban-client
 config_dir=/etc/fail2ban
-server_cmd=/usr/bin/fail2ban-server
 init_script=fail2ban
+server_cmd=/usr/bin/fail2ban-server
+client_cmd=/usr/bin/fail2ban-client
diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config
index f058ffa00..a28376e5f 100644
--- a/webmin/fetchmail/config
+++ b/webmin/fetchmail/config
@@ -1,6 +1,6 @@
+pid_file=/var/run/fetchmail.pid
+config_file=
 max_users=400
+daemon_user=root
 fetchmail_path=fetchmail
-config_file=
 view_mode=0
-daemon_user=root
-pid_file=/var/run/fetchmail.pid
diff --git a/webmin/filter/config b/webmin/filter/config
index 4532e1d01..516638859 100644
--- a/webmin/filter/config
+++ b/webmin/filter/config
@@ -1,6 +1,6 @@
-forward_procmail=0
-virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
-warn_procmail=1
+alias_files=/etc/aliases	/etc/postfix/aliases	/etc/mail/aliases
 virtualmin_config=/etc/webmin/virtual-server
+warn_procmail=1
 reply_force=0
-alias_files=/etc/aliases	/etc/postfix/aliases	/etc/mail/aliases
+forward_procmail=0
+virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
diff --git a/webmin/firewall/config b/webmin/firewall/config
index 5e7feb5ff..4f8a6984a 100644
--- a/webmin/firewall/config
+++ b/webmin/firewall/config
@@ -1,6 +1,6 @@
-view_comment=0
+direct=0
+force_init=0
 view_condition=1
+view_comment=0
 comment_mod=0
-direct=0
 cluster_mode=1
-force_init=0
diff --git a/webmin/firewall6/config b/webmin/firewall6/config
index 9d7a08c0b..c7a2d7d24 100644
--- a/webmin/firewall6/config
+++ b/webmin/firewall6/config
@@ -1,6 +1,6 @@
 comment_mod=0
-view_condition=1
 view_comment=0
-force_init=0
 cluster_mode=1
 direct=0
+force_init=0
+view_condition=1
diff --git a/webmin/firewalld/config b/webmin/firewalld/config
index ff329a00d..0aae64fac 100644
--- a/webmin/firewalld/config
+++ b/webmin/firewalld/config
@@ -1,2 +1,2 @@
-firewall_cmd=firewall-cmd
 init_name=firewalld
+firewall_cmd=firewall-cmd
diff --git a/webmin/fsdump/config b/webmin/fsdump/config
index 0053e9d41..d94cbe997 100644
--- a/webmin/fsdump/config
+++ b/webmin/fsdump/config
@@ -1,7 +1,7 @@
-nonewtape=0
-webmin_subs=0
-run_mode=0
-simple_sched=0
 always_tar=0
 date_subs=0
+nonewtape=0
+simple_sched=0
 error_email=0
+run_mode=0
+webmin_subs=0
diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config
index c2ced1e15..f23ca8c40 100644
--- a/webmin/heartbeat/config
+++ b/webmin/heartbeat/config
@@ -1,15 +1,15 @@
-ha_dir=/etc/ha.d
 serials=/dev/ttyS*
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+alt_haresources=/usr/share/doc/packages/heartbeat/haresources
 haresources=
+resource_d=
+start_cmd=/etc/init.d/heartbeat start
+apply_cmd=/etc/init.d/heartbeat reload
 heartbeat=/usr/lib/heartbeat/heartbeat
-pid_file=/var/run/heartbeat.pid
+authkeys=
+stop_cmd=/etc/init.d/heartbeat stop
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
 ha_cf=
-apply_cmd=/etc/init.d/heartbeat reload
-resource_d=
+ha_dir=/etc/ha.d
 req_resource_cmd=/usr/lib/heartbeat/req_resource
 alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
-authkeys=
-alt_haresources=/usr/share/doc/packages/heartbeat/haresources
-start_cmd=/etc/init.d/heartbeat start
-stop_cmd=/etc/init.d/heartbeat stop
+pid_file=/var/run/heartbeat.pid
diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config
index b4f02d5ad..68b9de97a 100644
--- a/webmin/htaccess-htpasswd/config
+++ b/webmin/htaccess-htpasswd/config
@@ -1,8 +1,8 @@
-digest=1
-extra_directives=
-htpasswd=.htpasswd
+htaccess=.htaccess
 md5=1
+htpasswd=.htpasswd
 sha1=0
+digest=1
+extra_directives=
 sort=0
-htaccess=.htaccess
 htgroups=.htgroups
diff --git a/webmin/inetd/config b/webmin/inetd/config
index 7ae34ca2f..a44ff0d6f 100644
--- a/webmin/inetd/config
+++ b/webmin/inetd/config
@@ -1,16 +1,16 @@
-tcpd_path=/usr/sbin/tcpd
-deny_file=/etc/hosts.deny
-sort_mode=0
-rpc_protocols=tcp udp
-allow_file=/etc/hosts.allow
-restart_command=killall -HUP inetd
-ipv6=0
-display_max=100
-show_empty=1
-extended_inetd=1
 inetd_conf_file=/etc/inetd.conf
 rpc_inetd=1
-services_file=/etc/services
 protocols_file=/etc/protocols
+display_max=100
+show_empty=1
+sort_mode=0
+services_file=/etc/services
+rpc_protocols=tcp udp
 rpc_file=/etc/rpc
+extended_inetd=1
+restart_command=killall -HUP inetd
+allow_file=/etc/hosts.allow
+ipv6=0
+deny_file=/etc/hosts.deny
+tcpd_path=/usr/sbin/tcpd
 qm_mode=0
diff --git a/webmin/init/config b/webmin/init/config
index 53e75b708..9d7adddc7 100644
--- a/webmin/init/config
+++ b/webmin/init/config
@@ -1,17 +1,17 @@
-order_digits=2
-init_info=1
+order=0
+init_dir=/etc/init.d
 no_chkconfig=0
-boot_levels=2 3 5
-shutdown_command=poweroff
+expert=0
+show_opts=0
+reboot_command=reboot
 inittab_id=id
-sort_mode=0
 init_base=/etc/
-reboot_command=reboot
-expert=0
-init_dir=/etc/init.d
+init_info=1
 atboot_product=webmin
-show_opts=0
-order=0
-soft_links=1
-desc=1
+sort_mode=0
 status_check=0
+desc=1
+shutdown_command=poweroff
+order_digits=2
+soft_links=1
+boot_levels=2 3 5
diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config
index 369f4c623..e6cce2cf3 100644
--- a/webmin/ipfilter/config
+++ b/webmin/ipfilter/config
@@ -1,9 +1,9 @@
-view_condition=1
 ipfstat=ipfstat
-view_comment=0
-cluster_mode=0
-ipnat=ipnat
-ipnat_conf=/etc/ipf/ipnat.conf
-ipf=ipf
 ipf_conf=/etc/ipf/ipf.conf
+cluster_mode=0
 cluster_nat=1
+view_comment=0
+view_condition=1
+ipf=ipf
+ipnat_conf=/etc/ipf/ipnat.conf
+ipnat=ipnat
diff --git a/webmin/ipfw/config b/webmin/ipfw/config
index 564b5f96b..69d0642f1 100644
--- a/webmin/ipfw/config
+++ b/webmin/ipfw/config
@@ -1,6 +1,6 @@
-view_counters=0
-view_condition=1
 view_comment=0
-ipfw=/sbin/ipfw
+view_counters=0
 cluster_mode=0
+ipfw=/sbin/ipfw
 version=2
+view_condition=1
diff --git a/webmin/ipsec/config b/webmin/ipsec/config
index 83ff3d0f4..717ecbbfd 100644
--- a/webmin/ipsec/config
+++ b/webmin/ipsec/config
@@ -1,8 +1,8 @@
+restart_cmd=/etc/init.d/ipsec restart
+start_cmd=/etc/init.d/ipsec start
 file=/etc/ipsec.conf
-secrets=/etc/ipsec.secrets
-ipsec=/usr/sbin/ipsec
 logfile=/var/log/messages
-stop_cmd=/etc/init.d/ipsec stop
 policies_dir=/etc/ipsec.d/policies
-restart_cmd=/etc/init.d/ipsec restart
-start_cmd=/etc/init.d/ipsec start
+stop_cmd=/etc/init.d/ipsec stop
+ipsec=/usr/sbin/ipsec
+secrets=/etc/ipsec.secrets
diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config
index f97e6946a..340d3905e 100644
--- a/webmin/iscsi-client/config
+++ b/webmin/iscsi-client/config
@@ -1,6 +1,6 @@
 iscsiadm=iscsiadm
-ifaces_dir=/var/lib/iscsi/ifaces
-iscsiiname=iscsi-iname
-config_file=/etc/iscsi/iscsid.conf
 initiator_file=/etc/iscsi/initiatorname.iscsi
 init_name=open-iscsi
+iscsiiname=iscsi-iname
+config_file=/etc/iscsi/iscsid.conf
+ifaces_dir=/var/lib/iscsi/ifaces
diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index 834d6cf73..0e512d508 100644
--- a/webmin/iscsi-server/config
+++ b/webmin/iscsi-server/config
@@ -1,6 +1,6 @@
-opts_file=/etc/sysconfig/netbsd-iscsi
 pid_file=/var/run/iscsi-target.pid
-iscsi_server=/usr/sbin/iscsi-target
 targets_file=/etc/iscsi/targets
+opts_file=/etc/sysconfig/netbsd-iscsi
 auths_file=/etc/iscsi/auths
+iscsi_server=/usr/sbin/iscsi-target
 init_name=netbsd-iscsi
diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config
index 7a7d9063b..1e56ffd1d 100644
--- a/webmin/iscsi-target/config
+++ b/webmin/iscsi-target/config
@@ -1,7 +1,7 @@
-pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
-init_name=iscsitarget
+ietadm=ietadm
 config_file=/etc/iet/ietd.conf
-targets_file=/etc/iet/targets.allow
+init_name=iscsitarget
 initiators_file=/etc/iet/initiators.allow
 opts_file=/etc/default/iscsitarget
-ietadm=ietadm
+targets_file=/etc/iet/targets.allow
+pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config
index 1e6e6e376..977174dfb 100644
--- a/webmin/iscsi-tgtd/config
+++ b/webmin/iscsi-tgtd/config
@@ -1,5 +1,5 @@
-tgtadm=tgtadm
 tgtadmin=tgt-admin
+tgtadm=tgtadm
 init_name=tgtd
-tgtd=tgtd
 config_file=/etc/tgt/targets.conf
+tgtd=tgtd
diff --git a/webmin/jabber/config b/webmin/jabber/config
index 98ce779ef..c8a6e69cd 100644
--- a/webmin/jabber/config
+++ b/webmin/jabber/config
@@ -1,5 +1,5 @@
 jabber_daemon=/usr/sbin/jabberd
+jabber_config=/etc/jabber/jabber.xml
+stop_cmd=/etc/init.d/jabberd stop
 start_cmd=/etc/init.d/jabberd start
 jabber_dir=/var/lib/jabber
-stop_cmd=/etc/init.d/jabberd stop
-jabber_config=/etc/jabber/jabber.xml
diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index f8307fd92..78418ab3c 100644
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
-start_cmd=/etc/init.d/slapd start
-browse_max=100
+config_file=/etc/ldap/slapd.d
+init_name=slapd
 stop_cmd=/etc/init.d/slapd stop
-slapd=slapd
+ldap_user=openldap
 apply_cmd=/etc/init.d/slapd restart
-attr_count=6
-init_name=slapd
 schema_dir=/etc/ldap/schema
-ldap_user=openldap
-config_file=/etc/ldap/slapd.d
+browse_max=100
+slapd=slapd
+start_cmd=/etc/init.d/slapd start
+attr_count=6
diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config
index b7cde48e8..2dabc593f 100644
--- a/webmin/ldap-useradmin/config
+++ b/webmin/ldap-useradmin/config
@@ -1,24 +1,24 @@
-md5=0
-shells=fixed,ldap,passwd,shells
+other_class=inetOrgPerson
+given=0
+imap_def=0
+samba_gclass=sambaGroup
 samba_def=0
+multi_fields=0
+membox=0
+alias_same=0
 slappasswd=slappasswd
-imap_def=0
-ldap_tls=0
-samba_class=sambaSamAccount
-imap_folders=old	public	sent-mail
+auth_ldap=/etc/ldap.conf
 imap_login=cyrus
-gecos=1
-alias_same=0
-membox=0
-person=1
+md5=0
 imap_class=SuSEeMailObject
-auth_ldap=/etc/ldap.conf
+shells=fixed,ldap,passwd,shells
+gecos=1
+ldap_tls=0
 imap_foldersep=.
-other_class=inetOrgPerson
 mailfmt=0
+secmode=0
 quota_support=0
-given=0
-multi_fields=0
+person=1
+samba_class=sambaSamAccount
+imap_folders=old	public	sent-mail
 given_order=0
-samba_gclass=sambaGroup
-secmode=0
diff --git a/webmin/logrotate/config b/webmin/logrotate/config
index b85fb9a25..0ff54719f 100644
--- a/webmin/logrotate/config
+++ b/webmin/logrotate/config
@@ -1,4 +1,4 @@
 add_file=/etc/logrotate.d
-logrotate_conf=/etc/logrotate.conf
-logrotate=logrotate
 sort_mode=0
+logrotate=logrotate
+logrotate_conf=/etc/logrotate.conf
diff --git a/webmin/logviewer/config b/webmin/logviewer/config
index 0a13fef3d..875c884ef 100644
--- a/webmin/logviewer/config
+++ b/webmin/logviewer/config
@@ -1,3 +1,3 @@
-lines=100
 reverse=1
 others=1
+lines=100
diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config
index 41c55e6f9..ec8bb3151 100644
--- a/webmin/lpadmin/config
+++ b/webmin/lpadmin/config
@@ -1,17 +1,17 @@
-start_cmd=/etc/init.d/cupsys start
-stop_cmd=/etc/init.d/cupsys stop
-sort_mode=0
-show_jobs=0
+gs_lib=
 spool_dir=/var/spool/cups
-model_path=/usr/share/foomatic/db /usr/share/ppd
-show_status=0
-display_mode=0
-iface_perms=755
 driver_style=cups
-print_style=cups
+sort_mode=0
+iface_owner=lp:lp
+show_status=0
+model_path=/usr/share/foomatic/db /usr/share/ppd
+start_cmd=/etc/init.d/cupsys start
 gs_fontpath=
+stop_cmd=/etc/init.d/cupsys stop
 gs_path=gs
-iface_arg=
-gs_lib=
-iface_owner=lp:lp
+show_jobs=0
+iface_perms=755
+display_mode=0
 smbclient_path=smbclient
+iface_arg=
+print_style=cups
diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config
index 5294c2dd0..b13aabd8c 100644
--- a/webmin/mailboxes/config
+++ b/webmin/mailboxes/config
@@ -1,52 +1,52 @@
-mail_style=0
-no_crlf=0
+sync_modify=1
+show_body=0
+spam_report=
+sort_mode=1
+sync_perms=0700
+auto=1
 log_read=0
+sync_create=0
+spam_buttons=mail
 date_fmt=dmy
-show_delall=0
-link_mode=0
-fwd_mode=0
-mail_file=Mailbox
-sync_perms=0700
-max_records=200
+from_virtualmin=1
+size_mode=1
+ignore_users=
 sync_delete=1
-column_count=4
-wrap_width=80
-top_buttons=2
+mail_dir=Maildir
 show_size=1
-sort_mode=1
-show_body=0
-spam_buttons=mail
+track_read=0
+show_delall=0
 show_count=0
-no_orig_ip=0
-show_to=0
+wrap_width=80
+vpopmail_dir=/home/vpopmail
+top_buttons=2
+perpage=20
+mail_usermin=mail
+show_size_below=0
 spam_del=0
-ignore_users=
-from_virtualmin=1
 noindex_hostname=0
-no_mailer=0
-html_edit=0
-arrows=1
 check_mod=1
-sync_create=0
-vpopmail_dir=/home/vpopmail
 mail_system=3
-ignore_users_enabled=0
+show_sent=0
 view_html=0
-delete_warn=y
+ignore_users_enabled=0
 show_unread=0
-mail_dir=Maildir
-spam_report=
-show_sent=0
-show_mail=0
-size_mode=1
-perpage=20
-sync_modify=1
+no_crlf=0
 open_mode=0
-auto=1
-sig_file=*
-show_size_below=0
+mail_file=Mailbox
+delete_warn=y
+link_mode=0
+arrows=1
+html_quote=0
+fwd_mode=0
+no_orig_ip=0
 mailbox_user=.usermin/mailbox
-mail_usermin=mail
+show_to=0
+html_edit=0
+show_mail=0
 maildir_deleted=0
-track_read=0
-html_quote=0
+column_count=4
+no_mailer=0
+mail_style=0
+sig_file=*
+max_records=200
diff --git a/webmin/man/config b/webmin/man/config
index 1c6746941..ca9947a5c 100644
--- a/webmin/man/config
+++ b/webmin/man/config
@@ -1,9 +1,9 @@
-man_cmd_sect=man SECTION PAGE
-search_cmd=man -k PAGE
-man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
-man2html_path=man2html
-man_cmd=man PAGE
-list_cmd=man -w PAGE
-doc_dir=/usr/share/doc
 list_cmd_sect=man -w SECTION PAGE
+man_cmd=man PAGE
+man2html_path=man2html
 kernel_dir=/usr/src/linux/Documentation
+man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
+search_cmd=man -k PAGE
+doc_dir=/usr/share/doc
+list_cmd=man -w PAGE
+man_cmd_sect=man SECTION PAGE
diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index ab09a94be..97cd98c6e 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.998
+server=MiniServ/1.999
diff --git a/webmin/mon/config b/webmin/mon/config
index acd5cec8f..c0c245af9 100644
--- a/webmin/mon/config
+++ b/webmin/mon/config
@@ -1,7 +1,7 @@
 pid_file=/var/run/mon.pid
-cfbasedir=/etc/mon
 monshow=/usr/bin/monshow
 start_cmd=/etc/init.d/mon start
 restart_cmd=/etc/init.d/mon restart
 mon_cgi=/var/www/cgi-bin/mon.cgi
+cfbasedir=/etc/mon
 stop_cmd=/etc/init.d/mon stop
diff --git a/webmin/mount/config b/webmin/mount/config
index 063a44e56..01027a458 100644
--- a/webmin/mount/config
+++ b/webmin/mount/config
@@ -1,10 +1,10 @@
-show_used=1
-auto_file=/etc/am-utils/amd.conf
 smbclient_path=smbclient
+show_used=1
+autofs_file=/etc/auto.master
+nmblookup_path=nmblookup
 sysinfo=1
+fstab_file=/etc/fstab
 long_fstypes=1
-autofs_file=/etc/auto.master
 nfs_check=1
-fstab_file=/etc/fstab
 sort_mode=2
-nmblookup_path=nmblookup
+auto_file=/etc/am-utils/amd.conf
diff --git a/webmin/mysql/config b/webmin/mysql/config
index 47018d07f..39177ef09 100644
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -1,23 +1,23 @@
-my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
-max_text=1000
-mysql=/usr/bin/mysql
-start_cmd=service mysql start
-nodbi=0
-mysqldump=/usr/bin/mysqldump
 mysqlimport=/usr/bin/mysqlimport
-stop_cmd=service mysql stop
-style=0
 webmin_subs=0
-max_dbs=50
-date_subs=0
-nopwd=0
-login=root
-mysql_data=/var/lib/mysql
 blob_mode=0
-perpage=25
-mysql_libs=/usr/local/mysql/lib
-access=*: *
+stop_cmd=service mysql stop
 add_mode=1
-mysqladmin=/usr/bin/mysqladmin
 passwd_mode=0
+mysqldump=/usr/bin/mysqldump
+mysql_data=/var/lib/mysql
+max_dbs=50
+nodbi=0
+mysql=/usr/bin/mysql
+mysqladmin=/usr/bin/mysqladmin
+max_text=1000
+mysql_libs=/usr/local/mysql/lib
+login=root
+style=0
+nopwd=0
+access=*: *
+start_cmd=service mysql start
 mysqlshow=/usr/bin/mysqlshow
+perpage=25
+date_subs=0
+my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
diff --git a/webmin/nis/config b/webmin/nis/config
index f54cb27fe..960c4f9c3 100644
--- a/webmin/nis/config
+++ b/webmin/nis/config
@@ -1,5 +1,5 @@
-max_size=100
 nsswitch_conf=/etc/nsswitch.conf
+max_size=100
 manual_build=0
 securenets=/etc/ypserv.securenets
 client_conf=/etc/yp.conf
diff --git a/webmin/openslp/config b/webmin/openslp/config
index 1137c38c4..0661bea74 100644
--- a/webmin/openslp/config
+++ b/webmin/openslp/config
@@ -1,5 +1,5 @@
+slpd=/usr/sbin/slpd
 slpd_reg=/etc/slp.reg
-slpd_conf=/etc/slp.conf
 slpd_pid=/var/run/slpd.pid
-slpd=/usr/sbin/slpd
 slpd_log=/var/log/slpd.log
+slpd_conf=/etc/slp.conf
diff --git a/webmin/pam/config b/webmin/pam/config
index ab5e75c7b..73325ac3b 100644
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
-ignore=README
-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
+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
diff --git a/webmin/pap/config b/webmin/pap/config
index def11fa78..2173d39dd 100644
--- a/webmin/pap/config
+++ b/webmin/pap/config
@@ -1,8 +1,8 @@
+pppd=pppd
+pap_file=/etc/ppp/pap-secrets
+ppp_options=/etc/ppp/options
 encrypt_pass=0
 login_config=/etc/mgetty+sendfax/login.config
-ppp_options=/etc/ppp/options
 mgetty=mgetty
-pppd=pppd
 serials=/dev/ttyS[0-9]*
 dialin_config=/etc/mgetty+sendfax/dialin.config
-pap_file=/etc/ppp/pap-secrets
diff --git a/webmin/postfix/config b/webmin/postfix/config
index 2eb0ca5f9..a7e7d0652 100644
--- a/webmin/postfix/config
+++ b/webmin/postfix/config
@@ -1,29 +1,29 @@
-delete_confirm=1
-postfix_newaliases_command=/usr/bin/newaliases
-index_check=1
-mailq_count=0
 mailq_dir=/var/spool/postfix
-check_config=1
-columns=2
-postfix_lookup_table_command=/usr/sbin/postmap
+postfix_queue_command=postqueue
 top_buttons=1
-postfix_master=/etc/postfix/master.cf
-max_maps=100
+fwd_mode=0
+perpage=20
+mailq_sort=0
 wrap_width=80
+delete_warn=1
+index_check=1
+max_records=200
+postfix_config_file=/etc/postfix/main.cf
 postfix_super_command=/usr/sbin/postsuper
-ldap_doms=0
-sort_mode=0
-postfix_aliases_table_command=/usr/sbin/postalias
-perpage=20
+max_maps=100
 postfix_control_command=/usr/sbin/postfix
-postfix_queue_command=postqueue
-max_records=200
-delete_warn=1
+check_config=1
 show_cmts=0
-postfix_config_file=/etc/postfix/main.cf
-prefix_cmts=0
-postcat_cmd=/usr/sbin/postcat
 postfix_config_command=/usr/sbin/postconf
+sort_mode=0
+postfix_lookup_table_command=/usr/sbin/postmap
+postfix_aliases_table_command=/usr/sbin/postalias
+delete_confirm=1
+prefix_cmts=0
+postfix_newaliases_command=/usr/bin/newaliases
+postfix_master=/etc/postfix/master.cf
+columns=2
 mailq_cmd=postqueue -p
-fwd_mode=0
-mailq_sort=0
+ldap_doms=0
+postcat_cmd=/usr/sbin/postcat
+mailq_count=0
diff --git a/webmin/postgresql/config b/webmin/postgresql/config
index 330ecc7f5..d6c06e013 100644
--- a/webmin/postgresql/config
+++ b/webmin/postgresql/config
@@ -1,24 +1,24 @@
-perpage=25
+webmin_subs=0
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
+rstr_cmd=/usr/bin/pg_restore
+nodbi=0
+login=postgres
 sameunix=1
-dump_cmd=/usr/bin/pg_dump
+style=0
 access=*: *
-basedb=template1
-login=postgres
-simple_sched=0
-blob_mode=0
+access_own=0
+start_cmd=/etc/init.d/postgresql* start
+perpage=25
+date_subs=0
 pass=
+blob_mode=0
 psql=/usr/bin/psql
+stop_cmd=/etc/init.d/postgresql* stop
+basedb=template1
 add_mode=1
-max_text=1000
-start_cmd=/etc/init.d/postgresql* start
-nodbi=0
+simple_sched=0
 plib=
-stop_cmd=/etc/init.d/postgresql* stop
-hba_conf=/etc/postgresql/*/main/pg_hba.conf
 max_dbs=50
-rstr_cmd=/usr/bin/pg_restore
-date_subs=0
-style=0
 pid_file=/var/run/postmaster.pid
-webmin_subs=0
-access_own=0
+max_text=1000
+dump_cmd=/usr/bin/pg_dump
diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config
index e9a9bd08c..0832442c5 100644
--- a/webmin/pptp-client/config
+++ b/webmin/pptp-client/config
@@ -1,5 +1,5 @@
+peers_dir=/etc/ppp/peers
 pptp=pptp
-pptp_options=/etc/ppp/options.pptp
 timeout=30
-peers_dir=/etc/ppp/peers
 pap_file=/etc/ppp/chap-secrets
+pptp_options=/etc/ppp/options.pptp
diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config
index 00d46e17f..0dedc1734 100644
--- a/webmin/pptp-server/config
+++ b/webmin/pptp-server/config
@@ -1,9 +1,9 @@
-start_cmd=/etc/init.d/pptpd start
-stop_cmd=/etc/init.d/pptpd stop
-ppp_options=/etc/ppp/options
-pptp_ppp_options=/etc/ppp/pptpd-options
 pptpd=pptpd
-file=/etc/pptpd.conf
+stop_cmd=/etc/init.d/pptpd stop
 log_file=/var/log/messages
 pid_file=/var/run/pptpd.pid
 pap_file=/etc/ppp/chap-secrets
+file=/etc/pptpd.conf
+pptp_ppp_options=/etc/ppp/pptpd-options
+start_cmd=/etc/init.d/pptpd start
+ppp_options=/etc/ppp/options
diff --git a/webmin/proc/config b/webmin/proc/config
index 0fde95f65..643cb7846 100644
--- a/webmin/proc/config
+++ b/webmin/proc/config
@@ -1,6 +1,6 @@
 cut_length=80
 hide_self=1
-base_ppid=1
 ps_style=linux
-default_mode=last
+base_ppid=1
 trace_java=0
+default_mode=last
diff --git a/webmin/proftpd/config b/webmin/proftpd/config
index 3d9e409d5..9b276039a 100644
--- a/webmin/proftpd/config
+++ b/webmin/proftpd/config
@@ -1,9 +1,9 @@
-pid_file=/var/run/proftpd.pid
+ftpusers=/etc/ftpusers
 proftpd_path=/usr/sbin/proftpd
 test_config=1
-proftpd_conf=/etc/proftpd/proftpd.conf
+stop_cmd=/etc/init.d/proftpd stop
 test_manual=0
-start_cmd=/etc/init.d/proftpd start
 test_always=0
-ftpusers=/etc/ftpusers
-stop_cmd=/etc/init.d/proftpd stop
+pid_file=/var/run/proftpd.pid
+start_cmd=/etc/init.d/proftpd start
+proftpd_conf=/etc/proftpd/proftpd.conf
diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config
index 219c5c968..d756d1439 100644
--- a/webmin/qmailadmin/config
+++ b/webmin/qmailadmin/config
@@ -1,14 +1,14 @@
 mail_dir_qmail=Maildir
-mail_file=Mailbox
-mail_system=1
+sort_mode=0
 delete_warn=1
-max_records=200
 index_min=1000000
-mail_dir=
-mailq_count=0
+mailq_sort=0
 qmail_dir=/var/qmail
-columns=2
 perpage=20
-sort_mode=0
 fwd_mode=0
-mailq_sort=0
+mailq_count=0
+mail_dir=
+columns=2
+mail_system=1
+mail_file=Mailbox
+max_records=200
diff --git a/webmin/quota/config b/webmin/quota/config
index b82fde233..009d3f9d9 100644
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
-display_max=100
 group_edquota_command=edquota -g
-group_copy_command=edquota -g -p
-user_copy_command=edquota -u -p
-group_grace_command=edquota -g -t
-show_grace=1
 hide_uids=0
-sort_mode=0
-user_edquota_command=edquota -u
+pc_show=1
+show_grace=1
+group_setquota_command=setquota -g
 user_quotaon_command=quotaon -u
-group_quota_command=quota -v -g
-block_mode=1
-group_repquota_command=repquota -g -v
+user_grace_command=edquota -u -t
 user_quotaoff_command=quotaoff -u
+group_grace_command=edquota -g -t
+display_max=100
 block_size=1024
-user_repquota_command=repquota -u -v
-group_quotaon_command=quotaon -g
+sort_mode=0
 user_setquota_command=setquota -u
-pc_show=1
-user_grace_command=edquota -u -t
-group_setquota_command=setquota -g
+group_quota_command=quota -v -g
+user_repquota_command=repquota -u -v
+user_copy_command=edquota -u -p
 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
-quotacheck_command=quotacheck -u -g
+user_edquota_command=edquota -u
+block_mode=1
 user_quota_command=quota -v -u
+group_copy_command=edquota -g -p
+quotacheck_command=quotacheck -u -g
+group_repquota_command=repquota -g -v
+group_quotaon_command=quotaon -g
+group_quotaoff_command=quotaoff -g
diff --git a/webmin/samba/config b/webmin/samba/config
index 5b3ac1992..aa79ec46d 100644
--- a/webmin/samba/config
+++ b/webmin/samba/config
@@ -1,18 +1,18 @@
 pdbedit=/usr/bin/pdbedit
-restart_cmd=service smbd restart ; service nmbd restart
-samba_server=/usr/sbin/smbd
-smb_conf=/etc/samba/smb.conf
+stop_cmd=service smbd stop ; service nmbd stop
+smbgroupedit=/usr/bin/smbgroupedit
+smb_passwd=/etc/samba/smbpasswd
+samba_password_program=/usr/bin/smbpasswd
+net=/usr/bin/net
 name_server=/usr/sbin/nmbd
-samba_status_program=/usr/bin/smbstatus
 swat=/usr/sbin/swat
 text_lists=0
 dont_convert=-499
-smbgroupedit=/usr/bin/smbgroupedit
-run_from_inetd=0
-start_cmd=service smbd start ; service nmbd start
-net=/usr/bin/net
-smb_passwd=/etc/samba/smbpasswd
 list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
-stop_cmd=service smbd stop ; service nmbd stop
-samba_password_program=/usr/bin/smbpasswd
+samba_status_program=/usr/bin/smbstatus
 sort_mode=0
+smb_conf=/etc/samba/smb.conf
+run_from_inetd=0
+restart_cmd=service smbd restart ; service nmbd restart
+samba_server=/usr/sbin/smbd
+start_cmd=service smbd start ; service nmbd start
diff --git a/webmin/sarg/config b/webmin/sarg/config
index 0b89616c5..f022ea033 100644
--- a/webmin/sarg/config
+++ b/webmin/sarg/config
@@ -1,4 +1,4 @@
-naked=0
 clear=1
-sarg_conf=/etc/sarg/sarg.conf
 sarg=sarg
+sarg_conf=/etc/sarg/sarg.conf
+naked=0
diff --git a/webmin/sendmail/config b/webmin/sendmail/config
index 46c8f7c05..dfe3acb55 100644
--- a/webmin/sendmail/config
+++ b/webmin/sendmail/config
@@ -1,30 +1,30 @@
-mail_dir=/var/spool/mail
-index_min=1000000
+mail_style=0
 max_records=200
-delete_warn=1
+show_to=0
+top_buttons=1
+fwd_mode=0
+perpage=20
+sendmail_command=/usr/lib/sendmail -bd -q1h
 sendmail_pid=/var/run/sendmail/mta/sendmail.pid
-mail_file=mbox
-makemap_path=makemap
+wrap_width=80
 sendmail_cf=/etc/mail/sendmail.cf
-smrsh_dir=/etc/smrsh
-fwd_mode=0
+delete_warn=1
+sendmail_mc=/etc/mail/sendmail.mc
 mailq_sort=0
-sendmail_path=/usr/lib/sendmail
-mail_style=0
-show_cmts=0
-prefix_cmts=0
-mailq_count=0
+index_min=1000000
+sendmail_features=/usr/share/sendmail/cf
+mail_dir=/var/spool/mail
+columns=2
 order_mail=0
-mail_type=0
-sendmail_mc=/etc/mail/sendmail.mc
+mail_file=mbox
 track_read=0
-delete_confirm=1
-show_to=0
-sendmail_features=/usr/share/sendmail/cf
+mailq_count=0
+smrsh_dir=/etc/smrsh
+show_cmts=0
+makemap_path=makemap
+sendmail_path=/usr/lib/sendmail
 sort_mode=0
+prefix_cmts=0
+delete_confirm=1
 mailq_show=Date,From,To,Size,Status
-perpage=20
-sendmail_command=/usr/lib/sendmail -bd -q1h
-columns=2
-top_buttons=1
-wrap_width=80
+mail_type=0
diff --git a/webmin/servers/config b/webmin/servers/config
index 2e2fe5d7f..b22dd116f 100644
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
-max_servers=100
+resolve=1
 display_mode=0
 show_status=1
+max_servers=100
+groups_dir=/etc/cluster/groups
 scan_time=5
+deflink=0
+deffast=2
 show_ip=0
-resolve=1
-groups_dir=/etc/cluster/groups
 sort_mode=0
-deffast=2
-deflink=0
 capath=/usr/share/ca-certificates
diff --git a/webmin/shell/config b/webmin/shell/config
index 89ffda098..044e158ce 100644
--- a/webmin/shell/config
+++ b/webmin/shell/config
@@ -1,3 +1,3 @@
-max_output=100000
 clear_envs=0
+max_output=100000
 max_runtime=86400
diff --git a/webmin/shorewall/config b/webmin/shorewall/config
index 212c16f61..6ece68c67 100644
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
+shorewall=shorewall
+display_zone_descriptions=1
 macros=/usr/share/shorewall
 actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
-shorewall=shorewall
 config_dir=/etc/shorewall
-display_zone_descriptions=1
diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config
index 663e7f376..585637f3c 100644
--- a/webmin/shorewall6/config
+++ b/webmin/shorewall6/config
@@ -1,5 +1,5 @@
-display_zone_descriptions=1
 config_dir=/etc/shorewall6
-shorewall6=shorewall6
 actions=/etc/shorewall6/actions	/usr/share/shorewall6/actions.std
+shorewall6=shorewall6
+display_zone_descriptions=1
 macros=/usr/share/shorewall6
diff --git a/webmin/smart-status/config b/webmin/smart-status/config
index 364a682bf..80a802176 100644
--- a/webmin/smart-status/config
+++ b/webmin/smart-status/config
@@ -1,4 +1,4 @@
 ata=0
-smartctl=smartctl
 attribs=1
 mode=1
+smartctl=smartctl
diff --git a/webmin/software/config b/webmin/software/config
index c93f3edb6..bf587ee21 100644
--- a/webmin/software/config
+++ b/webmin/software/config
@@ -1,3 +1,3 @@
-update_system=apt
 package_system=debian
+update_system=apt
 apt_mode=0
diff --git a/webmin/spam/config b/webmin/spam/config
index 8079f184b..a78d0ab08 100644
--- a/webmin/spam/config
+++ b/webmin/spam/config
@@ -1,12 +1,12 @@
 processes=spamd amavisd
-local_cf=/etc/spamassassin/local.cf
 warn_procmail=1
-spamassassin=spamassassin
-restart_cmd=/etc/init.d/spamassassin restart
 sa_learn=sa-learn
-procmailrc=/etc/procmailrc
 max_awl=200
+spamassassin=spamassassin
 call_spam=1
-mode=0
-procmail_cmd=*
+local_cf=/etc/spamassassin/local.cf
 addto=0
+procmail_cmd=*
+restart_cmd=/etc/init.d/spamassassin restart
+mode=0
+procmailrc=/etc/procmailrc
diff --git a/webmin/squid/config b/webmin/squid/config
index b3b8ccc35..a1c6ad183 100644
--- a/webmin/squid/config
+++ b/webmin/squid/config
@@ -1,21 +1,21 @@
-squid_restart=service squid reload
+cal_fmt=w
+sync_modify=1
 squid_start=service squid start
+sort_conf=0
+cal_args=-aw
 squid_conf=/etc/squid/squid.conf
-sync_modify=1
-squid_path=squid
-log_dir=/var/log/squid
-cal_fmt=w
 cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
-cal_all=1
-cache_dir=/var/spool/squid
-pid_file=/var/run/squid.pid
-sync_create=0
-calamaris=calamaris
 crypt_conf=0
 cal_max=50000
-cal_args=-aw
-sort_conf=0
-squidclient=squidclient
+cache_dir=/var/spool/squid
+log_dir=/var/log/squid
 squid_stop=service squid stop
-sync_delete=0
+sync_create=0
+squidclient=squidclient
 restart_pos=0
+squid_path=squid
+squid_restart=service squid reload
+sync_delete=0
+calamaris=calamaris
+cal_all=1
+pid_file=/var/run/squid.pid
diff --git a/webmin/sshd/config b/webmin/sshd/config
index caa0d09c9..2defd9ec8 100644
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,12 +1,12 @@
-sshd_config=/etc/ssh/sshd_config
+keygen_path=/usr/bin/ssh-keygen
+pid_file=/var/run/sshd.pid
+sync_auth=1
+sync_gnupg=0
+stop_cmd=service ssh stop
 sshd_path=/usr/sbin/sshd
-sync_pass=0
+sshd_config=/etc/ssh/sshd_config
 start_cmd=service ssh start
-stop_cmd=service ssh stop
-sync_gnupg=0
-keygen_path=/usr/bin/ssh-keygen
+restart_cmd=systemctl reload sshd
 sync_create=0
-pid_file=/var/run/sshd.pid
+sync_pass=0
 client_config=/etc/ssh/ssh_config
-restart_cmd=systemctl reload sshd
-sync_auth=1
diff --git a/webmin/status/config b/webmin/status/config
index 9f51d6ab2..64e16605f 100644
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,14 +1,14 @@
+snmp_version=2
+history_show=50
+sort_mode=0
 history_purge=30
-sched_offset=0
-output=0
 pinger=linux
+sched_offset=0
+sysinfo=0
 pager_cmd=sms_client
+output=0
+index_status=1
+subject_mode=0
 columns=2
-sysinfo=0
-history_show=50
 sysinfo_users=0
 snmp_trap=1.3.6.1.4.1.10000.1.1
-index_status=1
-snmp_version=2
-subject_mode=0
-sort_mode=0
diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config
index a25031da2..03a00972f 100644
--- a/webmin/syslog-ng/config
+++ b/webmin/syslog-ng/config
@@ -1,7 +1,7 @@
-stop_cmd=/etc/init.d/syslog-ng stop
-syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 start_cmd=/etc/init.d/syslog-ng start
 syslogng_cmd=syslog-ng
+syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 pid_file=/var/run/syslog-ng.pid
-lines=20
 compressed=1
+stop_cmd=/etc/init.d/syslog-ng stop
+lines=20
diff --git a/webmin/syslog/config b/webmin/syslog/config
index cf5467ecc..b5d5b4183 100644
--- a/webmin/syslog/config
+++ b/webmin/syslog/config
@@ -1,19 +1,19 @@
+signal_cmd=/usr/sbin/service rsyslog restart
+pri_dir=1
 pid_file=/var/run/rsyslogd.pid
+tags=0
+start_cmd=/usr/sbin/service rsyslog start
 socket=0
-lines=20
+restart_cmd=/usr/sbin/service rsyslog restart
+reverse=0
+pipe=1
+facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
 compressed=1
+syslogd=/usr/sbin/rsyslogd
 others=1
-pri_dir=1
-pri_all=1
+lines=20
 m4_conf=0
-restart_cmd=/usr/sbin/service rsyslog restart
-syslogd=/usr/sbin/rsyslogd
-pipe=1
 sync=1
-facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
-syslog_conf=/etc/rsyslog.conf
-reverse=0
-signal_cmd=/usr/sbin/service rsyslog restart
 m4_path=
-tags=0
-start_cmd=/usr/sbin/service rsyslog start
+syslog_conf=/etc/rsyslog.conf
+pri_all=1
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 ddc301405..161d92a01 100644
--- a/webmin/tcpwrappers/config
+++ b/webmin/tcpwrappers/config
@@ -1,3 +1,3 @@
 hosts_allow=/etc/hosts.allow
-inetd_services=0
 hosts_deny=/etc/hosts.deny
+inetd_services=0
diff --git a/webmin/telnet/config b/webmin/telnet/config
index 821dae8f1..80e4c04c8 100644
--- a/webmin/telnet/config
+++ b/webmin/telnet/config
@@ -1,5 +1,5 @@
-no_test=0
 detach=0
 proxy=0
-mode=1
 sizemode=0
+no_test=0
+mode=1
diff --git a/webmin/time/config b/webmin/time/config
index 88f5fad74..042d12c0c 100644
--- a/webmin/time/config
+++ b/webmin/time/config
@@ -1,6 +1,6 @@
 zone_style=linux
-seconds=1
 timeserver=0.pool.ntp.org
+timeserver_hardware=1
+seconds=1
 ntp_only=1
 lease=5
-timeserver_hardware=1
diff --git a/webmin/updown/config b/webmin/updown/config
index 663a8803c..aba856c09 100644
--- a/webmin/updown/config
+++ b/webmin/updown/config
@@ -1,4 +1,4 @@
-dir=/
-duser=root
 ddir=/
+duser=root
+dir=/
 user=root
diff --git a/webmin/useradmin/config b/webmin/useradmin/config
index 30fc116be..fed989bbd 100644
--- a/webmin/useradmin/config
+++ b/webmin/useradmin/config
@@ -1,41 +1,41 @@
-random_password=0
+gid_mode=1
+home_style=0
+base_uid=1000
 secmode=0
+passwd_progmode=0
+random_password=0
+uid_calc=0
 passwd_stars=0
-default_other=1
+email_type=0
+extra_real=0
 delete_root=0
-empty_mode=0
-display_mode=1
-shadow_file=/etc/shadow
-membox=0
-lock_string=*
-default_group=users
-from_files=0
-passwd_dict=0
-shells=fixed,passwd,shells
-user_files=/etc/skel
-home_style=0
 home_base=/home
-passwd_progmode=0
-last_show=0
+passwd_same=0
+alias_check=0
 uid_mode=1
-sort_mode=0
-gid_mode=1
-new_user_gid=0
-skip_md5=0
+delete_only=0
+gid_calc=0
+new_user_group=0
+last_show=0
+default_other=1
+empty_mode=0
+passwd_dict=0
+membox=0
+gshadow_file=/etc/gshadow
 group_file=/etc/group
-email_type=0
+selinux_con=user_u:object_r:user_home_dir_t
 base_gid=1000
+sort_mode=0
+user_files=/etc/skel
+display_max=400
+new_user_gid=0
 passwd_file=/etc/passwd
-selinux_con=user_u:object_r:user_home_dir_t
-new_user_group=0
-gid_calc=0
-delete_only=0
-alias_check=0
-passwd_same=0
-gshadow_file=/etc/gshadow
-extra_real=0
-md5=1
 homedir_perms=0755
-base_uid=1000
-display_max=400
-uid_calc=0
+lock_string=*
+shells=fixed,passwd,shells
+md5=1
+display_mode=1
+from_files=0
+skip_md5=0
+shadow_file=/etc/shadow
+default_group=users
diff --git a/webmin/usermin/config b/webmin/usermin/config
index 2dfd4b1b0..fe47b856f 100644
--- a/webmin/usermin/config
+++ b/webmin/usermin/config
@@ -1,7 +1,7 @@
-upshow=1
 usermin_dir=/etc/usermin
-cron_mode=0
 upmissing=0
-uphour=4
 updays=1
+uphour=4
+cron_mode=0
 update=0
+upshow=1
diff --git a/webmin/version b/webmin/version
index a233e7b74..f9aaab221 100644
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.998
+1.999
diff --git a/webmin/vgetty/config b/webmin/vgetty/config
index bb4eec4d2..00f79ad34 100644
--- a/webmin/vgetty/config
+++ b/webmin/vgetty/config
@@ -1,2 +1,2 @@
-vgetty_cmd=vgetty
 vgetty_config=/etc/mgetty+sendfax/voice.conf
+vgetty_cmd=vgetty
diff --git a/webmin/webalizer/config b/webmin/webalizer/config
index 3e7436799..beddb8779 100644
--- a/webmin/webalizer/config
+++ b/webmin/webalizer/config
@@ -1,6 +1,6 @@
-webalizer_conf=/etc/webalizer/webalizer.conf
 webalizer=/usr/bin/webalizer
-auto=apache,squid,proftpd,wuftpd
-skip_old=0
+webalizer_conf=/etc/webalizer/webalizer.conf
 naked=0
 alt_conf=/etc/webalizer/webalizer.conf.sample
+skip_old=0
+auto=apache,squid,proftpd,wuftpd
diff --git a/webmin/webmin/config b/webmin/webmin/config
index 9819422d9..5bfc1b651 100644
--- a/webmin/webmin/config
+++ b/webmin/webmin/config
@@ -1,12 +1,12 @@
-warn_days=7
-updays=1
-update=0
+upshow=1
+last_version_check=1549050668
 uphour=23
-osdn=1
+updays=1
 cron_mode=0
-last_version_check=1549050668
+osdn=1
+warn_days=7
+update=0
 last_version_number=1.900
 letsencrypt_dns_wait=10
 upmins=47
 upmissing=0
-upshow=1
diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config
index 28ec100e6..f7c268e69 100644
--- a/webmin/wuftpd/config
+++ b/webmin/wuftpd/config
@@ -1,8 +1,8 @@
 ftphosts=/etc/wu-ftpd/ftphosts
+pid_file=/var/run/ftpd.pids-all
 ftpgroups=/etc/wu-ftpd/ftpgroups
-ftpusers=/etc/wu-ftpd/ftpusers
+ftpaccess=/etc/wu-ftpd/ftpaccess
 ftpd_path=/usr/sbin/wu-ftpd
-pid_file=/var/run/ftpd.pids-all
+ftpusers=/etc/wu-ftpd/ftpusers
 ftpconversions=/etc/wu-ftpd/ftpconversions
 log_file=/var/log/xferlog
-ftpaccess=/etc/wu-ftpd/ftpaccess
diff --git a/webmin/xinetd/config b/webmin/xinetd/config
index 14054cfe7..1ded43714 100644
--- a/webmin/xinetd/config
+++ b/webmin/xinetd/config
@@ -1,5 +1,5 @@
-start_cmd=/etc/init.d/xinetd start
-protocols_file=/etc/protocols
+xinetd_conf=/etc/xinetd.conf
 lookup_servs=1
+start_cmd=/etc/init.d/xinetd start
 pid_file=/var/run/xinetd.pid
-xinetd_conf=/etc/xinetd.conf
+protocols_file=/etc/protocols