From: mhoellein <mario@hoellein.online>
Date: Tue, 7 Jul 2020 08:23:41 +0000 (+0200)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=1a4667b57798b5ee56a85892c93162c7a822f9ba;p=vserver

committing changes in /etc after apt run

Package changes:
-code-brand 4.2-23 all
+code-brand 4.2-25 all
-curl 7.58.0-2ubuntu3.8 amd64
+curl 7.58.0-2ubuntu3.9 amd64
-dbus 1.12.2-1ubuntu1.1 amd64
+dbus 1.12.2-1ubuntu1.2 amd64
-intel-microcode 3.20191115.1ubuntu0.18.04.2 amd64
+intel-microcode 3.20200609.0ubuntu0.18.04.1 amd64
-libc-bin 2.27-3ubuntu1 amd64
-libc-dev-bin 2.27-3ubuntu1 amd64
-libc6 2.27-3ubuntu1 amd64
-libc6-dev 2.27-3ubuntu1 amd64
+libc-bin 2.27-3ubuntu1.2 amd64
+libc-dev-bin 2.27-3ubuntu1.2 amd64
+libc6 2.27-3ubuntu1.2 amd64
+libc6-dev 2.27-3ubuntu1.2 amd64
-libcurl3-gnutls 7.58.0-2ubuntu3.8 amd64
-libcurl4 7.58.0-2ubuntu3.8 amd64
+libcurl3-gnutls 7.58.0-2ubuntu3.9 amd64
+libcurl4 7.58.0-2ubuntu3.9 amd64
-libdbus-1-3 1.12.2-1ubuntu1.1 amd64
+libdbus-1-3 1.12.2-1ubuntu1.2 amd64
-libdrm-amdgpu1 2.4.99-1ubuntu1~18.04.2 amd64
-libdrm-common 2.4.99-1ubuntu1~18.04.2 all
-libdrm-intel1 2.4.99-1ubuntu1~18.04.2 amd64
-libdrm-nouveau2 2.4.99-1ubuntu1~18.04.2 amd64
-libdrm-radeon1 2.4.99-1ubuntu1~18.04.2 amd64
-libdrm2 2.4.99-1ubuntu1~18.04.2 amd64
+libdrm-amdgpu1 2.4.101-2~18.04.1 amd64
+libdrm-common 2.4.101-2~18.04.1 all
+libdrm-intel1 2.4.101-2~18.04.1 amd64
+libdrm-nouveau2 2.4.101-2~18.04.1 amd64
+libdrm-radeon1 2.4.101-2~18.04.1 amd64
+libdrm2 2.4.101-2~18.04.1 amd64
-libgnutls30 3.5.18-1ubuntu1.3 amd64
+libgnutls30 3.5.18-1ubuntu1.4 amd64
-libjpeg-turbo8 1.5.2-0ubuntu5.18.04.3 amd64
+libjpeg-turbo8 1.5.2-0ubuntu5.18.04.4 amd64
-libseccomp2 2.4.1-0ubuntu0.18.04.2 amd64
+libseccomp2 2.4.3-1ubuntu3.18.04.2 amd64
-libsqlite3-0 3.22.0-1ubuntu0.3 amd64
+libsqlite3-0 3.22.0-1ubuntu0.4 amd64
-libxau6 1:1.0.8-1 amd64
+libxau6 1:1.0.8-1ubuntu1 amd64
-linux-base 4.5ubuntu1.1 all
+linux-base 4.5ubuntu1.2 all
-linux-libc-dev 4.15.0-101.102 amd64
+linux-libc-dev 4.15.0-109.110 amd64
-locales 2.27-3ubuntu1 all
-locales-all 2.27-3ubuntu1 amd64
+locales 2.27-3ubuntu1.2 all
+locales-all 2.27-3ubuntu1.2 amd64
-multiarch-support 2.27-3ubuntu1 amd64
-mutt 1.9.4-3ubuntu0.1 amd64
+multiarch-support 2.27-3ubuntu1.2 amd64
+mutt 1.9.4-3ubuntu0.3 amd64
-nplan 0.99-0ubuntu3~18.04.2 all
+nplan 0.99-0ubuntu3~18.04.3 all
-python3-update-manager 1:18.04.11.12 all
+python3-update-manager 1:18.04.11.13 all
-update-manager-core 1:18.04.11.12 all
+update-manager-core 1:18.04.11.13 all
-webmin 1.941 all
+webmin 1.953 all
---

diff --git a/.etckeeper b/.etckeeper
index 6ab36d8c3..ce6f31dd7 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -3547,6 +3547,7 @@ maybe chmod 0644 'letsencrypt/csr/1996_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1997_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1998_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/1999_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2000_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -5548,6 +5549,7 @@ maybe chmod 0600 'letsencrypt/keys/1996_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1997_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1998_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/1999_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2000_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/collabora.hoellein.online/README'
diff --git a/init.d/webmin b/init.d/webmin
index 626bb1cad..b3ed40ce5 100755
--- a/init.d/webmin
+++ b/init.d/webmin
@@ -39,11 +39,6 @@ stop)
 	if [ "$RETVAL" = "0" ]; then
 		rm -f $LOCKFILE
 	fi
-	pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'`
-	if [ "$pidfile" = "" ]; then
-		pidfile=$PIDFILE
-	fi
-	rm -f $pidfile
 	;;
 status)
 	pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'`
diff --git a/letsencrypt/csr/2000_csr-certbot.pem b/letsencrypt/csr/2000_csr-certbot.pem
new file mode 100644
index 000000000..c696b4e15
--- /dev/null
+++ b/letsencrypt/csr/2000_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICcjCCAVoCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXb
+pw3gMFYkfaflTxfHpyJ5JA3CrhNql302r1ZmjkBA8U/cAwYlCcqLJACQKf4FSkn1
+fKodcys5VMcd9z3lYt06sf+S4DjMRiCjKqeHq4wkkcDawQ8Z9nf4qIVd+r/wb86I
+vvclEb/BErH3HfOMmvfEdlH1hNohlHefzvfPrv7d2K3Zvul8+/1hh/2KXoSMcUP1
++u1n7TOjZKRed/JinwOv94AqzU/p/tuIj/gHOFBaNnqdUeCczg+wISDB14+w8e8+
+AU2JVH4wlIy5H2M9kLFDveKnkXFPHVmIb45Yop4oiY9/uQQSX8WbdCoTiQjLBwNc
+ibqXJtK9+OE3tcLoiS8CAwEAAaAtMCsGCSqGSIb3DQEJDjEeMBwwGgYDVR0RBBMw
+EYIPaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQAD5G7fsA77NAcK
+TqgqH6xcYWatMqDISPnpGWijEf2EKadfaDJx4Xj5HgNpUDkqkAzKoVnn+3WB62vZ
+HUfYjGN4jjQg3N2MFvWs4Xui9OSXzPDfq6duDP6N/xdzZXrvck5d7T6O6wsd+rQk
+0YBl8Qx1H+tA1kjwhI98/UXiUgKNBQxTKk/Svmk149KvV+JpUjrdpdlOyjZTkLNu
+c7lyPRy6DJm+HCLs+6Qj7+l7xuRdR2zS7tisXYnbt1Na/BRziy8aD8YUpyL6yNp1
+vQ7WtGtB4v69Iqot7j8IdReSvKlMvpaE8g0Q2xjVRhzr7WwBrMhOH9/VqjbfASQZ
+k1ytCJkV
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/2000_key-certbot.pem b/letsencrypt/keys/2000_key-certbot.pem
new file mode 100644
index 000000000..5c809481e
--- /dev/null
+++ b/letsencrypt/keys/2000_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDV26cN4DBWJH2n
+5U8Xx6cieSQNwq4Tapd9Nq9WZo5AQPFP3AMGJQnKiyQAkCn+BUpJ9XyqHXMrOVTH
+Hfc95WLdOrH/kuA4zEYgoyqnh6uMJJHA2sEPGfZ3+KiFXfq/8G/OiL73JRG/wRKx
+9x3zjJr3xHZR9YTaIZR3n873z67+3dit2b7pfPv9YYf9il6EjHFD9frtZ+0zo2Sk
+XnfyYp8Dr/eAKs1P6f7biI/4BzhQWjZ6nVHgnM4PsCEgwdePsPHvPgFNiVR+MJSM
+uR9jPZCxQ73ip5FxTx1ZiG+OWKKeKImPf7kEEl/Fm3QqE4kIywcDXIm6lybSvfjh
+N7XC6IkvAgMBAAECggEBAIBs07kldGGGsF7u+bxSDTBKhzgsPNU0IZz0Bf9gvvQf
+C8rlWHuMKoETZZ9g85a0HpSjcyXFYbAHUb3xZNQquGAaK2JLFZOGOGbJFYhdlMsn
++s9RjrY+5R/Ol4TflwFEph/lRqir/iilDVEKEVZ8jWNU+6jkQ8+qcroTofp3IaOz
+A+t+eHWiUqG7hO4CNfUZ3qL1oehJ3Yq4A2FyAIJMeUzDl4CMvCWwcwiof5+vfdDy
+HHJ4JBByTZN1xrg64olsIafaJ/3XwEIj7T4dxSMyy6T7nKDMWYZwxreeFFPhN3/R
+8Vn9zubbOnoPwubN3Va5sw2wXlswAAwvb3HyOzRRhWECgYEA/AMu/bEXBhANkC6k
+cJXjZWs6k8y/ZldfNIvZ1HAjboOIitW8EJIafUPwb1TJrlrwMPm9PyrvxFCi7mCT
+ogTis/pED+FtQXnUm3SCNAp/2T2Jbna5Hk+5Qb/y1IxtqUNF0D8QX/Nr0Xo2jDBy
+2ablCjX60Gs66wZ3FG9H36RPF5MCgYEA2T3rIDby+zwMFiLkjPbbf6a/e2+TOz7k
+10ik47IJg9tsKikXTyj6gsF825u6B5M4IlrHn/ZlQ8hy1wVhXs5iqOu2/1epFUSz
+68J2b7LRp5T8GgCLiWlHTJj0azKxee8HJIndOE2MCK3Vy8EBbCVOfm6z5CqAj5qI
+Om21/ShGEXUCgYEAzgyMT0CL4pkdfdWk/aiP1ExoCJBPrg2h+gSeheNqFOHWsi0v
+Jx1OKz1xSJW6kKQp3uFSqmMgxxJnJSAxlTcJZL4rCBD4k6BZBQGts38iKSz3QSox
+EWd9wRSAJujqgIpQeoQVj14nuY6DKvwx62NZwY+BEweZlLAkjMCvs1tUj6ECgYAC
+ckINkNDXp2tzbF0qgTUjkNsjJrR/vEuTaQwCTGTzCSuEpgXPLGT1x/wB9RT5NN0y
+9da9pGarhrxUU4kvKh/OSyk6YuBSjv1/sCbpRxg5TOIx4MOxfnABGs/VzTJWbyyj
+arIFCkqDZoG706aSczEZF2ILNbdQ5qqWDdo4yZVQaQKBgQCbAL/344+b5J9onaZD
+DZy/nRLJx10jcNQ+aGp/GwZrI3ynCmDj9eMbEnZE09vfgFQa1fS7k+crfiWeFDTc
+jfudgGtveC6cmI6Zu/wtSLxza7ONDFoJmRtlUcyVDwYPHL9QkWOlm+px+v8xnipl
+7zZV/VLU2q8i6Z1Ef7MHrjy6JA==
+-----END PRIVATE KEY-----
diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config
index 35ecd105a..fb5a3d2b0 100644
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
 pppoe_conf=/etc/ppp/pppoe.conf
-conf_style=0
-pppoe_cmd=pppoe
+stop_cmd=adsl-stop
 pap_file=/etc/ppp/pap-secrets
-start_cmd=adsl-start
+pppoe_cmd=pppoe
+conf_style=0
 status_cmd=adsl-status
-stop_cmd=adsl-stop
+start_cmd=adsl-start
diff --git a/webmin/apache/config b/webmin/apache/config
index 126cec138..367b72335 100644
--- a/webmin/apache/config
+++ b/webmin/apache/config
@@ -1,24 +1,24 @@
-apachectl_path=/usr/sbin/apache2ctl
-show_order=0
-allow_virtualmin=0
-httpd_path=/usr/sbin/apache2
+show_names=0
+stop_cmd=/etc/init.d/apache2 stop
+max_servers=100
+apply_cmd=/usr/sbin/apache2ctl graceful
 start_cmd=/etc/init.d/apache2 start
-show_list=0
-defines_file=/etc/apache2/envvars
-test_config=1
-test_always=0
-virt_file=/etc/apache2/sites-available
-test_manual=0
 httpd_dir=/etc/apache2
-httpd_conf=/etc/apache2/apache2.conf
+test_manual=0
+apachectl_path=/usr/sbin/apache2ctl
 defines_name=APACHE_ARGUMENTS
+virt_file=/etc/apache2/sites-available
 srm_conf=/etc/apache2/srm.conf
-apply_cmd=/usr/sbin/apache2ctl graceful
-stop_cmd=/etc/init.d/apache2 stop
-show_names=0
+test_always=0
+test_config=1
 mime_types=/etc/apache2/mime.types
+httpd_conf=/etc/apache2/apache2.conf
 auto_mods=1
-test_apachectl=1
 link_dir=/etc/apache2/sites-enabled
+defines_file=/etc/apache2/envvars
+show_list=0
+test_apachectl=1
+httpd_path=/usr/sbin/apache2
+allow_virtualmin=0
 access_conf=/etc/apache2/access.conf
-max_servers=100
+show_order=0
diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info
index 80406de72..22ee1292c 100644
--- a/webmin/apache/httpd-info
+++ b/webmin/apache/httpd-info
@@ -1,4 +1,4 @@
-time=1566420201
+time=1587659920
 cmd=/usr/sbin/apache2
 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
-version=2.441
+version=2.443
diff --git a/webmin/backup-config/config b/webmin/backup-config/config
index 7f0472b86..42c8775c3 100644
--- a/webmin/backup-config/config
+++ b/webmin/backup-config/config
@@ -1,3 +1,3 @@
 apply=1
-date_subs=0
 webmin_subs=0
+date_subs=0
diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config
index dbc46b717..a1f11a686 100644
--- a/webmin/bacula-backup/config
+++ b/webmin/bacula-backup/config
@@ -1,12 +1,12 @@
-apply=1
-showdirs=0
+pass=
 btape=btape
 bacula_dir=/etc/bacula
-db=bacula
-wait=1
-init_start=0
-pass=
-driver=Pg
 bls=bls
+driver=Pg
+db=bacula
 user=bacula
+apply=1
 bextract=bextract
+init_start=0
+wait=1
+showdirs=0
diff --git a/webmin/bind8/config b/webmin/bind8/config
index 25800a285..66c4e59a5 100644
--- a/webmin/bind8/config
+++ b/webmin/bind8/config
@@ -1,45 +1,45 @@
-ipv6_mode=1
-show_list=0
-short_names=0
-zones_file=/etc/bind/named.conf.local
-support_aaaa=1
-allow_comments=0
-by_view=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
 forwardzonefilename_format=ZONE.hosts
-signzone=dnssec-signzone
-slave_dir=/var/lib/bind
-master_dir=/var/lib/bind
-updserial_man=1
-rndcconf_cmd=rndc-confgen
-checkzone=named-checkzone
-relative_paths=0
-checkconf=named-checkconf
-allow_wild=1
-rev_must=0
 allow_underscore=1
-rev_def=0
-force_random=0
-other_slaves=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
-soa_style=0
+master_ttl=1
+max_zones=50
 no_pid_chroot=0
+rndc_conf=/etc/bind/rndc.conf
+zones_file=/etc/bind/named.conf.local
+records_order=0
+updserial_on=1
+named_path=/usr/sbin/named
+slave_dir=/var/lib/bind
+other_slaves=1
+ndc_cmd=ndc
+rev_must=0
 soa_start=0
+allow_comments=0
+allow_wild=1
+reversezonefilename_format=ZONE.rev
 rndc_cmd=rndc
-spf_record=0
-allow_long=0
+updserial_man=1
+rndcconf_cmd=rndc-confgen
+master_dir=/var/lib/bind
 whois_cmd=whois
-named_conf=/etc/bind/named.conf
-rndc_conf=/etc/bind/rndc.conf
-updserial_def=0
-named_path=/usr/sbin/named
+force_random=0
 largezones=0
-max_zones=50
-reversezonefilename_format=ZONE.rev
-keygen=dnssec-keygen
+spf_record=0
 confirm_zone=1
-master_ttl=1
-confirm_rec=0
-records_order=0
+show_list=0
+support_aaaa=1
+ipv6_mode=1
+rev_def=0
+soa_style=0
+relative_paths=0
 no_chroot=0
-ndc_cmd=ndc
-updserial_on=1
+updserial_def=0
+named_conf=/etc/bind/named.conf
+checkconf=named-checkconf
+signzone=dnssec-signzone
+confirm_rec=0
+short_names=0
+allow_long=0
+by_view=0
+checkzone=named-checkzone
+keygen=dnssec-keygen
diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config
index 02cf5b24f..75e5ffcde 100644
--- a/webmin/cluster-passwd/config
+++ b/webmin/cluster-passwd/config
@@ -1,3 +1,3 @@
-sort_mode=0
 input_type=0
 max_users=200
+sort_mode=0
diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config
index 470eaee86..fd788cb1e 100644
--- a/webmin/cluster-software/config
+++ b/webmin/cluster-software/config
@@ -1,2 +1,2 @@
-sort_mode=0
 table_mode=0
+sort_mode=0
diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config
index ec10edc0b..5a783be59 100644
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
-conf_find_group=1
-conf_add_user=1
-conf_find_user=1
+conf_host_links=1
 conf_allow_refresh=1
 sort_mode=0
 table_mode=0
-conf_host_links=1
-conf_add_group=1
+conf_find_group=1
 conf_allow_sync=1
+conf_find_user=1
+conf_add_group=1
+conf_add_user=1
diff --git a/webmin/config b/webmin/config
index f8e268896..52e66c84a 100644
--- a/webmin/config
+++ b/webmin/config
@@ -1,32 +1,32 @@
-product=webmin
-theme=authentic-theme
-ld_env=LD_LIBRARY_PATH
-showhost=0
-lang_root=de.UTF-8
-passwd_uindex=0
-by_view=0
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-real_os_version=18.04.1
+passwd_pindex=1
+md5pass=1
+passwd_mindex=4
+webprefix=
+dateformat=dd/mon/yyyy
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+real_os_type=Ubuntu Linux
+nofeedbackcc=0
 passwd_file=/etc/shadow
+tempdelete_days=7
+showhost=0
 os_version=9.0
+feedback_to=
+real_os_version=18.04.1
 passwd_cindex=2
+showlogin=0
+theme=authentic-theme
 sysinfo=0
-md5pass=1
-help_height=
+hostnamemode=0
 log=1
-showlogin=0
+hostnamedisplay=
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
+product=webmin
+lang_root=de.UTF-8
+lang=en.UTF-8
 help_width=
-real_os_type=Ubuntu Linux
+help_height=
+ld_env=LD_LIBRARY_PATH
 os_type=debian-linux
-dateformat=dd/mon/yyyy
-lang=en.UTF-8
-webprefix=
-passwd_pindex=1
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+passwd_uindex=0
+by_view=0
 referers_none=1
-hostnamemode=0
-hostnamedisplay=
-feedback_to=
-passwd_mindex=4
-tempdelete_days=7
-nofeedbackcc=0
diff --git a/webmin/cpan/config b/webmin/cpan/config
index 379a2fc80..bf491dfd8 100644
--- a/webmin/cpan/config
+++ b/webmin/cpan/config
@@ -1,6 +1,6 @@
-save_partial=0
-incyum=1
-incpackages=1
 packages=http://www.cpan.org/modules/02packages.details.txt.gz
-refresh_days=30
 cpan=http://www.cpan.org/authors/id
+refresh_days=30
+save_partial=0
+incpackages=1
+incyum=1
diff --git a/webmin/cron/config b/webmin/cron/config
index 0ae309681..6cdb1b6dc 100644
--- a/webmin/cron/config
+++ b/webmin/cron/config
@@ -1,25 +1,25 @@
-max_jobs=100
-cron_allow_file=/var/spool/cron/allow
-cron_dir=/var/spool/cron/crontabs
-match_user=1
-show_run=0
-cronfiles_dir=/etc/cron.d
-max_len=80
-cron_edit_command=crontab -u USER -e
-cron_deny_all=2
+hourly_only=0
+cron_user_edit_command=crontab -e
 kill_subs=0
+max_jobs=100
+cron_deny_file=/var/spool/cron/deny
 show_time=0
-cron_user_delete_command=crontab -r
-vixie_cron=1
-system_crontab=/etc/crontab
-run_parts=run-parts
 match_mode=0
 show_next=0
-cron_deny_file=/var/spool/cron/deny
-cron_input=1
+cron_get_command=crontab -u USER -l
+run_parts=run-parts
+vixie_cron=1
 show_comment=0
+cron_user_delete_command=crontab -r
 cron_delete_command=crontab -u USER -r
-hourly_only=0
-cron_user_edit_command=crontab -e
+cronfiles_dir=/etc/cron.d
+cron_allow_file=/var/spool/cron/allow
+max_len=80
+cron_dir=/var/spool/cron/crontabs
+cron_deny_all=2
+system_crontab=/etc/crontab
 cron_user_get_command=crontab -l
-cron_get_command=crontab -u USER -l
+cron_edit_command=crontab -u USER -e
+match_user=1
+cron_input=1
+show_run=0
diff --git a/webmin/custom/config b/webmin/custom/config
index 6d0b22ef3..752c31344 100644
--- a/webmin/custom/config
+++ b/webmin/custom/config
@@ -1,4 +1,4 @@
+columns=2
 display_mode=0
 params_cmd=0
-columns=2
 params_file=0
diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index 6661b6a64..7afa885de 100644
--- a/webmin/dhcpd/config
+++ b/webmin/dhcpd/config
@@ -1,16 +1,16 @@
-pid_file=/var/run/dhcpd.pid
-lease_tz=0
 restart_cmd=service isc-dhcp-server restart
-dhcpd_conf=/etc/dhcp/dhcpd.conf
+group_name=0
 lease_sort=0
-lease_file=/var/lib/dhcp/dhcpd.leases
-interfaces_type=debian
+pid_file=/var/run/dhcpd.pid
+desc_name=0
+show_ip=0
 stop_cmd=service isc-dhcp-server stop
-dhcpd_path=/usr/sbin/dhcpd
-group_name=0
 dhcpd_nocols=5
-show_ip=0
+lease_file=/var/lib/dhcp/dhcpd.leases
+start_cmd=service isc-dhcp-server start
 display_max=100
-desc_name=0
+interfaces_type=debian
 show_mac=0
-start_cmd=service isc-dhcp-server start
+lease_tz=0
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+dhcpd_path=/usr/sbin/dhcpd
diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index bc17fdee6..6b5015323 100644
--- a/webmin/dovecot/config
+++ b/webmin/dovecot/config
@@ -1,4 +1,4 @@
+pid_file=/var/run/dovecot/master.pid
+dovecot_config=/etc/dovecot/dovecot.conf
 dovecot=/usr/sbin/dovecot
 init_script=dovecot
-dovecot_config=/etc/dovecot/dovecot.conf
-pid_file=/var/run/dovecot/master.pid
diff --git a/webmin/exim/config b/webmin/exim/config
index f4f97f8d4..d37d19e54 100644
--- a/webmin/exim/config
+++ b/webmin/exim/config
@@ -1,8 +1,8 @@
-exim_mail_file=Maildir
 exim_addrfile=/etc/exim4/email-addresses
-exim_dbmfile=/etc/exim4/local_domains
-exim_dbmext=.dbm
 mail_system=1
+exim_aliasfileext=
 exim_dir=/etc/exim4
 exim_virt_dir=/etc/exim4/aliases
-exim_aliasfileext=
+exim_dbmext=.dbm
+exim_mail_file=Maildir
+exim_dbmfile=/etc/exim4/local_domains
diff --git a/webmin/exports/config b/webmin/exports/config
index 7d1a41d0a..b8864bec5 100644
--- a/webmin/exports/config
+++ b/webmin/exports/config
@@ -1,3 +1,3 @@
+exports_file=/etc/exports
 restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi
 apply_cmd=exportfs -r
-exports_file=/etc/exports
diff --git a/webmin/failed.pl b/webmin/failed.pl
index 73c16988f..60342d489 100755
--- a/webmin/failed.pl
+++ b/webmin/failed.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-open(CONF, "/etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
+open(CONF, "</etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
 while(<CONF>) {
         $root = $1 if (/^root=(.*)/);
         }
diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config
index fd29d2563..cb824e95e 100644
--- a/webmin/fetchmail/config
+++ b/webmin/fetchmail/config
@@ -1,6 +1,6 @@
-fetchmail_path=fetchmail
 pid_file=/var/run/fetchmail.pid
-max_users=400
-view_mode=0
 config_file=
 daemon_user=root
+view_mode=0
+max_users=400
+fetchmail_path=fetchmail
diff --git a/webmin/filter/config b/webmin/filter/config
index b9a76acb0..23d7054fc 100644
--- a/webmin/filter/config
+++ b/webmin/filter/config
@@ -1,6 +1,6 @@
-reply_force=0
-virtualmin_config=/etc/webmin/virtual-server
 alias_files=/etc/aliases	/etc/postfix/aliases	/etc/mail/aliases
 virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
-warn_procmail=1
 forward_procmail=0
+warn_procmail=1
+reply_force=0
+virtualmin_config=/etc/webmin/virtual-server
diff --git a/webmin/firewall/config b/webmin/firewall/config
index 4623fa367..c861679b9 100644
--- a/webmin/firewall/config
+++ b/webmin/firewall/config
@@ -1,6 +1,6 @@
-direct=0
 force_init=0
-comment_mod=0
 view_condition=1
 view_comment=0
 cluster_mode=1
+direct=0
+comment_mod=0
diff --git a/webmin/firewall6/config b/webmin/firewall6/config
index f15543bd7..41105d5fc 100644
--- a/webmin/firewall6/config
+++ b/webmin/firewall6/config
@@ -1,6 +1,6 @@
+direct=0
 view_comment=0
 cluster_mode=1
-force_init=0
-direct=0
 comment_mod=0
+force_init=0
 view_condition=1
diff --git a/webmin/firewalld/config b/webmin/firewalld/config
index 0aae64fac..ff329a00d 100644
--- a/webmin/firewalld/config
+++ b/webmin/firewalld/config
@@ -1,2 +1,2 @@
-init_name=firewalld
 firewall_cmd=firewall-cmd
+init_name=firewalld
diff --git a/webmin/fsdump/config b/webmin/fsdump/config
index 8f4ac3250..35bfc3a10 100644
--- a/webmin/fsdump/config
+++ b/webmin/fsdump/config
@@ -1,7 +1,7 @@
 always_tar=0
+date_subs=0
+error_email=0
 webmin_subs=0
+nonewtape=0
 simple_sched=0
-error_email=0
 run_mode=0
-nonewtape=0
-date_subs=0
diff --git a/webmin/grub/config b/webmin/grub/config
index 2bb2e4e49..f6464eb2a 100644
--- a/webmin/grub/config
+++ b/webmin/grub/config
@@ -1,3 +1,3 @@
-grub_path=grub
 install=(hd0)
+grub_path=grub
 menu_file=/boot/grub/menu.lst
diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config
index e992c5bf4..65e1966a8 100644
--- a/webmin/heartbeat/config
+++ b/webmin/heartbeat/config
@@ -1,15 +1,15 @@
-serials=/dev/ttyS*
-req_resource_cmd=/usr/lib/heartbeat/req_resource
-ha_cf=
 pid_file=/var/run/heartbeat.pid
+req_resource_cmd=/usr/lib/heartbeat/req_resource
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
 ha_dir=/etc/ha.d
-heartbeat=/usr/lib/heartbeat/heartbeat
-haresources=
+authkeys=
 alt_haresources=/usr/share/doc/packages/heartbeat/haresources
-alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
+heartbeat=/usr/lib/heartbeat/heartbeat
 apply_cmd=/etc/init.d/heartbeat reload
+haresources=
 start_cmd=/etc/init.d/heartbeat start
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
+alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
 stop_cmd=/etc/init.d/heartbeat stop
 resource_d=
-authkeys=
+ha_cf=
+serials=/dev/ttyS*
diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config
index 0192b3d84..70c3a9c13 100644
--- a/webmin/htaccess-htpasswd/config
+++ b/webmin/htaccess-htpasswd/config
@@ -1,8 +1,8 @@
-sha1=0
-htaccess=.htaccess
-htgroups=.htgroups
 md5=1
+htaccess=.htaccess
 extra_directives=
-sort=0
-htpasswd=.htpasswd
+htgroups=.htgroups
+sha1=0
 digest=1
+htpasswd=.htpasswd
+sort=0
diff --git a/webmin/idmapd/config b/webmin/idmapd/config
index f25eeba97..12c48476c 100644
--- a/webmin/idmapd/config
+++ b/webmin/idmapd/config
@@ -1,3 +1,3 @@
 restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
-idmapd_conf=/etc/idmapd.conf
 idmapd_path=/usr/sbin/rpc.idmapd
+idmapd_conf=/etc/idmapd.conf
diff --git a/webmin/inetd/config b/webmin/inetd/config
index 846366166..d42d79d51 100644
--- a/webmin/inetd/config
+++ b/webmin/inetd/config
@@ -1,16 +1,16 @@
-rpc_file=/etc/rpc
-services_file=/etc/services
 inetd_conf_file=/etc/inetd.conf
+tcpd_path=/usr/sbin/tcpd
+rpc_inetd=1
+services_file=/etc/services
+extended_inetd=1
+qm_mode=0
+rpc_file=/etc/rpc
+allow_file=/etc/hosts.allow
 rpc_protocols=tcp udp
+ipv6=0
 restart_command=killall -HUP inetd
-deny_file=/etc/hosts.deny
 show_empty=1
-ipv6=0
-qm_mode=0
-extended_inetd=1
-rpc_inetd=1
-protocols_file=/etc/protocols
 display_max=100
-tcpd_path=/usr/sbin/tcpd
-allow_file=/etc/hosts.allow
+protocols_file=/etc/protocols
+deny_file=/etc/hosts.deny
 sort_mode=0
diff --git a/webmin/init/config b/webmin/init/config
index f3d2889ad..500fee0c3 100644
--- a/webmin/init/config
+++ b/webmin/init/config
@@ -1,17 +1,17 @@
-order_digits=2
-order=0
 reboot_command=reboot
+soft_links=1
+status_check=0
+expert=0
+atboot_product=webmin
 init_base=/etc/
-desc=1
 show_opts=0
-sort_mode=0
+desc=1
+order_digits=2
 boot_levels=2 3 5
-init_dir=/etc/init.d
-soft_links=1
-expert=0
+inittab_id=id
+init_info=1
 shutdown_command=poweroff
+order=0
+init_dir=/etc/init.d
 no_chkconfig=0
-init_info=1
-inittab_id=id
-atboot_product=webmin
-status_check=0
+sort_mode=0
diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config
index ade2c873b..db243ccd9 100644
--- a/webmin/ipfilter/config
+++ b/webmin/ipfilter/config
@@ -1,9 +1,9 @@
-ipf_conf=/etc/ipf/ipf.conf
-view_comment=0
-view_condition=1
-cluster_nat=1
+ipfstat=ipfstat
 ipnat=ipnat
-ipnat_conf=/etc/ipf/ipnat.conf
+view_condition=1
 cluster_mode=0
+ipnat_conf=/etc/ipf/ipnat.conf
+ipf_conf=/etc/ipf/ipf.conf
+cluster_nat=1
+view_comment=0
 ipf=ipf
-ipfstat=ipfstat
diff --git a/webmin/ipfw/config b/webmin/ipfw/config
index b6c7797bf..4a0563fd5 100644
--- a/webmin/ipfw/config
+++ b/webmin/ipfw/config
@@ -1,6 +1,6 @@
+view_condition=1
 ipfw=/sbin/ipfw
-view_counters=0
-view_comment=0
 version=2
+view_counters=0
 cluster_mode=0
-view_condition=1
+view_comment=0
diff --git a/webmin/ipsec/config b/webmin/ipsec/config
index d04b28f0b..0df62201f 100644
--- a/webmin/ipsec/config
+++ b/webmin/ipsec/config
@@ -1,8 +1,8 @@
+policies_dir=/etc/ipsec.d/policies
 logfile=/var/log/messages
-secrets=/etc/ipsec.secrets
+file=/etc/ipsec.conf
+ipsec=/usr/sbin/ipsec
 restart_cmd=/etc/init.d/ipsec restart
-stop_cmd=/etc/init.d/ipsec stop
 start_cmd=/etc/init.d/ipsec start
-policies_dir=/etc/ipsec.d/policies
-ipsec=/usr/sbin/ipsec
-file=/etc/ipsec.conf
+secrets=/etc/ipsec.secrets
+stop_cmd=/etc/init.d/ipsec stop
diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config
index 5b1468b01..0fbe6ac34 100644
--- a/webmin/iscsi-client/config
+++ b/webmin/iscsi-client/config
@@ -1,6 +1,6 @@
-iscsiadm=iscsiadm
-config_file=/etc/iscsi/iscsid.conf
 iscsiiname=iscsi-iname
-initiator_file=/etc/iscsi/initiatorname.iscsi
 ifaces_dir=/var/lib/iscsi/ifaces
+iscsiadm=iscsiadm
+config_file=/etc/iscsi/iscsid.conf
 init_name=open-iscsi
+initiator_file=/etc/iscsi/initiatorname.iscsi
diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index a44335b80..cf4987d02 100644
--- a/webmin/iscsi-server/config
+++ b/webmin/iscsi-server/config
@@ -1,6 +1,6 @@
 targets_file=/etc/iscsi/targets
-opts_file=/etc/sysconfig/netbsd-iscsi
 init_name=netbsd-iscsi
+iscsi_server=/usr/sbin/iscsi-target
 auths_file=/etc/iscsi/auths
+opts_file=/etc/sysconfig/netbsd-iscsi
 pid_file=/var/run/iscsi-target.pid
-iscsi_server=/usr/sbin/iscsi-target
diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config
index 04fc45a45..dcf64fb79 100644
--- a/webmin/iscsi-target/config
+++ b/webmin/iscsi-target/config
@@ -1,7 +1,7 @@
-initiators_file=/etc/iet/initiators.allow
-targets_file=/etc/iet/targets.allow
-config_file=/etc/iet/ietd.conf
+pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
 ietadm=ietadm
+config_file=/etc/iet/ietd.conf
 opts_file=/etc/default/iscsitarget
 init_name=iscsitarget
-pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
+initiators_file=/etc/iet/initiators.allow
+targets_file=/etc/iet/targets.allow
diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config
index faa13c6fa..e55f742ea 100644
--- a/webmin/iscsi-tgtd/config
+++ b/webmin/iscsi-tgtd/config
@@ -1,5 +1,5 @@
-init_name=tgtd
-config_file=/etc/tgt/targets.conf
+tgtd=tgtd
 tgtadm=tgtadm
+config_file=/etc/tgt/targets.conf
+init_name=tgtd
 tgtadmin=tgt-admin
-tgtd=tgtd
diff --git a/webmin/jabber/config b/webmin/jabber/config
index 74df33818..7820aa344 100644
--- a/webmin/jabber/config
+++ b/webmin/jabber/config
@@ -1,5 +1,5 @@
 jabber_config=/etc/jabber/jabber.xml
 jabber_daemon=/usr/sbin/jabberd
-jabber_dir=/var/lib/jabber
-stop_cmd=/etc/init.d/jabberd stop
 start_cmd=/etc/init.d/jabberd start
+stop_cmd=/etc/init.d/jabberd stop
+jabber_dir=/var/lib/jabber
diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config
index d45286770..0f578e5fb 100644
--- a/webmin/ldap-client/config
+++ b/webmin/ldap-client/config
@@ -1,3 +1,3 @@
-secret=/etc/ldap.secret
-auth_ldap=/etc/ldap.conf
 init_name=nslcd
+auth_ldap=/etc/ldap.conf
+secret=/etc/ldap.secret
diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index 102a8a9da..81b6ee977 100644
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
 schema_dir=/etc/ldap/schema
+ldap_user=openldap
+config_file=/etc/ldap/slapd.d
 attr_count=6
+browse_max=100
+stop_cmd=/etc/init.d/slapd stop
+slapd=slapd
 init_name=slapd
-ldap_user=openldap
 start_cmd=/etc/init.d/slapd start
 apply_cmd=/etc/init.d/slapd restart
-browse_max=100
-slapd=slapd
-stop_cmd=/etc/init.d/slapd stop
-config_file=/etc/ldap/slapd.d
diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config
index be99fe1a4..0d72858c8 100644
--- a/webmin/ldap-useradmin/config
+++ b/webmin/ldap-useradmin/config
@@ -1,24 +1,24 @@
 imap_class=SuSEeMailObject
-mailfmt=0
+imap_folders=old	public	sent-mail
 auth_ldap=/etc/ldap.conf
-imap_foldersep=.
-person=1
 secmode=0
+samba_def=0
 given_order=0
-md5=0
-given=0
+other_class=inetOrgPerson
+samba_class=sambaSamAccount
+slappasswd=slappasswd
+mailfmt=0
 quota_support=0
-imap_login=cyrus
-ldap_tls=0
 alias_same=0
-shells=fixed,ldap,passwd,shells
-imap_folders=old	public	sent-mail
+imap_login=cyrus
 samba_gclass=sambaGroup
-slappasswd=slappasswd
 membox=0
+gecos=1
+md5=0
+imap_foldersep=.
 multi_fields=0
-samba_class=sambaSamAccount
+given=0
 imap_def=0
-gecos=1
-other_class=inetOrgPerson
-samba_def=0
+person=1
+shells=fixed,ldap,passwd,shells
+ldap_tls=0
diff --git a/webmin/login.pl b/webmin/login.pl
index e152cf496..9355bd8da 100755
--- a/webmin/login.pl
+++ b/webmin/login.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-open(CONF, "/etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
+open(CONF, "</etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
 while(<CONF>) {
         $root = $1 if (/^root=(.*)/);
         }
diff --git a/webmin/logout.pl b/webmin/logout.pl
index 1e9441599..23aa20246 100755
--- a/webmin/logout.pl
+++ b/webmin/logout.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-open(CONF, "/etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
+open(CONF, "</etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
 while(<CONF>) {
         $root = $1 if (/^root=(.*)/);
         }
diff --git a/webmin/logrotate/config b/webmin/logrotate/config
index b85fb9a25..a89625b05 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
+add_file=/etc/logrotate.d
diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config
index d3aa39bb9..794e0c9af 100644
--- a/webmin/lpadmin/config
+++ b/webmin/lpadmin/config
@@ -1,17 +1,17 @@
-iface_owner=lp:lp
-model_path=/usr/share/foomatic/db /usr/share/ppd
 start_cmd=/etc/init.d/cupsys start
-spool_dir=/var/spool/cups
-driver_style=cups
-show_jobs=0
-sort_mode=0
 gs_fontpath=
-print_style=cups
-display_mode=0
+iface_owner=lp:lp
+stop_cmd=/etc/init.d/cupsys stop
 smbclient_path=smbclient
+gs_path=gs
+spool_dir=/var/spool/cups
 iface_arg=
-show_status=0
+show_jobs=0
 iface_perms=755
-stop_cmd=/etc/init.d/cupsys stop
+display_mode=0
+show_status=0
+model_path=/usr/share/foomatic/db /usr/share/ppd
+sort_mode=0
 gs_lib=
-gs_path=gs
+print_style=cups
+driver_style=cups
diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config
index e529e1011..2d9653350 100644
--- a/webmin/mailboxes/config
+++ b/webmin/mailboxes/config
@@ -1,52 +1,52 @@
-open_mode=0
-mail_system=3
-show_body=0
-sync_perms=0700
-spam_report=
-no_crlf=0
-show_delall=0
-no_mailer=0
+mailbox_user=.usermin/mailbox
+ignore_users_enabled=0
 no_orig_ip=0
-perpage=20
-from_virtualmin=1
-log_read=0
+sync_create=0
+show_size_below=0
 column_count=4
+vpopmail_dir=/home/vpopmail
+arrows=1
 mail_dir=Maildir
-spam_buttons=mail
+max_records=200
 html_edit=0
+sort_mode=1
 show_count=0
-vpopmail_dir=/home/vpopmail
+mail_system=3
+check_mod=1
+ignore_users=
+no_mailer=0
 wrap_width=80
-sig_file=*
-html_quote=0
+date_fmt=dmy
+delete_warn=y
+top_buttons=2
+mail_style=0
 track_read=0
-mail_file=Mailbox
+show_delall=0
+no_crlf=0
+auto=1
+size_mode=1
 show_to=0
 mail_usermin=mail
-auto=1
-arrows=1
-max_records=200
-spam_del=0
-sync_delete=1
+open_mode=0
+log_read=0
+view_html=0
 noindex_hostname=0
+spam_report=
+sync_perms=0700
+sync_delete=1
+show_mail=0
+perpage=20
+fwd_mode=0
+mail_file=Mailbox
+sig_file=*
+from_virtualmin=1
 show_sent=0
-maildir_deleted=0
-show_size=1
-date_fmt=dmy
 sync_modify=1
-fwd_mode=0
+show_body=0
+html_quote=0
 show_unread=0
-ignore_users_enabled=0
-show_mail=0
-delete_warn=y
+show_size=1
 link_mode=0
-check_mod=1
-ignore_users=
-show_size_below=0
-size_mode=1
-sort_mode=1
-sync_create=0
-top_buttons=2
-mail_style=0
-view_html=0
-mailbox_user=.usermin/mailbox
+spam_buttons=mail
+maildir_deleted=0
+spam_del=0
diff --git a/webmin/man/config b/webmin/man/config
index 839486b77..e4e903ed8 100644
--- a/webmin/man/config
+++ b/webmin/man/config
@@ -1,9 +1,9 @@
+doc_dir=/usr/share/doc
+list_cmd=man -w PAGE
 man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
-kernel_dir=/usr/src/linux/Documentation
-search_cmd=man -k PAGE
 list_cmd_sect=man -w SECTION PAGE
-doc_dir=/usr/share/doc
-man2html_path=man2html
+kernel_dir=/usr/src/linux/Documentation
 man_cmd=man PAGE
+man2html_path=man2html
 man_cmd_sect=man SECTION PAGE
-list_cmd=man -w PAGE
+search_cmd=man -k PAGE
diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index c10ccb7c5..7921e7421 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.941
+server=MiniServ/1.953
diff --git a/webmin/mon/config b/webmin/mon/config
index 668a74e0c..236134e26 100644
--- a/webmin/mon/config
+++ b/webmin/mon/config
@@ -1,7 +1,7 @@
-start_cmd=/etc/init.d/mon start
-cfbasedir=/etc/mon
-mon_cgi=/var/www/cgi-bin/mon.cgi
+restart_cmd=/etc/init.d/mon restart
 stop_cmd=/etc/init.d/mon stop
+cfbasedir=/etc/mon
 monshow=/usr/bin/monshow
+mon_cgi=/var/www/cgi-bin/mon.cgi
 pid_file=/var/run/mon.pid
-restart_cmd=/etc/init.d/mon restart
+start_cmd=/etc/init.d/mon start
diff --git a/webmin/mount/config b/webmin/mount/config
index 6969212c5..6146dc791 100644
--- a/webmin/mount/config
+++ b/webmin/mount/config
@@ -1,10 +1,10 @@
+sysinfo=1
 show_used=1
-long_fstypes=1
 nfs_check=1
-auto_file=/etc/am-utils/amd.conf
-nmblookup_path=nmblookup
 sort_mode=2
+autofs_file=/etc/auto.master
+long_fstypes=1
+nmblookup_path=nmblookup
 fstab_file=/etc/fstab
+auto_file=/etc/am-utils/amd.conf
 smbclient_path=smbclient
-sysinfo=1
-autofs_file=/etc/auto.master
diff --git a/webmin/mysql/config b/webmin/mysql/config
index e2543c015..5a99b8a16 100644
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -1,23 +1,23 @@
-perpage=25
-nodbi=0
-mysqladmin=/usr/bin/mysqladmin
-blob_mode=0
 max_text=1000
-webmin_subs=0
-add_mode=1
-mysqldump=/usr/bin/mysqldump
+date_subs=0
+my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
 nopwd=0
+add_mode=1
 passwd_mode=0
-login=root
-stop_cmd=service mysql stop
-mysql_data=/var/lib/mysql
-max_dbs=50
 mysqlshow=/usr/bin/mysqlshow
+mysqldump=/usr/bin/mysqldump
+webmin_subs=0
+max_dbs=50
 mysql=/usr/bin/mysql
-mysqlimport=/usr/bin/mysqlimport
-date_subs=0
-my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
 mysql_libs=/usr/local/mysql/lib
+login=root
+mysqlimport=/usr/bin/mysqlimport
 style=0
-start_cmd=service mysql start
+nodbi=0
+mysql_data=/var/lib/mysql
+perpage=25
+mysqladmin=/usr/bin/mysqladmin
 access=*: *
+stop_cmd=service mysql stop
+blob_mode=0
+start_cmd=service mysql start
diff --git a/webmin/mysql/version b/webmin/mysql/version
index a3dd50d25..c8025f579 100644
--- a/webmin/mysql/version
+++ b/webmin/mysql/version
@@ -1 +1 @@
-5.7.29
+5.7.30
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 4fa3f00cf..cccab7be9 100644
--- a/webmin/nis/config
+++ b/webmin/nis/config
@@ -1,5 +1,5 @@
+manual_build=0
 securenets=/etc/ypserv.securenets
 client_conf=/etc/yp.conf
 max_size=100
-manual_build=0
 nsswitch_conf=/etc/nsswitch.conf
diff --git a/webmin/openslp/config b/webmin/openslp/config
index 45244e969..cc43550ea 100644
--- a/webmin/openslp/config
+++ b/webmin/openslp/config
@@ -1,5 +1,5 @@
+slpd_log=/var/log/slpd.log
 slpd=/usr/sbin/slpd
 slpd_reg=/etc/slp.reg
 slpd_pid=/var/run/slpd.pid
 slpd_conf=/etc/slp.conf
-slpd_log=/var/log/slpd.log
diff --git a/webmin/pam/config b/webmin/pam/config
index 02a4dd593..f93cd4a8d 100644
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
-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
 lib_dirs=/lib/security /lib/*/security
 ignore=README
+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
diff --git a/webmin/pap/config b/webmin/pap/config
index 0b482a407..281dbaf94 100644
--- a/webmin/pap/config
+++ b/webmin/pap/config
@@ -1,8 +1,8 @@
-mgetty=mgetty
-ppp_options=/etc/ppp/options
-pppd=pppd
 login_config=/etc/mgetty+sendfax/login.config
+dialin_config=/etc/mgetty+sendfax/dialin.config
 encrypt_pass=0
-serials=/dev/ttyS[0-9]*
 pap_file=/etc/ppp/pap-secrets
-dialin_config=/etc/mgetty+sendfax/dialin.config
+pppd=pppd
+ppp_options=/etc/ppp/options
+mgetty=mgetty
+serials=/dev/ttyS[0-9]*
diff --git a/webmin/passwd/config b/webmin/passwd/config
index 02cf5b24f..75e5ffcde 100644
--- a/webmin/passwd/config
+++ b/webmin/passwd/config
@@ -1,3 +1,3 @@
-sort_mode=0
 input_type=0
 max_users=200
+sort_mode=0
diff --git a/webmin/postfix/config b/webmin/postfix/config
index f55ebf09a..04ec47b58 100644
--- a/webmin/postfix/config
+++ b/webmin/postfix/config
@@ -1,29 +1,29 @@
-postfix_newaliases_command=/usr/bin/newaliases
+mailq_sort=0
+wrap_width=80
 postfix_queue_command=postqueue
+postfix_aliases_table_command=/usr/sbin/postalias
+perpage=20
+fwd_mode=0
 postcat_cmd=/usr/sbin/postcat
-ldap_doms=0
+top_buttons=1
 postfix_control_command=/usr/sbin/postfix
-perpage=20
-mailq_dir=/var/spool/postfix
+postfix_newaliases_command=/usr/bin/newaliases
+show_cmts=0
+index_check=1
 postfix_lookup_table_command=/usr/sbin/postmap
+mailq_dir=/var/spool/postfix
+postfix_master=/etc/postfix/master.cf
+delete_warn=1
+prefix_cmts=0
+ldap_doms=0
+postfix_config_command=/usr/sbin/postconf
+delete_confirm=1
+check_config=1
 postfix_super_command=/usr/sbin/postsuper
-fwd_mode=0
 mailq_count=0
-postfix_config_file=/etc/postfix/main.cf
 mailq_cmd=postqueue -p
 max_maps=100
-postfix_aliases_table_command=/usr/sbin/postalias
-delete_warn=1
+postfix_config_file=/etc/postfix/main.cf
+sort_mode=0
 columns=2
-show_cmts=0
-wrap_width=80
-index_check=1
-mailq_sort=0
-prefix_cmts=0
-postfix_master=/etc/postfix/master.cf
-top_buttons=1
-delete_confirm=1
 max_records=200
-sort_mode=0
-postfix_config_command=/usr/sbin/postconf
-check_config=1
diff --git a/webmin/postgresql/config b/webmin/postgresql/config
index ba6d5aa77..918eca31e 100644
--- a/webmin/postgresql/config
+++ b/webmin/postgresql/config
@@ -1,24 +1,24 @@
-login=postgres
-rstr_cmd=/usr/bin/pg_restore
-plib=
-stop_cmd=/etc/init.d/postgresql* stop
+max_text=1000
+date_subs=0
+sameunix=1
 add_mode=1
 webmin_subs=0
+max_dbs=50
+pass=
+login=postgres
+rstr_cmd=/usr/bin/pg_restore
+style=0
+simple_sched=0
 nodbi=0
 pid_file=/var/run/postmaster.pid
 perpage=25
-max_text=1000
-access_own=0
-blob_mode=0
-start_cmd=/etc/init.d/postgresql* start
-style=0
-simple_sched=0
-sameunix=1
-access=*: *
-date_subs=0
-psql=/usr/bin/psql
 basedb=template1
 hba_conf=/etc/postgresql/*/main/pg_hba.conf
-max_dbs=50
+plib=
+access_own=0
+psql=/usr/bin/psql
+access=*: *
+stop_cmd=/etc/init.d/postgresql* stop
 dump_cmd=/usr/bin/pg_dump
-pass=
+blob_mode=0
+start_cmd=/etc/init.d/postgresql* start
diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config
index 237c75238..5fd0f800c 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 3ec7d5973..edcc9799c 100644
--- a/webmin/pptp-client/config
+++ b/webmin/pptp-client/config
@@ -1,5 +1,5 @@
 pptp_options=/etc/ppp/options.pptp
+pap_file=/etc/ppp/chap-secrets
+pptp=pptp
 peers_dir=/etc/ppp/peers
 timeout=30
-pptp=pptp
-pap_file=/etc/ppp/chap-secrets
diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config
index dda8cd627..35e58e83d 100644
--- a/webmin/pptp-server/config
+++ b/webmin/pptp-server/config
@@ -1,9 +1,9 @@
 pid_file=/var/run/pptpd.pid
-pptp_ppp_options=/etc/ppp/pptpd-options
 ppp_options=/etc/ppp/options
-log_file=/var/log/messages
+pptp_ppp_options=/etc/ppp/pptpd-options
 file=/etc/pptpd.conf
 pap_file=/etc/ppp/chap-secrets
 pptpd=pptpd
+log_file=/var/log/messages
 start_cmd=/etc/init.d/pptpd start
 stop_cmd=/etc/init.d/pptpd stop
diff --git a/webmin/proc/config b/webmin/proc/config
index b6a5b1d73..4bf34bb1c 100644
--- a/webmin/proc/config
+++ b/webmin/proc/config
@@ -1,6 +1,6 @@
 ps_style=linux
 hide_self=1
+base_ppid=1
 default_mode=last
 cut_length=80
-base_ppid=1
 trace_java=0
diff --git a/webmin/procmail/config b/webmin/procmail/config
index 71541070b..5b184fd7c 100644
--- a/webmin/procmail/config
+++ b/webmin/procmail/config
@@ -1,3 +1,3 @@
+procmailrc=/etc/procmailrc
 includes=0
 procmail=procmail
-procmailrc=/etc/procmailrc
diff --git a/webmin/proftpd/config b/webmin/proftpd/config
index 8bf323978..00dfd329a 100644
--- a/webmin/proftpd/config
+++ b/webmin/proftpd/config
@@ -1,9 +1,9 @@
-pid_file=/var/run/proftpd.pid
 ftpusers=/etc/ftpusers
-test_config=1
-proftpd_conf=/etc/proftpd/proftpd.conf
 proftpd_path=/usr/sbin/proftpd
+pid_file=/var/run/proftpd.pid
 test_manual=0
-test_always=0
 start_cmd=/etc/init.d/proftpd start
+proftpd_conf=/etc/proftpd/proftpd.conf
+test_always=0
+test_config=1
 stop_cmd=/etc/init.d/proftpd stop
diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config
index 1965492b2..08a7321fc 100644
--- a/webmin/qmailadmin/config
+++ b/webmin/qmailadmin/config
@@ -1,14 +1,14 @@
-index_min=1000000
-mail_system=1
 mail_dir_qmail=Maildir
 columns=2
-mail_file=Mailbox
-mailq_sort=0
-mailq_count=0
-sort_mode=0
-fwd_mode=0
 max_records=200
-perpage=20
+mail_dir=
+sort_mode=0
 delete_warn=1
+index_min=1000000
 qmail_dir=/var/qmail
-mail_dir=
+mail_file=Mailbox
+mailq_count=0
+perpage=20
+fwd_mode=0
+mail_system=1
+mailq_sort=0
diff --git a/webmin/quota/config b/webmin/quota/config
index de498b793..31201d02a 100644
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
-block_size=1024
+user_setquota_command=setquota -u
+user_copy_command=edquota -u -p
 block_mode=1
 pc_show=1
-group_copy_command=edquota -g -p
-user_copy_command=edquota -u -p
+group_quotaon_command=quotaon -g
+group_grace_command=edquota -g -t
+user_repquota_command=repquota -u -v
+quotacheck_command=quotacheck -u -g
 group_quotaoff_command=quotaoff -g
-group_repquota_command=repquota -g -v
-user_quotaoff_command=quotaoff -u
-user_setquota_command=setquota -u
-display_max=100
-group_quota_command=quota -v -g
+email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the	allowed quota.		${USED} of disk space is being used, out of a maximum of ${QUOTA}.
 user_edquota_command=edquota -u
-user_repquota_command=repquota -u -v
+block_size=1024
+show_grace=1
+group_quota_command=quota -v -g
+user_quotaoff_command=quotaoff -u
 hide_uids=0
-group_quotaon_command=quotaon -g
-quotacheck_command=quotacheck -u -g
+group_setquota_command=setquota -g
+group_copy_command=edquota -g -p
+user_quota_command=quota -v -u
+group_edquota_command=edquota -g
+display_max=100
 sort_mode=0
 user_quotaon_command=quotaon -u
-group_edquota_command=edquota -g
-user_quota_command=quota -v -u
+group_repquota_command=repquota -g -v
 user_grace_command=edquota -u -t
-group_grace_command=edquota -g -t
-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_setquota_command=setquota -g
-show_grace=1
diff --git a/webmin/raid/config b/webmin/raid/config
index 3314566d0..8ffe6d468 100644
--- a/webmin/raid/config
+++ b/webmin/raid/config
@@ -1,3 +1,3 @@
-raidtab=/etc/raidtab
 mdadm=/etc/mdadm/mdadm.conf
 mdstat=/proc/mdstat
+raidtab=/etc/raidtab
diff --git a/webmin/restart b/webmin/restart
index b2eb09683..a425fffbb 100755
--- a/webmin/restart
+++ b/webmin/restart
@@ -1,2 +1,2 @@
 #!/bin/sh
-/etc/webmin/stop && /etc/webmin/start
+/etc/webmin/stop --kill && /etc/webmin/start
diff --git a/webmin/samba/config b/webmin/samba/config
index a62cbe4d3..91339ca67 100644
--- a/webmin/samba/config
+++ b/webmin/samba/config
@@ -1,18 +1,18 @@
-samba_status_program=/usr/bin/smbstatus
-samba_password_program=/usr/bin/smbpasswd
+pdbedit=/usr/bin/pdbedit
+start_cmd=service smbd start ; service nmbd start
+smb_conf=/etc/samba/smb.conf
+text_lists=0
 stop_cmd=service smbd stop ; service nmbd stop
+samba_password_program=/usr/bin/smbpasswd
+run_from_inetd=0
+name_server=/usr/sbin/nmbd
 list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
-smb_conf=/etc/samba/smb.conf
+dont_convert=-499
 restart_cmd=service smbd restart ; service nmbd restart
-smbgroupedit=/usr/bin/smbgroupedit
-pdbedit=/usr/bin/pdbedit
-net=/usr/bin/net
-run_from_inetd=0
 samba_server=/usr/sbin/smbd
-dont_convert=-499
+samba_status_program=/usr/bin/smbstatus
+smbgroupedit=/usr/bin/smbgroupedit
 smb_passwd=/etc/samba/smbpasswd
-text_lists=0
-start_cmd=service smbd start ; service nmbd start
-name_server=/usr/sbin/nmbd
 swat=/usr/sbin/swat
 sort_mode=0
+net=/usr/bin/net
diff --git a/webmin/sarg/config b/webmin/sarg/config
index b9009faeb..e572a9730 100644
--- a/webmin/sarg/config
+++ b/webmin/sarg/config
@@ -1,4 +1,4 @@
-sarg_conf=/etc/sarg/sarg.conf
 sarg=sarg
-naked=0
+sarg_conf=/etc/sarg/sarg.conf
 clear=1
+naked=0
diff --git a/webmin/sendmail/config b/webmin/sendmail/config
index 2dee60764..9a2811af2 100644
--- a/webmin/sendmail/config
+++ b/webmin/sendmail/config
@@ -1,30 +1,30 @@
-perpage=20
-makemap_path=makemap
-mailq_show=Date,From,To,Size,Status
-sendmail_mc=/etc/mail/sendmail.mc
-mailq_count=0
-fwd_mode=0
+sort_mode=0
 mail_dir=/var/spool/mail
+columns=2
+max_records=200
 sendmail_path=/usr/lib/sendmail
-delete_warn=1
-sendmail_features=/usr/share/sendmail/cf
-sendmail_pid=/var/run/sendmail/mta/sendmail.pid
-index_min=1000000
 mail_type=0
-smrsh_dir=/etc/smrsh
-sendmail_cf=/etc/mail/sendmail.cf
+sendmail_mc=/etc/mail/sendmail.mc
+mailq_count=0
+show_to=0
+delete_confirm=1
+mailq_show=Date,From,To,Size,Status
+delete_warn=1
 order_mail=0
+prefix_cmts=0
 top_buttons=1
-delete_confirm=1
-max_records=200
-sort_mode=0
+sendmail_pid=/var/run/sendmail/mta/sendmail.pid
+smrsh_dir=/etc/smrsh
+show_cmts=0
+makemap_path=makemap
+track_read=0
 mail_style=0
-mail_file=mbox
+index_min=1000000
+fwd_mode=0
+perpage=20
 sendmail_command=/usr/lib/sendmail -bd -q1h
-track_read=0
-columns=2
-show_cmts=0
-wrap_width=80
-show_to=0
-prefix_cmts=0
+mail_file=mbox
 mailq_sort=0
+wrap_width=80
+sendmail_cf=/etc/mail/sendmail.cf
+sendmail_features=/usr/share/sendmail/cf
diff --git a/webmin/servers/config b/webmin/servers/config
index c83bb1ba0..589a8f84c 100644
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
 resolve=1
-show_status=1
-deflink=0
-max_servers=100
+deffast=2
 capath=/usr/share/ca-certificates
+show_ip=0
+max_servers=100
 groups_dir=/etc/cluster/groups
 scan_time=5
-show_ip=0
 display_mode=0
+show_status=1
+deflink=0
 sort_mode=0
-deffast=2
diff --git a/webmin/shell/config b/webmin/shell/config
index 4b3e40b52..af7728831 100644
--- a/webmin/shell/config
+++ b/webmin/shell/config
@@ -1,3 +1,3 @@
-max_output=100000
 max_runtime=86400
 clear_envs=0
+max_output=100000
diff --git a/webmin/shorewall/config b/webmin/shorewall/config
index 4b00d0df0..1b475d8a5 100644
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
+macros=/usr/share/shorewall
 actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
+display_zone_descriptions=1
 config_dir=/etc/shorewall
-macros=/usr/share/shorewall
 shorewall=shorewall
-display_zone_descriptions=1
diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config
index a8fbc76ed..c23fc47f1 100644
--- a/webmin/shorewall6/config
+++ b/webmin/shorewall6/config
@@ -1,5 +1,5 @@
-display_zone_descriptions=1
 macros=/usr/share/shorewall6
 shorewall6=shorewall6
-config_dir=/etc/shorewall6
+display_zone_descriptions=1
 actions=/etc/shorewall6/actions	/usr/share/shorewall6/actions.std
+config_dir=/etc/shorewall6
diff --git a/webmin/smart-status/config b/webmin/smart-status/config
index 8537d1b9b..faa2e51d2 100644
--- a/webmin/smart-status/config
+++ b/webmin/smart-status/config
@@ -1,4 +1,4 @@
-mode=1
-smartctl=smartctl
 ata=0
+mode=1
 attribs=1
+smartctl=smartctl
diff --git a/webmin/software/config b/webmin/software/config
index 037d899f3..bf587ee21 100644
--- a/webmin/software/config
+++ b/webmin/software/config
@@ -1,3 +1,3 @@
+package_system=debian
 update_system=apt
 apt_mode=0
-package_system=debian
diff --git a/webmin/spam/config b/webmin/spam/config
index 00d9a3148..0f2fd8e2a 100644
--- a/webmin/spam/config
+++ b/webmin/spam/config
@@ -1,12 +1,12 @@
-spamassassin=spamassassin
-restart_cmd=/etc/init.d/spamassassin restart
 procmailrc=/etc/procmailrc
-procmail_cmd=*
-addto=0
-max_awl=200
+restart_cmd=/etc/init.d/spamassassin restart
 call_spam=1
-local_cf=/etc/spamassassin/local.cf
-sa_learn=sa-learn
+processes=spamd amavisd
 mode=0
 warn_procmail=1
-processes=spamd amavisd
+sa_learn=sa-learn
+procmail_cmd=*
+local_cf=/etc/spamassassin/local.cf
+max_awl=200
+addto=0
+spamassassin=spamassassin
diff --git a/webmin/squid/config b/webmin/squid/config
index c5aa62c1a..df3dd948f 100644
--- a/webmin/squid/config
+++ b/webmin/squid/config
@@ -1,21 +1,21 @@
-squidclient=squidclient
-squid_start=service squid start
-sync_delete=0
-cache_dir=/var/spool/squid
-sync_create=0
-squid_stop=service squid stop
-sort_conf=0
+sync_modify=1
+squid_conf=/etc/squid/squid.conf
+cal_fmt=w
 cal_all=1
-squid_restart=service squid reload
-restart_pos=0
-cal_max=50000
-crypt_conf=0
-log_dir=/var/log/squid
 squid_path=squid
+calamaris=calamaris
+crypt_conf=0
 pid_file=/var/run/squid.pid
-squid_conf=/etc/squid/squid.conf
-cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
-cal_fmt=w
+cache_dir=/var/spool/squid
+cal_max=50000
+squid_restart=service squid reload
+restart_pos=0
+sync_create=0
+sort_conf=0
+squid_stop=service squid stop
+squidclient=squidclient
 cal_args=-aw
-calamaris=calamaris
-sync_modify=1
+cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+squid_start=service squid start
+sync_delete=0
+log_dir=/var/log/squid
diff --git a/webmin/sshd/config b/webmin/sshd/config
index 324029402..df1b4ba16 100644
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,11 +1,11 @@
+stop_cmd=service ssh stop
+sync_pass=0
 client_config=/etc/ssh/ssh_config
+keygen_path=/usr/bin/ssh-keygen
+sync_create=0
 start_cmd=service ssh start
-stop_cmd=service ssh stop
-sync_gnupg=0
+sync_auth=1
 sshd_config=/etc/ssh/sshd_config
+sync_gnupg=0
 pid_file=/var/run/sshd.pid
 sshd_path=/usr/sbin/sshd
-keygen_path=/usr/bin/ssh-keygen
-sync_create=0
-sync_pass=0
-sync_auth=1
diff --git a/webmin/status/config b/webmin/status/config
index f66d812fc..38f2e4aad 100644
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,13 +1,13 @@
-pager_cmd=sms_client
-history_purge=30
-history_show=50
-snmp_trap=1.3.6.1.4.1.10000.1.1
-columns=2
-sysinfo=0
-sysinfo_users=0
 sched_offset=0
-index_status=1
 output=0
+history_show=50
+subject_mode=0
+sysinfo_users=0
+sysinfo=0
+columns=2
 sort_mode=0
+snmp_trap=1.3.6.1.4.1.10000.1.1
 snmp_version=2
-subject_mode=0
+index_status=1
+pager_cmd=sms_client
+history_purge=30
diff --git a/webmin/stop b/webmin/stop
index 4b6b29330..98dcd4a57 100755
--- a/webmin/stop
+++ b/webmin/stop
@@ -1,4 +1,14 @@
 #!/bin/sh
 echo Stopping Webmin server in /usr/share/webmin
 pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
-kill `cat $pidfile`
+pid=`cat $pidfile`
+if [ "$pid" != "" ]; then
+  kill $pid || exit 1
+  if [ "$1" = "--kill" ]; then
+    sleep 1
+    (kill -9 -- -$pid || kill -9 $pid) 2>/dev/null
+  fi
+  exit 0
+else
+  exit 1
+fi
diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config
index 183823e8a..643ef89e2 100644
--- a/webmin/syslog-ng/config
+++ b/webmin/syslog-ng/config
@@ -1,7 +1,7 @@
-compressed=1
+start_cmd=/etc/init.d/syslog-ng start
 pid_file=/var/run/syslog-ng.pid
+lines=20
 syslogng_conf=/etc/syslog-ng/syslog-ng.conf
-syslogng_cmd=syslog-ng
+compressed=1
 stop_cmd=/etc/init.d/syslog-ng stop
-start_cmd=/etc/init.d/syslog-ng start
-lines=20
+syslogng_cmd=syslog-ng
diff --git a/webmin/syslog/config b/webmin/syslog/config
index b13c46e14..da451a934 100644
--- a/webmin/syslog/config
+++ b/webmin/syslog/config
@@ -1,19 +1,19 @@
-sync=1
-pid_file=/var/run/rsyslogd.pid
-restart_cmd=/usr/sbin/service rsyslog restart
+syslog_conf=/etc/rsyslog.conf
 tags=0
-socket=0
-m4_conf=0
+restart_cmd=/usr/sbin/service rsyslog restart
+compressed=1
+reverse=0
+lines=20
+pid_file=/var/run/rsyslogd.pid
 m4_path=
-pri_all=1
-facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
+m4_conf=0
 signal_cmd=/usr/sbin/service rsyslog restart
-syslogd=/usr/sbin/rsyslogd
-reverse=0
-pri_dir=1
-compressed=1
 others=1
-syslog_conf=/etc/rsyslog.conf
 start_cmd=/usr/sbin/service rsyslog start
-lines=20
+facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
+syslogd=/usr/sbin/rsyslogd
+pri_dir=1
+socket=0
+sync=1
 pipe=1
+pri_all=1
diff --git a/webmin/system-status/config b/webmin/system-status/config
index b6a7e4155..c627a9fec 100644
--- a/webmin/system-status/config
+++ b/webmin/system-status/config
@@ -1,2 +1,2 @@
-collect_interval=5
 collect_pkgs=1
+collect_interval=5
diff --git a/webmin/system-status/enable-collection.pl b/webmin/system-status/enable-collection.pl
index 00f354b85..c736182c8 100755
--- a/webmin/system-status/enable-collection.pl
+++ b/webmin/system-status/enable-collection.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-open(CONF, "/etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
+open(CONF, "</etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
 while(<CONF>) {
         $root = $1 if (/^root=(.*)/);
         }
diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config
index bfd2d19d4..10eceba4d 100644
--- a/webmin/tcpwrappers/config
+++ b/webmin/tcpwrappers/config
@@ -1,3 +1,3 @@
-inetd_services=0
-hosts_allow=/etc/hosts.allow
 hosts_deny=/etc/hosts.deny
+hosts_allow=/etc/hosts.allow
+inetd_services=0
diff --git a/webmin/telnet/config b/webmin/telnet/config
index 1c52b035f..1b658c063 100644
--- a/webmin/telnet/config
+++ b/webmin/telnet/config
@@ -1,5 +1,5 @@
-proxy=0
-sizemode=0
-detach=0
 mode=1
+detach=0
+proxy=0
 no_test=0
+sizemode=0
diff --git a/webmin/time/config b/webmin/time/config
index 791173895..ff8b93f92 100644
--- a/webmin/time/config
+++ b/webmin/time/config
@@ -1,5 +1,5 @@
+seconds=1
+ntp_only=1
 lease=5
 timeserver_hardware=1
-ntp_only=1
-seconds=1
 zone_style=linux
diff --git a/webmin/updown/config b/webmin/updown/config
index 94e4fae55..abd9a9718 100644
--- a/webmin/updown/config
+++ b/webmin/updown/config
@@ -1,4 +1,4 @@
-duser=root
 ddir=/
-dir=/
 user=root
+duser=root
+dir=/
diff --git a/webmin/useradmin/config b/webmin/useradmin/config
index 92d5d55f3..e86be0f1b 100644
--- a/webmin/useradmin/config
+++ b/webmin/useradmin/config
@@ -1,41 +1,41 @@
+selinux_con=user_u:object_r:user_home_dir_t
+delete_root=0
+uid_calc=0
+lock_string=*
+email_type=0
+random_password=0
+base_gid=1000
+passwd_dict=0
+display_max=400
+shadow_file=/etc/shadow
+sort_mode=0
+gid_mode=1
 passwd_file=/etc/passwd
+extra_real=0
+homedir_perms=0755
+new_user_group=0
+gid_calc=0
 md5=1
-home_base=/home
-skip_md5=0
-sort_mode=0
+base_uid=1000
 alias_check=0
-email_type=0
-display_mode=1
-new_user_group=0
-delete_only=0
-home_style=0
+last_show=0
 from_files=0
-membox=0
+passwd_stars=0
+skip_md5=0
+delete_only=0
 default_group=users
-user_files=/etc/skel
-delete_root=0
 uid_mode=1
-random_password=0
-last_show=0
-empty_mode=0
-gid_mode=1
-passwd_stars=0
-gshadow_file=/etc/gshadow
-homedir_perms=0755
-passwd_dict=0
-extra_real=0
-secmode=0
-display_max=400
-uid_calc=0
-selinux_con=user_u:object_r:user_home_dir_t
+membox=0
+home_style=0
 group_file=/etc/group
+gshadow_file=/etc/gshadow
 default_other=1
-lock_string=*
-gid_calc=0
-passwd_progmode=0
-shadow_file=/etc/shadow
+display_mode=1
+secmode=0
 new_user_gid=0
-base_gid=1000
-passwd_same=0
+empty_mode=0
 shells=fixed,passwd,shells
-base_uid=1000
+home_base=/home
+user_files=/etc/skel
+passwd_progmode=0
+passwd_same=0
diff --git a/webmin/usermin/config b/webmin/usermin/config
index bfeafc2cb..a54fd217e 100644
--- a/webmin/usermin/config
+++ b/webmin/usermin/config
@@ -1,7 +1,7 @@
-uphour=4
+update=0
+cron_mode=0
 usermin_dir=/etc/usermin
 updays=1
-upmissing=0
 upshow=1
-update=0
-cron_mode=0
+uphour=4
+upmissing=0
diff --git a/webmin/version b/webmin/version
index 064a8899d..fe5ddad68 100644
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.941
+1.953
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 8cbdb74f9..5def64eca 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
-alt_conf=/etc/webalizer/webalizer.conf.sample
-skip_old=0
 naked=0
+webalizer_conf=/etc/webalizer/webalizer.conf
+skip_old=0
+alt_conf=/etc/webalizer/webalizer.conf.sample
+auto=apache,squid,proftpd,wuftpd
diff --git a/webmin/webmin/config b/webmin/webmin/config
index 0b4a758be..9101a7956 100644
--- a/webmin/webmin/config
+++ b/webmin/webmin/config
@@ -1,12 +1,12 @@
-cron_mode=0
-upmins=47
-upmissing=0
-last_version_number=1.900
-last_version_check=1549050668
-warn_days=7
-updays=1
 upshow=1
-update=0
-osdn=1
+warn_days=7
 uphour=23
+last_version_check=1549050668
+osdn=1
+last_version_number=1.900
+upmins=47
+cron_mode=0
+updays=1
+upmissing=0
 letsencrypt_dns_wait=10
+update=0
diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config
index 656682415..430d531a6 100644
--- a/webmin/wuftpd/config
+++ b/webmin/wuftpd/config
@@ -1,8 +1,8 @@
+ftpgroups=/etc/wu-ftpd/ftpgroups
+ftphosts=/etc/wu-ftpd/ftphosts
+pid_file=/var/run/ftpd.pids-all
+ftpusers=/etc/wu-ftpd/ftpusers
 ftpconversions=/etc/wu-ftpd/ftpconversions
 ftpaccess=/etc/wu-ftpd/ftpaccess
-log_file=/var/log/xferlog
 ftpd_path=/usr/sbin/wu-ftpd
-ftpusers=/etc/wu-ftpd/ftpusers
-ftpgroups=/etc/wu-ftpd/ftpgroups
-pid_file=/var/run/ftpd.pids-all
-ftphosts=/etc/wu-ftpd/ftphosts
+log_file=/var/log/xferlog
diff --git a/webmin/xinetd/config b/webmin/xinetd/config
index f54a90d98..5aef351dd 100644
--- a/webmin/xinetd/config
+++ b/webmin/xinetd/config
@@ -1,5 +1,5 @@
-start_cmd=/etc/init.d/xinetd start
-lookup_servs=1
-pid_file=/var/run/xinetd.pid
 protocols_file=/etc/protocols
 xinetd_conf=/etc/xinetd.conf
+lookup_servs=1
+pid_file=/var/run/xinetd.pid
+start_cmd=/etc/init.d/xinetd start