From: root <root@mail.hoellein.online>
Date: Fri, 7 Dec 2018 10:04:14 +0000 (+0100)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=ae1f4bbb4c8820d338c8de395ba4b238ad5d4c9f;p=vserver

committing changes in /etc after apt run

Package changes:
-amavisd-new 1:2.11.0-1ubuntu1 all
+amavisd-new 1:2.11.0-1ubuntu1.1 all
-apache2 2.4.29-1ubuntu4.4 amd64
-apache2-bin 2.4.29-1ubuntu4.4 amd64
-apache2-data 2.4.29-1ubuntu4.4 all
-apache2-utils 2.4.29-1ubuntu4.4 amd64
+apache2 2.4.29-1ubuntu4.5 amd64
+apache2-bin 2.4.29-1ubuntu4.5 amd64
+apache2-data 2.4.29-1ubuntu4.5 all
+apache2-utils 2.4.29-1ubuntu4.5 amd64
-bind9 1:9.11.3+dfsg-1ubuntu1.2 amd64
-bind9-host 1:9.11.3+dfsg-1ubuntu1.2 amd64
-bind9utils 1:9.11.3+dfsg-1ubuntu1.2 amd64
+bind9 1:9.11.3+dfsg-1ubuntu1.3 amd64
+bind9-host 1:9.11.3+dfsg-1ubuntu1.3 amd64
+bind9utils 1:9.11.3+dfsg-1ubuntu1.3 amd64
-collaboraoffice5.3 5.3.10.57-57 amd64
-collaboraoffice5.3-ure 5.3.10.57-57 amd64
-collaboraofficebasis5.3-calc 5.3.10.57-57 amd64
-collaboraofficebasis5.3-core 5.3.10.57-57 amd64
-collaboraofficebasis5.3-draw 5.3.10.57-57 amd64
-collaboraofficebasis5.3-en-us 5.3.10.57-57 amd64
-collaboraofficebasis5.3-en-us-calc 5.3.10.57-57 amd64
-collaboraofficebasis5.3-en-us-res 5.3.10.57-57 amd64
-collaboraofficebasis5.3-extension-pdf-import 5.3.10.57-57 amd64
-collaboraofficebasis5.3-filter-data 5.3.10.57-57 amd64
-collaboraofficebasis5.3-graphicfilter 5.3.10.57-57 amd64
-collaboraofficebasis5.3-images 5.3.10.57-57 amd64
-collaboraofficebasis5.3-impress 5.3.10.57-57 amd64
-collaboraofficebasis5.3-noto-fonts 5.3.10.57-57 amd64
-collaboraofficebasis5.3-ooofonts 5.3.10.57-57 amd64
-collaboraofficebasis5.3-ooolinguistic 5.3.10.57-57 amd64
-collaboraofficebasis5.3-writer 5.3.10.57-57 amd64
+collaboraoffice5.3 5.3.10.61-61 amd64
+collaboraoffice5.3-ure 5.3.10.61-61 amd64
+collaboraofficebasis5.3-calc 5.3.10.61-61 amd64
+collaboraofficebasis5.3-core 5.3.10.61-61 amd64
+collaboraofficebasis5.3-draw 5.3.10.61-61 amd64
+collaboraofficebasis5.3-en-us 5.3.10.61-61 amd64
+collaboraofficebasis5.3-en-us-calc 5.3.10.61-61 amd64
+collaboraofficebasis5.3-en-us-res 5.3.10.61-61 amd64
+collaboraofficebasis5.3-extension-pdf-import 5.3.10.61-61 amd64
+collaboraofficebasis5.3-filter-data 5.3.10.61-61 amd64
+collaboraofficebasis5.3-graphicfilter 5.3.10.61-61 amd64
+collaboraofficebasis5.3-images 5.3.10.61-61 amd64
+collaboraofficebasis5.3-impress 5.3.10.61-61 amd64
+collaboraofficebasis5.3-noto-fonts 5.3.10.61-61 amd64
+collaboraofficebasis5.3-ooofonts 5.3.10.61-61 amd64
+collaboraofficebasis5.3-ooolinguistic 5.3.10.61-61 amd64
+collaboraofficebasis5.3-writer 5.3.10.61-61 amd64
-curl 7.58.0-2ubuntu3.3 amd64
+curl 7.58.0-2ubuntu3.5 amd64
-distro-info-data 0.37ubuntu0.1 all
+distro-info-data 0.37ubuntu0.2 all
-dnsutils 1:9.11.3+dfsg-1ubuntu1.2 amd64
+dnsutils 1:9.11.3+dfsg-1ubuntu1.3 amd64
-dpkg 1.19.0.5ubuntu2 amd64
+dpkg 1.19.0.5ubuntu2.1 amd64
-gettext-base 0.19.8.1-6 amd64
+gettext-base 0.19.8.1-6ubuntu0.1 amd64
-git 1:2.17.1-1ubuntu0.3 amd64
-git-man 1:2.17.1-1ubuntu0.3 all
+git 1:2.17.1-1ubuntu0.4 amd64
+git-man 1:2.17.1-1ubuntu0.4 all
-grub-common 2.02-2ubuntu8.7 amd64
+grub-common 2.02-2ubuntu8.9 amd64
-grub-pc 2.02-2ubuntu8.7 amd64
-grub-pc-bin 2.02-2ubuntu8.7 amd64
-grub2-common 2.02-2ubuntu8.7 amd64
+grub-pc 2.02-2ubuntu8.9 amd64
+grub-pc-bin 2.02-2ubuntu8.9 amd64
+grub2-common 2.02-2ubuntu8.9 amd64
-kmod 24-1ubuntu3 amd64
+kmod 24-1ubuntu3.1 amd64
-libbind9-160 1:9.11.3+dfsg-1ubuntu1.2 amd64
+libbind9-160 1:9.11.3+dfsg-1ubuntu1.3 amd64
-libcurl4 7.58.0-2ubuntu3.3 amd64
+libcurl4 7.58.0-2ubuntu3.5 amd64
-libdns-export1100 1:9.11.3+dfsg-1ubuntu1.2 amd64
-libdns1100 1:9.11.3+dfsg-1ubuntu1.2 amd64
+libdns-export1100 1:9.11.3+dfsg-1ubuntu1.3 amd64
+libdns1100 1:9.11.3+dfsg-1ubuntu1.3 amd64
-libglib2.0-0 2.56.2-0ubuntu0.18.04.2 amd64
-libglib2.0-data 2.56.2-0ubuntu0.18.04.2 all
+libglib2.0-0 2.56.3-0ubuntu0.18.04.1 amd64
+libglib2.0-data 2.56.3-0ubuntu0.18.04.1 all
-libirs160 1:9.11.3+dfsg-1ubuntu1.2 amd64
-libisc-export169 1:9.11.3+dfsg-1ubuntu1.2 amd64
-libisc169 1:9.11.3+dfsg-1ubuntu1.2 amd64
-libisccc160 1:9.11.3+dfsg-1ubuntu1.2 amd64
-libisccfg160 1:9.11.3+dfsg-1ubuntu1.2 amd64
+libirs160 1:9.11.3+dfsg-1ubuntu1.3 amd64
+libisc-export169 1:9.11.3+dfsg-1ubuntu1.3 amd64
+libisc169 1:9.11.3+dfsg-1ubuntu1.3 amd64
+libisccc160 1:9.11.3+dfsg-1ubuntu1.3 amd64
+libisccfg160 1:9.11.3+dfsg-1ubuntu1.3 amd64
-libkmod2 24-1ubuntu3 amd64
+libkmod2 24-1ubuntu3.1 amd64
-libldap-2.4-2 2.4.45+dfsg-1ubuntu1 amd64
-libldap-common 2.4.45+dfsg-1ubuntu1 all
+libldap-2.4-2 2.4.45+dfsg-1ubuntu1.1 amd64
+libldap-common 2.4.45+dfsg-1ubuntu1.1 all
-liblwres160 1:9.11.3+dfsg-1ubuntu1.2 amd64
+liblwres160 1:9.11.3+dfsg-1ubuntu1.3 amd64
-libnss-systemd 237-3ubuntu10.3 amd64
+libnss-systemd 237-3ubuntu10.9 amd64
-libpam-systemd 237-3ubuntu10.3 amd64
+libpam-systemd 237-3ubuntu10.9 amd64
-libparted2 3.2-20 amd64
+libparted2 3.2-20ubuntu0.1 amd64
-libperl5.26 5.26.1-6ubuntu0.2 amd64
+libperl5.26 5.26.1-6ubuntu0.3 amd64
-libpython2.7 2.7.15~rc1-1 amd64
-libpython2.7-minimal 2.7.15~rc1-1 amd64
-libpython2.7-stdlib 2.7.15~rc1-1 amd64
-libpython3-stdlib 3.6.5-3ubuntu1 amd64
-libpython3.6 3.6.6-1~18.04 amd64
-libpython3.6-minimal 3.6.6-1~18.04 amd64
-libpython3.6-stdlib 3.6.6-1~18.04 amd64
+libpython2.7 2.7.15~rc1-1ubuntu0.1 amd64
+libpython2.7-minimal 2.7.15~rc1-1ubuntu0.1 amd64
+libpython2.7-stdlib 2.7.15~rc1-1ubuntu0.1 amd64
+libpython3-stdlib 3.6.7-1~18.04 amd64
+libpython3.6 3.6.7-1~18.04 amd64
+libpython3.6-minimal 3.6.7-1~18.04 amd64
+libpython3.6-stdlib 3.6.7-1~18.04 amd64
-libssl1.0.0 1.0.2n-1ubuntu5.1 amd64
-libssl1.1 1.1.0g-2ubuntu4.1 amd64
+libssl1.0.0 1.0.2n-1ubuntu5.2 amd64
+libssl1.1 1.1.0g-2ubuntu4.3 amd64
-libsystemd0 237-3ubuntu10.3 amd64
+libsystemd0 237-3ubuntu10.9 amd64
-libudev1 237-3ubuntu10.3 amd64
+libudev1 237-3ubuntu10.9 amd64
-linux-firmware 1.173.1 all
+linux-firmware 1.173.2 all
-linux-libc-dev 4.15.0-38.41 amd64
+linux-libc-dev 4.15.0-42.45 amd64
-loolwsd 3.4.0-8 amd64
+loolwsd 3.4.2-1 amd64
-networkd-dispatcher 1.7-0ubuntu3.2 all
-nplan 0.36.3 all
+networkd-dispatcher 1.7-0ubuntu3.3 all
+nplan 0.40.1~18.04.3 all
-openssh-client 1:7.6p1-4 amd64
-openssh-server 1:7.6p1-4 amd64
-openssh-sftp-server 1:7.6p1-4 amd64
-openssl 1.1.0g-2ubuntu4.1 amd64
+openssh-client 1:7.6p1-4ubuntu0.1 amd64
+openssh-server 1:7.6p1-4ubuntu0.1 amd64
+openssh-sftp-server 1:7.6p1-4ubuntu0.1 amd64
+openssl 1.1.0g-2ubuntu4.3 amd64
-parted 3.2-20 amd64
+parted 3.2-20ubuntu0.1 amd64
-perl 5.26.1-6ubuntu0.2 amd64
-perl-base 5.26.1-6ubuntu0.2 amd64
-perl-modules-5.26 5.26.1-6ubuntu0.2 all
+perl 5.26.1-6ubuntu0.3 amd64
+perl-base 5.26.1-6ubuntu0.3 amd64
+perl-modules-5.26 5.26.1-6ubuntu0.3 all
-python-apt-common 1.6.2 all
+python-apt-common 1.6.3 all
-python2.7 2.7.15~rc1-1 amd64
-python2.7-minimal 2.7.15~rc1-1 amd64
-python3 3.6.5-3ubuntu1 amd64
+python2.7 2.7.15~rc1-1ubuntu0.1 amd64
+python2.7-minimal 2.7.15~rc1-1ubuntu0.1 amd64
+python3 3.6.7-1~18.04 amd64
-python3-apt 1.6.2 amd64
+python3-apt 1.6.3 amd64
-python3-distupgrade 1:18.04.27 all
+python3-distupgrade 1:18.04.29 all
-python3-gdbm 3.6.5-3 amd64
+python3-gdbm 3.6.7-1~18.04 amd64
-python3-lib2to3 3.6.5-3 all
+python3-lib2to3 3.6.7-1~18.04 all
-python3-minimal 3.6.5-3ubuntu1 amd64
+python3-minimal 3.6.7-1~18.04 amd64
-python3-update-manager 1:18.04.11.6 all
+python3-update-manager 1:18.04.11.7 all
-python3.6 3.6.6-1~18.04 amd64
-python3.6-minimal 3.6.6-1~18.04 amd64
+python3.6 3.6.7-1~18.04 amd64
+python3.6-minimal 3.6.7-1~18.04 amd64
-redis 5:4.0.9-1 all
-redis-server 5:4.0.9-1 amd64
-redis-tools 5:4.0.9-1 amd64
+redis 5:4.0.9-1ubuntu0.1 all
+redis-server 5:4.0.9-1ubuntu0.1 amd64
+redis-tools 5:4.0.9-1ubuntu0.1 amd64
-sa-compile 3.4.1-8build1 all
+sa-compile 3.4.2-0ubuntu0.18.04.1 all
-spamassassin 3.4.1-8build1 all
-spamc 3.4.1-8build1 amd64
+spamassassin 3.4.2-0ubuntu0.18.04.1 all
+spamc 3.4.2-0ubuntu0.18.04.1 amd64
-systemd 237-3ubuntu10.3 amd64
-systemd-sysv 237-3ubuntu10.3 amd64
+systemd 237-3ubuntu10.9 amd64
+systemd-sysv 237-3ubuntu10.9 amd64
-tzdata 2018f-0ubuntu0.18.04 all
+tzdata 2018g-0ubuntu0.18.04 all
-ubuntu-keyring 2018.02.28 all
+ubuntu-keyring 2018.09.18.1~18.04.0 all
-ubuntu-release-upgrader-core 1:18.04.27 all
+ubuntu-release-upgrader-core 1:18.04.29 all
-udev 237-3ubuntu10.3 amd64
+udev 237-3ubuntu10.9 amd64
-update-manager-core 1:18.04.11.6 all
+update-manager-core 1:18.04.11.7 all
-webmin 1.890 all
+webmin 1.900 all
---

diff --git a/.etckeeper b/.etckeeper
index b89ee18af..0014b7e24 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -27,6 +27,10 @@ mkdir -p './letsencrypt/renewal-hooks/deploy'
 mkdir -p './letsencrypt/renewal-hooks/post'
 mkdir -p './letsencrypt/renewal-hooks/pre'
 mkdir -p './monit/conf-available'
+mkdir -p './networkd-dispatcher/dormant.d'
+mkdir -p './networkd-dispatcher/no-carrier.d'
+mkdir -p './networkd-dispatcher/off.d'
+mkdir -p './networkd-dispatcher/routable.d'
 mkdir -p './opt'
 mkdir -p './perl/CPAN'
 mkdir -p './phpmyadmin/conf.d'
@@ -109,6 +113,7 @@ maybe chmod 0755 'apache2/conf-available'
 maybe chmod 0644 'apache2/conf-available/charset.conf'
 maybe chmod 0644 'apache2/conf-available/javascript-common.conf'
 maybe chmod 0644 'apache2/conf-available/localized-error-pages.conf'
+maybe chmod 0644 'apache2/conf-available/loolwsd.conf'
 maybe chmod 0644 'apache2/conf-available/other-vhosts-access-log.conf'
 maybe chmod 0644 'apache2/conf-available/security.conf'
 maybe chmod 0644 'apache2/conf-available/serve-cgi-bin.conf'
@@ -432,6 +437,7 @@ maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg'
 maybe chmod 0644 'bash.bashrc'
 maybe chmod 0644 'bash_completion'
 maybe chmod 0755 'bash_completion.d'
@@ -1317,10 +1323,18 @@ maybe chmod 0755 'network/if-up.d/bind9'
 maybe chmod 0755 'network/if-up.d/openssh-server'
 maybe chmod 0755 'network/if-up.d/postfix'
 maybe chmod 0644 'network/interfaces'
+maybe chmod 0755 'networkd-dispatcher'
+maybe chmod 0755 'networkd-dispatcher/dormant.d'
+maybe chmod 0755 'networkd-dispatcher/no-carrier.d'
+maybe chmod 0755 'networkd-dispatcher/off.d'
+maybe chmod 0755 'networkd-dispatcher/routable.d'
 maybe chmod 0644 'networks'
 maybe chmod 0755 'newt'
 maybe chmod 0644 'newt/palette.original'
 maybe chmod 0644 'newt/palette.ubuntu'
+maybe chmod 0755 'nginx'
+maybe chmod 0755 'nginx/snippets'
+maybe chmod 0644 'nginx/snippets/loolwsd.conf'
 maybe chmod 0644 'nsswitch.conf'
 maybe chmod 0755 'opendkim'
 maybe chmod 0644 'opendkim.conf'
@@ -1548,6 +1562,7 @@ maybe chmod 0644 'spamassassin/v320.pre'
 maybe chmod 0644 'spamassassin/v330.pre'
 maybe chmod 0644 'spamassassin/v340.pre'
 maybe chmod 0644 'spamassassin/v341.pre'
+maybe chmod 0644 'spamassassin/v342.pre'
 maybe chmod 0755 'ssh'
 maybe chmod 0644 'ssh/moduli'
 maybe chmod 0644 'ssh/ssh_config'
@@ -1665,6 +1680,7 @@ maybe chgrp 'bin' 'webmin/apache'
 maybe chmod 0711 'webmin/apache'
 maybe chgrp 'bin' 'webmin/apache/config'
 maybe chmod 0600 'webmin/apache/config'
+maybe chmod 0644 'webmin/apache/httpd-info'
 maybe chgrp 'bin' 'webmin/at'
 maybe chmod 0711 'webmin/at'
 maybe chgrp 'bin' 'webmin/at/config'
diff --git a/apache2/conf-available/loolwsd.conf b/apache2/conf-available/loolwsd.conf
new file mode 100644
index 000000000..7ccfe0051
--- /dev/null
+++ b/apache2/conf-available/loolwsd.conf
@@ -0,0 +1,35 @@
+# Apache2 reverse proxy configuration for Collabora Online / LibreOffice Online
+# Internet <-- SSL --> Reverse Proxy <-- No SSL --> loolwsd
+# Make sure that you enable the following Apache2 modules: proxy, proxy_wstunnel, and proxy_http.
+# Create a virtual host for Collabora Online / LibreOffice Online and include this configuration file.
+
+  Options -Indexes
+
+  # Encoded slashes need to be allowed
+  AllowEncodedSlashes NoDecode
+
+  # keep the host
+  ProxyPreserveHost On
+
+  # static html, js, images, etc. served from loolwsd
+  # loleaflet is the client part of LibreOffice Online
+  ProxyPass           /loleaflet http://127.0.0.1:9980/loleaflet retry=0
+  ProxyPassReverse    /loleaflet http://127.0.0.1:9980/loleaflet
+
+  # WOPI discovery URL
+  ProxyPass           /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0
+  ProxyPassReverse    /hosting/discovery http://127.0.0.1:9980/hosting/discovery
+
+  # Capabilities
+  ProxyPass           /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0
+  ProxyPassReverse    /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities
+
+  # Main websocket
+  ProxyPassMatch "/lool/(.*)/ws$" ws://127.0.0.1:9980/lool/$1/ws nocanon
+
+  # Admin Console websocket
+  ProxyPass   /lool/adminws ws://127.0.0.1:9980/lool/adminws
+
+  # Download as, Fullscreen presentation and Image upload operations
+  ProxyPass           /lool http://127.0.0.1:9980/lool
+  ProxyPassReverse    /lool http://127.0.0.1:9980/lool
diff --git a/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg b/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
new file mode 100644
index 000000000..1cc9f3f2d
Binary files /dev/null and b/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg differ
diff --git a/default/grub b/default/grub
index b6a77625d..ed49c7cb0 100644
--- a/default/grub
+++ b/default/grub
@@ -31,4 +31,3 @@ GRUB_CMDLINE_LINUX=""
 
 # Uncomment to get a beep at grub start
 #GRUB_INIT_TUNE="480 440 1"
-GRUB_RECORDFAIL_TIMEOUT=5
diff --git a/init.d/spamassassin b/init.d/spamassassin
index 9fb9c0627..dc4b28471 100755
--- a/init.d/spamassassin
+++ b/init.d/spamassassin
@@ -51,30 +51,30 @@ case "$1" in
   start)
 	check_enabled
 	echo -n "Starting $DESC: "
-	start-stop-daemon --start --pidfile $PIDFILE --name $DAEMON \
+	start-stop-daemon --start --pidfile $PIDFILE --name $NAME \
 	    $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS
 	echo "$NAME."
 	;;
 
   stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --pidfile $PIDFILE --name $DAEMON --oknodo
+	start-stop-daemon --stop --pidfile $PIDFILE --name $NAME --oknodo
 	echo "$NAME."
 	;;
 
   reload|force-reload)
 	check_enabled
 	echo -n "Reloading $DESC: "
-	start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --name $DAEMON
+	start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --name $NAME
 	echo "$NAME."
 	;;
 
   restart)
 	check_enabled
 	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --pidfile $PIDFILE --name $DAEMON \
+	start-stop-daemon --stop --pidfile $PIDFILE --name $NAME \
 	    --retry 5 --oknodo
-	start-stop-daemon --start --pidfile $PIDFILE --name $DAEMON \
+	start-stop-daemon --start --pidfile $PIDFILE --name $NAME \
 	    $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS
 
 	echo "$NAME."
diff --git a/modprobe.d/blacklist.conf b/modprobe.d/blacklist.conf
index 08b38541b..eecdf1286 100644
--- a/modprobe.d/blacklist.conf
+++ b/modprobe.d/blacklist.conf
@@ -25,9 +25,6 @@ blacklist snd_intel8x0m
 # Conflicts with dvb driver (which is better for handling this device)
 blacklist snd_aw2
 
-# causes failure to suspend on HP compaq nc6000 (Ubuntu: #10306)
-blacklist i2c_i801
-
 # replaced by p54pci
 blacklist prism54
 
diff --git a/nginx/snippets/loolwsd.conf b/nginx/snippets/loolwsd.conf
new file mode 100644
index 000000000..e176760b9
--- /dev/null
+++ b/nginx/snippets/loolwsd.conf
@@ -0,0 +1,41 @@
+    # static files
+    location ^~ /loleaflet {
+        proxy_pass http://localhost:9980;
+        proxy_set_header Host $http_host;
+    }
+
+    # WOPI discovery URL
+    location ^~ /hosting/discovery {
+        proxy_pass http://localhost:9980;
+        proxy_set_header Host $http_host;
+    }
+
+    # Capabilities
+    location ^~ /hosting/capabilities {
+        proxy_pass http://localhost:9980;
+        proxy_set_header Host $http_host;
+    }
+
+    # main websocket
+    location ~ ^/lool/(.*)/ws$ {
+        proxy_pass http://localhost:9980;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $http_host;
+        proxy_read_timeout 36000s;
+    }
+
+    # download, presentation and image upload
+    location ~ ^/lool {
+        proxy_pass http://localhost:9980;
+        proxy_set_header Host $http_host;
+    }
+
+    # Admin Console websocket
+    location ^~ /lool/adminws {
+        proxy_pass http://localhost:9980;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $http_host;
+        proxy_read_timeout 36000s;
+    }
diff --git a/spamassassin/v342.pre b/spamassassin/v342.pre
new file mode 100644
index 000000000..4ab77366b
--- /dev/null
+++ b/spamassassin/v342.pre
@@ -0,0 +1,36 @@
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# This file was installed during the installation of SpamAssassin 3.4.1,
+# and contains plugin loading commands for the new plugins added in that
+# release.  It will not be overwritten during future SpamAssassin installs,
+# so you can modify it to enable some disabled-by-default plugins below,
+# if you so wish.
+#
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
+###########################################################################
+
+# HashBL - Use EBL email blocklist
+# loadplugin Mail::SpamAssassin::Plugin::HashBL
+
+# ResourceLimits - assure your spamd child processes
+# do not exceed specified CPU or memory limit
+# loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
+
+
+# FromNameSpoof - help stop spam that tries to spoof other domains using 
+# the from name
+# loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
+
+# Phishing - finds uris used in phishing campaigns detected by
+# OpenPhish or PhishTank feeds.
+# loadplugin Mail::SpamAssassin::Plugin::Phishing
+
+# allow URI rules to look at DKIM headers if they exist
+parse_dkim_uris 1
diff --git a/webmin/acl/config b/webmin/acl/config
index 9c0a53994..ad7d02089 100644
--- a/webmin/acl/config
+++ b/webmin/acl/config
@@ -1,3 +1,3 @@
+ssleay=/usr/bin/openssl
 display=1
 order=0
-ssleay=/usr/bin/openssl
diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config
index 15972ba80..230331ded 100644
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
 stop_cmd=adsl-stop
-status_cmd=adsl-status
-start_cmd=adsl-start
-conf_style=0
-pppoe_cmd=pppoe
 pap_file=/etc/ppp/pap-secrets
 pppoe_conf=/etc/ppp/pppoe.conf
+start_cmd=adsl-start
+pppoe_cmd=pppoe
+status_cmd=adsl-status
+conf_style=0
diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config
index a31edabcb..003ebb11c 100644
--- a/webmin/ajaxterm/config
+++ b/webmin/ajaxterm/config
@@ -1,2 +1,2 @@
-autologin=0
 timeout=120
+autologin=0
diff --git a/webmin/apache/config b/webmin/apache/config
index e9c9b3a49..78c0c18ce 100644
--- a/webmin/apache/config
+++ b/webmin/apache/config
@@ -1,24 +1,24 @@
-virt_file=/etc/apache2/sites-available
+show_list=0
 allow_virtualmin=0
-test_always=0
 show_order=0
+httpd_path=/usr/sbin/apache2
+max_servers=100
+auto_mods=1
+apachectl_path=/usr/sbin/apache2ctl
+show_names=0
+httpd_conf=/etc/apache2/apache2.conf
+start_cmd=/etc/init.d/apache2 start
+defines_name=APACHE_ARGUMENTS
 test_config=1
-test_apachectl=1
 defines_file=/etc/apache2/envvars
-srm_conf=/etc/apache2/srm.conf
-link_dir=/etc/apache2/sites-enabled
-defines_name=APACHE_ARGUMENTS
-max_servers=100
-access_conf=/etc/apache2/access.conf
 apply_cmd=/usr/sbin/apache2ctl graceful
 test_manual=0
-start_cmd=/etc/init.d/apache2 start
-httpd_conf=/etc/apache2/apache2.conf
 stop_cmd=/etc/init.d/apache2 stop
-auto_mods=1
-apachectl_path=/usr/sbin/apache2ctl
-show_list=0
-httpd_dir=/etc/apache2
 mime_types=/etc/apache2/mime.types
-httpd_path=/usr/sbin/apache2
-show_names=0
+srm_conf=/etc/apache2/srm.conf
+link_dir=/etc/apache2/sites-enabled
+virt_file=/etc/apache2/sites-available
+access_conf=/etc/apache2/access.conf
+httpd_dir=/etc/apache2
+test_always=0
+test_apachectl=1
diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info
new file mode 100644
index 000000000..c3a18f6e6
--- /dev/null
+++ b/webmin/apache/httpd-info
@@ -0,0 +1,4 @@
+time=1539197965
+cmd=/usr/sbin/apache2
+mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
+version=2.429
diff --git a/webmin/backup-config/config b/webmin/backup-config/config
index c13b50ad6..3bdfb1231 100644
--- a/webmin/backup-config/config
+++ b/webmin/backup-config/config
@@ -1,3 +1,3 @@
-webmin_subs=0
-apply=1
 date_subs=0
+apply=1
+webmin_subs=0
diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config
index 690145f12..7d5fb895e 100644
--- a/webmin/bacula-backup/config
+++ b/webmin/bacula-backup/config
@@ -1,12 +1,12 @@
-bls=bls
-driver=Pg
-db=bacula
-apply=1
 wait=1
+driver=Pg
+btape=btape
+bls=bls
 bextract=bextract
-user=bacula
 bacula_dir=/etc/bacula
-btape=btape
+user=bacula
+apply=1
 init_start=0
 pass=
+db=bacula
 showdirs=0
diff --git a/webmin/bind8/config b/webmin/bind8/config
index 2f615b84b..02884a399 100644
--- a/webmin/bind8/config
+++ b/webmin/bind8/config
@@ -1,45 +1,45 @@
-relative_paths=0
-support_aaaa=1
-ndc_cmd=ndc
-updserial_man=1
-signzone=dnssec-signzone
-pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
-allow_underscore=1
-zones_file=/etc/bind/named.conf.local
+checkzone=named-checkzone
 allow_long=0
-soa_style=0
-show_list=0
-reversezonefilename_format=ZONE.rev
-keygen=dnssec-keygen
-whois_cmd=whois
-master_dir=/var/lib/bind
-rev_must=0
-named_conf=/etc/bind/named.conf
-named_path=/usr/sbin/named
-spf_record=0
-rndc_cmd=rndc
-soa_start=0
-rev_def=0
-forwardzonefilename_format=ZONE.hosts
-rndcconf_cmd=rndc-confgen
-allow_comments=0
-force_random=0
-slave_dir=/var/lib/bind
+no_pid_chroot=0
+zones_file=/etc/bind/named.conf.local
+ipv6_mode=1
+signzone=dnssec-signzone
 confirm_rec=0
-short_names=0
+other_slaves=1
+confirm_zone=1
+force_random=0
+updserial_man=1
 checkconf=named-checkconf
-no_pid_chroot=0
-allow_wild=1
-by_view=0
 max_zones=50
-updserial_on=1
-other_slaves=1
+soa_style=0
+relative_paths=0
+support_aaaa=1
 master_ttl=1
+spf_record=0
+slave_dir=/var/lib/bind
+named_path=/usr/sbin/named
+named_conf=/etc/bind/named.conf
+rndcconf_cmd=rndc-confgen
+allow_wild=1
+master_dir=/var/lib/bind
+soa_start=0
 rndc_conf=/etc/bind/rndc.conf
-checkzone=named-checkzone
-updserial_def=0
+allow_comments=0
+records_order=0
+whois_cmd=whois
+reversezonefilename_format=ZONE.rev
+pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
+rndc_cmd=rndc
 no_chroot=0
-confirm_zone=1
+updserial_def=0
+ndc_cmd=ndc
 largezones=0
-records_order=0
-ipv6_mode=1
+allow_underscore=1
+show_list=0
+updserial_on=1
+short_names=0
+rev_must=0
+rev_def=0
+keygen=dnssec-keygen
+by_view=0
+forwardzonefilename_format=ZONE.hosts
diff --git a/webmin/burner/config b/webmin/burner/config
index 72d399276..0cf5e2dc9 100644
--- a/webmin/burner/config
+++ b/webmin/burner/config
@@ -1,6 +1,6 @@
-cdrecord=cdrecord
-mkisofs=mkisofs
 sox=sox
 cdrdao=cdrdao
-mpg123=mpg123
 speed=1
+mkisofs=mkisofs
+mpg123=mpg123
+cdrecord=cdrecord
diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config
index 1c1ed801d..294c79b71 100644
--- a/webmin/cluster-passwd/config
+++ b/webmin/cluster-passwd/config
@@ -1,3 +1,3 @@
-sort_mode=0
 max_users=200
+sort_mode=0
 input_type=0
diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config
index fd788cb1e..470eaee86 100644
--- a/webmin/cluster-software/config
+++ b/webmin/cluster-software/config
@@ -1,2 +1,2 @@
-table_mode=0
 sort_mode=0
+table_mode=0
diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config
index effe0b999..eca989069 100644
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
+conf_add_user=1
 conf_allow_refresh=1
 conf_find_group=1
 conf_host_links=1
 sort_mode=0
-table_mode=0
-conf_find_user=1
-conf_add_user=1
-conf_allow_sync=1
 conf_add_group=1
+conf_allow_sync=1
+conf_find_user=1
+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 603438f04..32fe2851b 100644
--- a/webmin/config
+++ b/webmin/config
@@ -1,32 +1,32 @@
-passwd_uindex=0
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-passwd_pindex=1
-ld_env=LD_LIBRARY_PATH
-passwd_file=/etc/shadow
-passwd_mindex=4
-passwd_cindex=2
 tempdelete_days=7
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-by_view=0
-os_type=debian-linux
-os_version=9.0
-real_os_type=Ubuntu Linux
-real_os_version=18.04.1
+webprefix=
 lang=en.UTF-8
-log=1
+sysinfo=0
+nofeedbackcc=0
+help_height=
 referers_none=1
-md5pass=1
-theme=authentic-theme
-product=webmin
-lang_root=de.UTF-8
-webprefix=
-feedback_to=
-showhost=0
-hostnamedisplay=
+os_type=debian-linux
 hostnamemode=0
-nofeedbackcc=0
-sysinfo=0
 help_width=
+md5pass=1
+log=1
 dateformat=dd/mon/yyyy
+passwd_cindex=2
+lang_root=de.UTF-8
+hostnamedisplay=
+showhost=0
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+real_os_version=18.04.1
+passwd_uindex=0
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
+product=webmin
+passwd_file=/etc/shadow
+os_version=9.0
+feedback_to=
+theme=authentic-theme
+by_view=0
+real_os_type=Ubuntu Linux
+passwd_mindex=4
 showlogin=0
-help_height=
+passwd_pindex=1
+ld_env=LD_LIBRARY_PATH
diff --git a/webmin/cpan/config b/webmin/cpan/config
index 34a8a196f..b12b0248c 100644
--- a/webmin/cpan/config
+++ b/webmin/cpan/config
@@ -1,6 +1,6 @@
-refresh_days=30
-incyum=1
-packages=http://www.cpan.org/modules/02packages.details.txt.gz
 incpackages=1
 cpan=http://www.cpan.org/authors/id
+incyum=1
+packages=http://www.cpan.org/modules/02packages.details.txt.gz
+refresh_days=30
 save_partial=0
diff --git a/webmin/cron/config b/webmin/cron/config
index 050280620..4d021439b 100644
--- a/webmin/cron/config
+++ b/webmin/cron/config
@@ -1,24 +1,24 @@
 match_user=1
-cron_user_delete_command=crontab -r
-cron_delete_command=crontab -u USER -r
-cron_deny_file=/var/spool/cron/deny
-cronfiles_dir=/etc/cron.d
-cron_input=1
-cron_deny_all=2
-cron_dir=/var/spool/cron/crontabs
-show_comment=0
 cron_user_get_command=crontab -l
-match_mode=0
 cron_edit_command=crontab -u USER -e
-system_crontab=/etc/crontab
-cron_get_command=crontab -u USER -l
-kill_subs=0
-cron_allow_file=/var/spool/cron/allow
+show_comment=0
 show_time=0
+kill_subs=0
+run_parts=run-parts
+cron_deny_file=/var/spool/cron/deny
+cron_dir=/var/spool/cron/crontabs
 vixie_cron=1
+match_mode=0
+cron_delete_command=crontab -u USER -r
+max_jobs=100
+show_run=0
 hourly_only=0
-run_parts=run-parts
+cron_user_delete_command=crontab -r
+system_crontab=/etc/crontab
+cron_allow_file=/var/spool/cron/allow
+cron_deny_all=2
 cron_user_edit_command=crontab -e
-show_run=0
+cronfiles_dir=/etc/cron.d
+cron_input=1
 max_len=80
-max_jobs=100
+cron_get_command=crontab -u USER -l
diff --git a/webmin/custom/config b/webmin/custom/config
index 1a8539208..777fdaf3a 100644
--- a/webmin/custom/config
+++ b/webmin/custom/config
@@ -1,4 +1,4 @@
+columns=2
 params_cmd=0
 display_mode=0
 params_file=0
-columns=2
diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index 713aa0e56..fc3774f1f 100644
--- a/webmin/dhcpd/config
+++ b/webmin/dhcpd/config
@@ -1,16 +1,16 @@
+stop_cmd=service isc-dhcp-server stop
+group_name=0
+start_cmd=service isc-dhcp-server start
+dhcpd_nocols=5
 pid_file=/var/run/dhcpd.pid
-lease_tz=0
-interfaces_type=debian
+show_mac=0
 lease_sort=0
+interfaces_type=debian
+lease_tz=0
+restart_cmd=service isc-dhcp-server restart
+dhcpd_conf=/etc/dhcp/dhcpd.conf
 lease_file=/var/lib/dhcp/dhcpd.leases
-show_mac=0
-display_max=100
 show_ip=0
-group_name=0
-restart_cmd=service isc-dhcp-server restart
+display_max=100
 dhcpd_path=/usr/sbin/dhcpd
-start_cmd=service isc-dhcp-server start
-stop_cmd=service isc-dhcp-server stop
 desc_name=0
-dhcpd_nocols=5
-dhcpd_conf=/etc/dhcp/dhcpd.conf
diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index 3046deb50..658fb103e 100644
--- a/webmin/dovecot/config
+++ b/webmin/dovecot/config
@@ -1,4 +1,4 @@
-init_script=dovecot
-dovecot_config=/etc/dovecot/dovecot.conf
 dovecot=/usr/sbin/dovecot
+dovecot_config=/etc/dovecot/dovecot.conf
+init_script=dovecot
 pid_file=/var/run/dovecot/master.pid
diff --git a/webmin/exim/config b/webmin/exim/config
index 8c9946095..f5db7f930 100644
--- a/webmin/exim/config
+++ b/webmin/exim/config
@@ -1,8 +1,8 @@
-exim_dbmfile=/etc/exim4/local_domains
 exim_aliasfileext=
 exim_dir=/etc/exim4
+exim_dbmfile=/etc/exim4/local_domains
 exim_mail_file=Maildir
+exim_addrfile=/etc/exim4/email-addresses
 exim_dbmext=.dbm
 mail_system=1
 exim_virt_dir=/etc/exim4/aliases
-exim_addrfile=/etc/exim4/email-addresses
diff --git a/webmin/exports/config b/webmin/exports/config
index 8f8b567ee..5a48ca66f 100644
--- a/webmin/exports/config
+++ b/webmin/exports/config
@@ -1,3 +1,3 @@
-exports_file=/etc/exports
 apply_cmd=exportfs -r
 restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi
+exports_file=/etc/exports
diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config
index c0503a2b6..6b240d5ac 100644
--- a/webmin/fail2ban/config
+++ b/webmin/fail2ban/config
@@ -1,4 +1,4 @@
+config_dir=/etc/fail2ban
 client_cmd=/usr/bin/fail2ban-client
 init_script=fail2ban
 server_cmd=/usr/bin/fail2ban-server
-config_dir=/etc/fail2ban
diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config
index e01bc69f8..3fe3c9378 100644
--- a/webmin/fetchmail/config
+++ b/webmin/fetchmail/config
@@ -1,6 +1,6 @@
-view_mode=0
+max_users=400
 pid_file=/var/run/fetchmail.pid
+view_mode=0
 config_file=
 daemon_user=root
-max_users=400
 fetchmail_path=fetchmail
diff --git a/webmin/file/config b/webmin/file/config
index 0e03f1251..8904d796a 100644
--- a/webmin/file/config
+++ b/webmin/file/config
@@ -1,21 +1,21 @@
-ext3_acl=&has_command("getfacl") && &has_command("setfacl")
-xfs_attr=&has_command("attr")
-force_text=0
+hide_dot_files=0
+ext2_acl=&has_command("getfacl") && &has_command("setfacl")
 xfs_acl=&has_command("getfacl") && &has_command("setfacl")
-ext3_ext=&has_command("lsattr") && &has_command("chattr")
+ext4_ext=&has_command("lsattr") && &has_command("chattr")
+extract=1
+setfacl=setfacl --set-file=-
 reiserfs_acl=&has_command("getfacl") && &has_command("setfacl")
-hide_dot_files=0
 ext3_attr=&has_command("attr")
-ext2_acl=&has_command("getfacl") && &has_command("setfacl")
-nocharset=0
+ext2_ext=&has_command("lsattr") && &has_command("chattr")
+defuser=root
 getfacl=getfacl
-defzip=0
+nocharset=0
+iconsize=0
 ext4_acl=&has_command("getfacl") && &has_command("setfacl")
-extract=1
-ext2_ext=&has_command("lsattr") && &has_command("chattr")
+ext3_ext=&has_command("lsattr") && &has_command("chattr")
+ext3_acl=&has_command("getfacl") && &has_command("setfacl")
+xfs_attr=&has_command("attr")
+force_text=0
 ext2_attr=&has_command("attr")
-iconsize=0
-defuser=root
-setfacl=setfacl --set-file=-
-ext4_ext=&has_command("lsattr") && &has_command("chattr")
 ext4_attr=&has_command("attr")
+defzip=0
diff --git a/webmin/filter/config b/webmin/filter/config
index 3d1ce1b27..48ffb01a0 100644
--- a/webmin/filter/config
+++ b/webmin/filter/config
@@ -1,6 +1,6 @@
-alias_files=/etc/aliases	/etc/postfix/aliases	/etc/mail/aliases
-forward_procmail=0
-virtualmin_config=/etc/webmin/virtual-server
 reply_force=0
-virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
 warn_procmail=1
+forward_procmail=0
+virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
+virtualmin_config=/etc/webmin/virtual-server
+alias_files=/etc/aliases	/etc/postfix/aliases	/etc/mail/aliases
diff --git a/webmin/firewall/config b/webmin/firewall/config
index 98be7af07..925163f1e 100644
--- a/webmin/firewall/config
+++ b/webmin/firewall/config
@@ -1,6 +1,6 @@
-direct=0
 cluster_mode=1
 view_comment=0
-comment_mod=0
-view_condition=1
 force_init=0
+direct=0
+view_condition=1
+comment_mod=0
diff --git a/webmin/firewall6/config b/webmin/firewall6/config
index 98be7af07..4623fa367 100644
--- a/webmin/firewall6/config
+++ b/webmin/firewall6/config
@@ -1,6 +1,6 @@
 direct=0
-cluster_mode=1
-view_comment=0
+force_init=0
 comment_mod=0
 view_condition=1
-force_init=0
+view_comment=0
+cluster_mode=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 a66b02459..7b072bafc 100644
--- a/webmin/fsdump/config
+++ b/webmin/fsdump/config
@@ -1,7 +1,7 @@
 nonewtape=0
-run_mode=0
-webmin_subs=0
+date_subs=0
 simple_sched=0
+run_mode=0
 error_email=0
-date_subs=0
 always_tar=0
+webmin_subs=0
diff --git a/webmin/grub/config b/webmin/grub/config
index 98bdc19a6..2bb2e4e49 100644
--- a/webmin/grub/config
+++ b/webmin/grub/config
@@ -1,3 +1,3 @@
 grub_path=grub
-menu_file=/boot/grub/menu.lst
 install=(hd0)
+menu_file=/boot/grub/menu.lst
diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config
index 6c1aca420..9a628e429 100644
--- a/webmin/heartbeat/config
+++ b/webmin/heartbeat/config
@@ -1,15 +1,15 @@
-alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
-start_cmd=/etc/init.d/heartbeat start
-stop_cmd=/etc/init.d/heartbeat stop
-ha_cf=
+ha_dir=/etc/ha.d
 heartbeat=/usr/lib/heartbeat/heartbeat
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
 req_resource_cmd=/usr/lib/heartbeat/req_resource
-alt_haresources=/usr/share/doc/packages/heartbeat/haresources
+pid_file=/var/run/heartbeat.pid
 alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
 resource_d=
-authkeys=
-haresources=
 serials=/dev/ttyS*
-pid_file=/var/run/heartbeat.pid
+start_cmd=/etc/init.d/heartbeat start
+alt_haresources=/usr/share/doc/packages/heartbeat/haresources
+haresources=
 apply_cmd=/etc/init.d/heartbeat reload
-ha_dir=/etc/ha.d
+stop_cmd=/etc/init.d/heartbeat stop
+authkeys=
+ha_cf=
diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config
index cddef14bf..5bc39aba0 100644
--- a/webmin/htaccess-htpasswd/config
+++ b/webmin/htaccess-htpasswd/config
@@ -1,8 +1,8 @@
+htgroups=.htgroups
+md5=1
 sort=0
-htpasswd=.htpasswd
-sha1=0
 htaccess=.htaccess
-extra_directives=
-md5=1
-htgroups=.htgroups
 digest=1
+htpasswd=.htpasswd
+extra_directives=
+sha1=0
diff --git a/webmin/idmapd/config b/webmin/idmapd/config
index bc70dab5e..d6cd4227f 100644
--- a/webmin/idmapd/config
+++ b/webmin/idmapd/config
@@ -1,3 +1,3 @@
-idmapd_path=/usr/sbin/rpc.idmapd
-restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
 idmapd_conf=/etc/idmapd.conf
+restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
+idmapd_path=/usr/sbin/rpc.idmapd
diff --git a/webmin/inetd/config b/webmin/inetd/config
index 595a8e020..e8f0e7a68 100644
--- a/webmin/inetd/config
+++ b/webmin/inetd/config
@@ -1,16 +1,16 @@
 inetd_conf_file=/etc/inetd.conf
-deny_file=/etc/hosts.deny
-protocols_file=/etc/protocols
-rpc_protocols=tcp udp
-rpc_file=/etc/rpc
-restart_command=killall -HUP inetd
+allow_file=/etc/hosts.allow
+display_max=100
+extended_inetd=1
 sort_mode=0
+services_file=/etc/services
+ipv6=0
 show_empty=1
-tcpd_path=/usr/sbin/tcpd
+deny_file=/etc/hosts.deny
+rpc_protocols=tcp udp
 qm_mode=0
-extended_inetd=1
-display_max=100
-ipv6=0
+protocols_file=/etc/protocols
+restart_command=killall -HUP inetd
 rpc_inetd=1
-allow_file=/etc/hosts.allow
-services_file=/etc/services
+rpc_file=/etc/rpc
+tcpd_path=/usr/sbin/tcpd
diff --git a/webmin/init/config b/webmin/init/config
index 090cbac9c..44c9a8458 100644
--- a/webmin/init/config
+++ b/webmin/init/config
@@ -1,17 +1,17 @@
-expert=0
-show_opts=0
-status_check=0
 sort_mode=0
 init_dir=/etc/init.d
-init_base=/etc/
+reboot_command=reboot
 shutdown_command=poweroff
+order=0
+init_info=1
+inittab_id=id
+init_base=/etc/
+atboot_product=webmin
+expert=0
 no_chkconfig=0
+boot_levels=2 3 5
 order_digits=2
-reboot_command=reboot
+status_check=0
 soft_links=1
-inittab_id=id
-order=0
-init_info=1
 desc=1
-boot_levels=2 3 5
-atboot_product=webmin
+show_opts=0
diff --git a/webmin/inittab/config b/webmin/inittab/config
index c2b25728b..31db3e7b1 100644
--- a/webmin/inittab/config
+++ b/webmin/inittab/config
@@ -1,2 +1,2 @@
-telinit=telinit
 inittab_file=/etc/inittab
+telinit=telinit
diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config
index 0e14cdd27..684094999 100644
--- a/webmin/ipfilter/config
+++ b/webmin/ipfilter/config
@@ -1,9 +1,9 @@
+cluster_nat=1
+ipf_conf=/etc/ipf/ipf.conf
 view_condition=1
 ipf=ipf
-cluster_nat=1
 ipfstat=ipfstat
-ipnat_conf=/etc/ipf/ipnat.conf
 view_comment=0
-ipf_conf=/etc/ipf/ipf.conf
+ipnat_conf=/etc/ipf/ipnat.conf
 cluster_mode=0
 ipnat=ipnat
diff --git a/webmin/ipfw/config b/webmin/ipfw/config
index d538b1443..aad8551b3 100644
--- a/webmin/ipfw/config
+++ b/webmin/ipfw/config
@@ -1,6 +1,6 @@
+view_condition=1
 view_counters=0
-view_comment=0
-cluster_mode=0
-ipfw=/sbin/ipfw
 version=2
-view_condition=1
+ipfw=/sbin/ipfw
+cluster_mode=0
+view_comment=0
diff --git a/webmin/ipsec/config b/webmin/ipsec/config
index fa96379df..d1310093b 100644
--- a/webmin/ipsec/config
+++ b/webmin/ipsec/config
@@ -1,8 +1,8 @@
+file=/etc/ipsec.conf
+start_cmd=/etc/init.d/ipsec start
 ipsec=/usr/sbin/ipsec
-restart_cmd=/etc/init.d/ipsec restart
 logfile=/var/log/messages
+restart_cmd=/etc/init.d/ipsec restart
 policies_dir=/etc/ipsec.d/policies
 stop_cmd=/etc/init.d/ipsec stop
 secrets=/etc/ipsec.secrets
-start_cmd=/etc/init.d/ipsec start
-file=/etc/ipsec.conf
diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config
index 185763486..4ebe2dcc1 100644
--- a/webmin/iscsi-client/config
+++ b/webmin/iscsi-client/config
@@ -1,6 +1,6 @@
-initiator_file=/etc/iscsi/initiatorname.iscsi
 iscsiiname=iscsi-iname
+initiator_file=/etc/iscsi/initiatorname.iscsi
 iscsiadm=iscsiadm
-ifaces_dir=/var/lib/iscsi/ifaces
 config_file=/etc/iscsi/iscsid.conf
+ifaces_dir=/var/lib/iscsi/ifaces
 init_name=open-iscsi
diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index 26c2be5c3..48d20e911 100644
--- a/webmin/iscsi-server/config
+++ b/webmin/iscsi-server/config
@@ -1,6 +1,6 @@
-pid_file=/var/run/iscsi-target.pid
+targets_file=/etc/iscsi/targets
+opts_file=/etc/sysconfig/netbsd-iscsi
 init_name=netbsd-iscsi
+pid_file=/var/run/iscsi-target.pid
 iscsi_server=/usr/sbin/iscsi-target
 auths_file=/etc/iscsi/auths
-opts_file=/etc/sysconfig/netbsd-iscsi
-targets_file=/etc/iscsi/targets
diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config
index 3baa4e716..91c1974d1 100644
--- a/webmin/iscsi-target/config
+++ b/webmin/iscsi-target/config
@@ -1,7 +1,7 @@
-targets_file=/etc/iet/targets.allow
-opts_file=/etc/default/iscsitarget
-ietadm=ietadm
-init_name=iscsitarget
-initiators_file=/etc/iet/initiators.allow
 config_file=/etc/iet/ietd.conf
 pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
+ietadm=ietadm
+initiators_file=/etc/iet/initiators.allow
+init_name=iscsitarget
+opts_file=/etc/default/iscsitarget
+targets_file=/etc/iet/targets.allow
diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config
index 853c8fac2..618c982d6 100644
--- a/webmin/iscsi-tgtd/config
+++ b/webmin/iscsi-tgtd/config
@@ -1,5 +1,5 @@
-tgtadmin=tgt-admin
+config_file=/etc/tgt/targets.conf
 tgtadm=tgtadm
 tgtd=tgtd
+tgtadmin=tgt-admin
 init_name=tgtd
-config_file=/etc/tgt/targets.conf
diff --git a/webmin/jabber/config b/webmin/jabber/config
index 7b4dd3cb5..8a11d07ca 100644
--- a/webmin/jabber/config
+++ b/webmin/jabber/config
@@ -1,5 +1,5 @@
 jabber_dir=/var/lib/jabber
-jabber_daemon=/usr/sbin/jabberd
-jabber_config=/etc/jabber/jabber.xml
 stop_cmd=/etc/init.d/jabberd stop
+jabber_daemon=/usr/sbin/jabberd
 start_cmd=/etc/init.d/jabberd start
+jabber_config=/etc/jabber/jabber.xml
diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config
index d45286770..41ce77d5e 100644
--- a/webmin/ldap-client/config
+++ b/webmin/ldap-client/config
@@ -1,3 +1,3 @@
+init_name=nslcd
 secret=/etc/ldap.secret
 auth_ldap=/etc/ldap.conf
-init_name=nslcd
diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index d7809c5ab..d9a3fa7b6 100644
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
-stop_cmd=/etc/init.d/slapd stop
-start_cmd=/etc/init.d/slapd start
-attr_count=6
-browse_max=100
-slapd=slapd
+ldap_user=openldap
 config_file=/etc/ldap/slapd.d
+slapd=slapd
+init_name=slapd
+browse_max=100
 schema_dir=/etc/ldap/schema
-ldap_user=openldap
+start_cmd=/etc/init.d/slapd start
+attr_count=6
+stop_cmd=/etc/init.d/slapd stop
 apply_cmd=/etc/init.d/slapd restart
-init_name=slapd
diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config
index e6c69e39b..65781b214 100644
--- a/webmin/ldap-useradmin/config
+++ b/webmin/ldap-useradmin/config
@@ -1,24 +1,24 @@
-imap_class=SuSEeMailObject
 person=1
-imap_login=cyrus
+alias_same=0
+samba_gclass=sambaGroup
+membox=0
 auth_ldap=/etc/ldap.conf
-other_class=inetOrgPerson
-given_order=0
-gecos=1
-mailfmt=0
-shells=fixed,ldap,passwd,shells
-samba_def=0
-imap_foldersep=.
+secmode=0
+md5=0
+imap_login=cyrus
 samba_class=sambaSamAccount
-membox=0
-given=0
-samba_gclass=sambaGroup
-ldap_tls=0
+imap_folders=old	public	sent-mail
 imap_def=0
+mailfmt=0
+gecos=1
+quota_support=0
+samba_def=0
+imap_class=SuSEeMailObject
+given_order=0
 slappasswd=slappasswd
+other_class=inetOrgPerson
+shells=fixed,ldap,passwd,shells
+given=0
+imap_foldersep=.
 multi_fields=0
-alias_same=0
-secmode=0
-imap_folders=old	public	sent-mail
-md5=0
-quota_support=0
+ldap_tls=0
diff --git a/webmin/logrotate/config b/webmin/logrotate/config
index 7633e98b5..89afab6d0 100644
--- a/webmin/logrotate/config
+++ b/webmin/logrotate/config
@@ -1,4 +1,4 @@
-add_file=/etc/logrotate.d
 logrotate_conf=/etc/logrotate.conf
-sort_mode=0
 logrotate=logrotate
+add_file=/etc/logrotate.d
+sort_mode=0
diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config
index 77e831ed6..d1a7ed64b 100644
--- a/webmin/lpadmin/config
+++ b/webmin/lpadmin/config
@@ -1,17 +1,17 @@
 iface_arg=
-gs_fontpath=
-gs_path=gs
-iface_owner=lp:lp
+driver_style=cups
+show_jobs=0
 print_style=cups
-gs_lib=
-show_status=0
 spool_dir=/var/spool/cups
-smbclient_path=smbclient
-iface_perms=755
-show_jobs=0
-driver_style=cups
+gs_fontpath=
 sort_mode=0
 model_path=/usr/share/foomatic/db /usr/share/ppd
 display_mode=0
+show_status=0
 start_cmd=/etc/init.d/cupsys start
+gs_lib=
+iface_perms=755
+iface_owner=lp:lp
+smbclient_path=smbclient
+gs_path=gs
 stop_cmd=/etc/init.d/cupsys stop
diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config
index 64d9cbca7..ee9b9976e 100644
--- a/webmin/mailboxes/config
+++ b/webmin/mailboxes/config
@@ -1,52 +1,52 @@
-sync_perms=0700
-spam_del=0
-spam_buttons=mail
-arrows=1
-mail_dir=Maildir
-view_html=0
-mail_system=3
-column_count=4
-mail_file=Mailbox
-show_size=1
-html_quote=0
-sync_delete=1
-open_mode=0
-show_delall=0
+link_mode=0
 auto=1
-show_to=0
-noindex_hostname=0
-no_orig_ip=0
-sync_create=0
-from_virtualmin=1
+mailbox_user=.usermin/mailbox
+sort_mode=1
+column_count=4
+top_buttons=2
 track_read=0
-sig_file=*
-show_size_below=0
+mail_style=0
 spam_report=
-maildir_deleted=0
+spam_del=0
+spam_buttons=mail
 show_unread=0
-show_sent=0
 show_count=0
+show_sent=0
+ignore_users_enabled=0
+open_mode=0
+sig_file=*
+view_html=0
+sync_delete=1
+wrap_width=80
 sync_modify=1
-top_buttons=2
-check_mod=1
+log_read=0
+sync_create=0
+mail_system=3
+arrows=1
 delete_warn=y
-no_mailer=0
-html_edit=0
-mail_style=0
-wrap_width=80
 no_crlf=0
-link_mode=0
-mail_usermin=mail
 size_mode=1
-mailbox_user=.usermin/mailbox
-log_read=0
-ignore_users=
-fwd_mode=0
-ignore_users_enabled=0
+noindex_hostname=0
+show_size_below=0
+mail_usermin=mail
+from_virtualmin=1
+mail_file=Mailbox
 perpage=20
-vpopmail_dir=/home/vpopmail
-sort_mode=1
-date_fmt=dmy
-max_records=200
+no_mailer=0
+fwd_mode=0
+html_edit=0
+ignore_users=
+mail_dir=Maildir
 show_mail=0
+sync_perms=0700
+vpopmail_dir=/home/vpopmail
+show_delall=0
 show_body=0
+html_quote=0
+max_records=200
+check_mod=1
+no_orig_ip=0
+show_size=1
+maildir_deleted=0
+date_fmt=dmy
+show_to=0
diff --git a/webmin/man/config b/webmin/man/config
index 5a134151b..8ac4a7114 100644
--- a/webmin/man/config
+++ b/webmin/man/config
@@ -1,9 +1,9 @@
 doc_dir=/usr/share/doc
-man_cmd_sect=man SECTION PAGE
+list_cmd_sect=man -w SECTION PAGE
 list_cmd=man -w PAGE
-kernel_dir=/usr/src/linux/Documentation
-search_cmd=man -k PAGE
+man2html_path=man2html
 man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
 man_cmd=man PAGE
-man2html_path=man2html
-list_cmd_sect=man -w SECTION PAGE
+kernel_dir=/usr/src/linux/Documentation
+search_cmd=man -k PAGE
+man_cmd_sect=man SECTION PAGE
diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index 3820610cb..c0e69b04a 100644
--- a/webmin/miniserv.conf
+++ b/webmin/miniserv.conf
@@ -1,6 +1,4 @@
 port=10000
-root=/usr/share/webmin
-mimetypes=/usr/share/webmin/mime.types
 addtype_cgi=internal/cgi
 realm=Webmin Server
 logfile=/var/webmin/miniserv.log
@@ -27,7 +25,6 @@ syslog=1
 ipv6=1
 session=1
 premodules=WebminCore
-server=MiniServ/1.890
 userfile=/etc/webmin/miniserv.users
 keyfile=/etc/webmin/miniserv.pem
 passwd_file=/etc/shadow
@@ -45,3 +42,6 @@ failed_script=/etc/webmin/failed.pl
 sudo=1
 nolog=.*xhr.*
 logouttimes=
+root=/usr/share/webmin
+mimetypes=/usr/share/webmin/mime.types
+server=MiniServ/1.900
diff --git a/webmin/mon/config b/webmin/mon/config
index c879670bd..6c435fc5f 100644
--- a/webmin/mon/config
+++ b/webmin/mon/config
@@ -1,7 +1,7 @@
-stop_cmd=/etc/init.d/mon stop
-restart_cmd=/etc/init.d/mon restart
 mon_cgi=/var/www/cgi-bin/mon.cgi
-start_cmd=/etc/init.d/mon start
 pid_file=/var/run/mon.pid
+stop_cmd=/etc/init.d/mon stop
 monshow=/usr/bin/monshow
+restart_cmd=/etc/init.d/mon restart
 cfbasedir=/etc/mon
+start_cmd=/etc/init.d/mon start
diff --git a/webmin/mount/config b/webmin/mount/config
index 1491dc821..479080635 100644
--- a/webmin/mount/config
+++ b/webmin/mount/config
@@ -1,8 +1,8 @@
+smbclient_path=smbclient
+nmblookup_path=nmblookup
 show_used=1
-auto_file=/etc/am-utils/amd.conf
-fstab_file=/etc/fstab
 nfs_check=1
-autofs_file=/etc/auto.master
-smbclient_path=smbclient
 long_fstypes=1
-nmblookup_path=nmblookup
+autofs_file=/etc/auto.master
+fstab_file=/etc/fstab
+auto_file=/etc/am-utils/amd.conf
diff --git a/webmin/mysql/config b/webmin/mysql/config
index d092366b4..8c4cbad56 100644
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -1,23 +1,23 @@
+webmin_subs=0
 login=root
-add_mode=1
-mysqladmin=/usr/bin/mysqladmin
-mysql_libs=/usr/local/mysql/lib
-mysqlimport=/usr/bin/mysqlimport
-my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
-access=*: *
-max_dbs=50
-mysql=/usr/bin/mysql
 date_subs=0
-max_text=1000
+add_mode=1
+nopwd=0
 blob_mode=0
 mysqldump=/usr/bin/mysqldump
-nodbi=0
-webmin_subs=0
-style=0
+access=*: *
+mysqladmin=/usr/bin/mysqladmin
 mysqlshow=/usr/bin/mysqlshow
 perpage=25
-mysql_data=/var/lib/mysql
+mysql=/usr/bin/mysql
 passwd_mode=0
-stop_cmd=service mysql stop
-nopwd=0
 start_cmd=service mysql start
+mysql_libs=/usr/local/mysql/lib
+mysql_data=/var/lib/mysql
+max_dbs=50
+stop_cmd=service mysql stop
+max_text=1000
+my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
+style=0
+mysqlimport=/usr/bin/mysqlimport
+nodbi=0
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 acb18891c..fb10df359 100644
--- a/webmin/nis/config
+++ b/webmin/nis/config
@@ -1,5 +1,5 @@
-manual_build=0
+max_size=100
 client_conf=/etc/yp.conf
 nsswitch_conf=/etc/nsswitch.conf
 securenets=/etc/ypserv.securenets
-max_size=100
+manual_build=0
diff --git a/webmin/openslp/config b/webmin/openslp/config
index 9a99391b3..ca257d6e5 100644
--- a/webmin/openslp/config
+++ b/webmin/openslp/config
@@ -1,5 +1,5 @@
-slpd_log=/var/log/slpd.log
-slpd_pid=/var/run/slpd.pid
+slpd_reg=/etc/slp.reg
 slpd=/usr/sbin/slpd
+slpd_log=/var/log/slpd.log
 slpd_conf=/etc/slp.conf
-slpd_reg=/etc/slp.reg
+slpd_pid=/var/run/slpd.pid
diff --git a/webmin/package-updates/config b/webmin/package-updates/config
index 226c127d1..195d872e7 100644
--- a/webmin/package-updates/config
+++ b/webmin/package-updates/config
@@ -1,2 +1,2 @@
-cache_time=6
 update_multiple=1
+cache_time=6
diff --git a/webmin/pam/config b/webmin/pam/config
index b3d9581d6..2d867ee25 100644
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
-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
+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
 ignore=README
diff --git a/webmin/pap/config b/webmin/pap/config
index b9e15bf3a..cbaaf2fab 100644
--- a/webmin/pap/config
+++ b/webmin/pap/config
@@ -1,8 +1,8 @@
-serials=/dev/ttyS[0-9]*
-pppd=pppd
-dialin_config=/etc/mgetty+sendfax/dialin.config
 encrypt_pass=0
-login_config=/etc/mgetty+sendfax/login.config
+dialin_config=/etc/mgetty+sendfax/dialin.config
 pap_file=/etc/ppp/pap-secrets
+serials=/dev/ttyS[0-9]*
 ppp_options=/etc/ppp/options
 mgetty=mgetty
+login_config=/etc/mgetty+sendfax/login.config
+pppd=pppd
diff --git a/webmin/passwd/config b/webmin/passwd/config
index 75e5ffcde..294c79b71 100644
--- a/webmin/passwd/config
+++ b/webmin/passwd/config
@@ -1,3 +1,3 @@
-input_type=0
 max_users=200
 sort_mode=0
+input_type=0
diff --git a/webmin/postfix/config b/webmin/postfix/config
index 8ffbb52fb..f4338685f 100644
--- a/webmin/postfix/config
+++ b/webmin/postfix/config
@@ -1,28 +1,28 @@
+postfix_super_command=/usr/sbin/postsuper
 postfix_lookup_table_command=/usr/sbin/postmap
-postfix_queue_command=postqueue
+postfix_control_command=/usr/sbin/postfix
+delete_confirm=1
+index_check=1
+mailq_sort=0
+ldap_doms=0
 perpage=20
 fwd_mode=0
 mailq_count=0
+postfix_config_file=/etc/postfix/main.cf
+delete_warn=1
+columns=2
 prefix_cmts=0
-postfix_aliases_table_command=/usr/sbin/postalias
-postfix_master=/etc/postfix/master.cf
+postfix_queue_command=postqueue
+top_buttons=1
+sort_mode=0
 postcat_cmd=/usr/sbin/postcat
-columns=2
-mailq_sort=0
-postfix_super_command=/usr/sbin/postsuper
+show_cmts=0
+postfix_master=/etc/postfix/master.cf
+mailq_cmd=postqueue -p
+wrap_width=80
 max_records=200
-postfix_control_command=/usr/sbin/postfix
-sort_mode=0
-postfix_config_file=/etc/postfix/main.cf
-index_check=1
-top_buttons=1
-postfix_newaliases_command=/usr/bin/newaliases
-delete_confirm=1
-delete_warn=1
+postfix_aliases_table_command=/usr/sbin/postalias
 mailq_dir=/var/spool/postfix
 postfix_config_command=/usr/sbin/postconf
-ldap_doms=0
-mailq_cmd=postqueue -p
-show_cmts=0
 check_config=1
-wrap_width=80
+postfix_newaliases_command=/usr/bin/newaliases
diff --git a/webmin/postgresql/config b/webmin/postgresql/config
index 09c32aa89..947472407 100644
--- a/webmin/postgresql/config
+++ b/webmin/postgresql/config
@@ -1,24 +1,24 @@
+simple_sched=0
+max_text=1000
+style=0
+sameunix=1
+max_dbs=50
 stop_cmd=/etc/init.d/postgresql* stop
 start_cmd=/etc/init.d/postgresql* start
-perpage=25
-style=0
-webmin_subs=0
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
+dump_cmd=/usr/bin/pg_dump
 access_own=0
-sameunix=1
-blob_mode=0
-max_text=1000
-nodbi=0
+pid_file=/var/run/postmaster.pid
 psql=/usr/bin/psql
-dump_cmd=/usr/bin/pg_dump
-basedb=template1
-access=*: *
-max_dbs=50
-pass=
 rstr_cmd=/usr/bin/pg_restore
-simple_sched=0
+nodbi=0
+blob_mode=0
 date_subs=0
-hba_conf=/etc/postgresql/*/main/pg_hba.conf
-login=postgres
 add_mode=1
-pid_file=/var/run/postmaster.pid
+pass=
+webmin_subs=0
+login=postgres
+basedb=template1
 plib=
+perpage=25
+access=*: *
diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config
index 7af13e89f..237c75238 100644
--- a/webmin/ppp-client/config
+++ b/webmin/ppp-client/config
@@ -1,3 +1,3 @@
-file=/etc/wvdial.conf
 wvdial=wvdial
 wvdialconf=wvdialconf
+file=/etc/wvdial.conf
diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config
index 93dc761e7..6525162d6 100644
--- a/webmin/pptp-client/config
+++ b/webmin/pptp-client/config
@@ -1,5 +1,5 @@
+pap_file=/etc/ppp/chap-secrets
 pptp=pptp
 timeout=30
-pap_file=/etc/ppp/chap-secrets
-peers_dir=/etc/ppp/peers
 pptp_options=/etc/ppp/options.pptp
+peers_dir=/etc/ppp/peers
diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config
index 7c650daac..fc7b5955a 100644
--- a/webmin/pptp-server/config
+++ b/webmin/pptp-server/config
@@ -1,9 +1,9 @@
-log_file=/var/log/messages
-pid_file=/var/run/pptpd.pid
 pptpd=pptpd
 pap_file=/etc/ppp/chap-secrets
+log_file=/var/log/messages
+stop_cmd=/etc/init.d/pptpd stop
 pptp_ppp_options=/etc/ppp/pptpd-options
+start_cmd=/etc/init.d/pptpd start
+pid_file=/var/run/pptpd.pid
 ppp_options=/etc/ppp/options
 file=/etc/pptpd.conf
-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 b75e31ff5..73cf7c430 100644
--- a/webmin/proc/config
+++ b/webmin/proc/config
@@ -1,6 +1,6 @@
-ps_style=linux
-default_mode=last
-hide_self=1
-cut_length=80
 trace_java=0
 base_ppid=1
+cut_length=80
+hide_self=1
+ps_style=linux
+default_mode=last
diff --git a/webmin/procmail/config b/webmin/procmail/config
index 5b184fd7c..9b36ccfbe 100644
--- a/webmin/procmail/config
+++ b/webmin/procmail/config
@@ -1,3 +1,3 @@
+procmail=procmail
 procmailrc=/etc/procmailrc
 includes=0
-procmail=procmail
diff --git a/webmin/proftpd/config b/webmin/proftpd/config
index 4a6561f74..b8ada1449 100644
--- a/webmin/proftpd/config
+++ b/webmin/proftpd/config
@@ -1,9 +1,9 @@
 start_cmd=/etc/init.d/proftpd start
-test_manual=0
-stop_cmd=/etc/init.d/proftpd stop
+test_config=1
 ftpusers=/etc/ftpusers
 proftpd_path=/usr/sbin/proftpd
-test_always=0
-test_config=1
-pid_file=/var/run/proftpd.pid
+test_manual=0
+stop_cmd=/etc/init.d/proftpd stop
 proftpd_conf=/etc/proftpd/proftpd.conf
+pid_file=/var/run/proftpd.pid
+test_always=0
diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config
index bdd816381..677a8748b 100644
--- a/webmin/qmailadmin/config
+++ b/webmin/qmailadmin/config
@@ -1,14 +1,14 @@
-columns=2
-mailq_sort=0
 mail_system=1
+mail_dir=
 max_records=200
-qmail_dir=/var/qmail
-sort_mode=0
+mailq_sort=0
 mail_file=Mailbox
-mailq_count=0
-mail_dir_qmail=Maildir
-mail_dir=
+fwd_mode=0
+perpage=20
+qmail_dir=/var/qmail
 index_min=1000000
+mailq_count=0
 delete_warn=1
-perpage=20
-fwd_mode=0
+mail_dir_qmail=Maildir
+columns=2
+sort_mode=0
diff --git a/webmin/quota/config b/webmin/quota/config
index bf6c96e5b..a91b5804f 100644
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
-group_grace_command=edquota -g -t
+user_quotaoff_command=quotaoff -u
+group_setquota_command=setquota -g
+show_grace=1
+group_quota_command=quota -v -g
 user_setquota_command=setquota -u
-hide_uids=0
-user_quota_command=quota -v -u
 pc_show=1
-sort_mode=0
+block_mode=1
+group_edquota_command=edquota -g
 user_quotaon_command=quotaon -u
-group_quota_command=quota -v -g
-quotacheck_command=quotacheck -u -g
 user_copy_command=edquota -u -p
-user_repquota_command=repquota -u -v
-group_edquota_command=edquota -g
-user_quotaoff_command=quotaoff -u
+quotacheck_command=quotacheck -u -g
+group_repquota_command=repquota -g -v
 user_grace_command=edquota -u -t
-block_mode=1
-group_setquota_command=setquota -g
-group_quotaon_command=quotaon -g
-group_copy_command=edquota -g -p
-display_max=100
-show_grace=1
+sort_mode=0
+user_repquota_command=repquota -u -v
 block_size=1024
+user_edquota_command=edquota -u
+display_max=100
+group_grace_command=edquota -g -t
+group_copy_command=edquota -g -p
+user_quota_command=quota -v -u
+hide_uids=0
+group_quotaon_command=quotaon -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}.
 group_quotaoff_command=quotaoff -g
-user_edquota_command=edquota -u
-group_repquota_command=repquota -g -v
diff --git a/webmin/raid/config b/webmin/raid/config
index 3314566d0..4bd2da90e 100644
--- a/webmin/raid/config
+++ b/webmin/raid/config
@@ -1,3 +1,3 @@
+mdstat=/proc/mdstat
 raidtab=/etc/raidtab
 mdadm=/etc/mdadm/mdadm.conf
-mdstat=/proc/mdstat
diff --git a/webmin/samba/config b/webmin/samba/config
index f73564739..41d821ebd 100644
--- a/webmin/samba/config
+++ b/webmin/samba/config
@@ -1,18 +1,18 @@
-swat=/usr/sbin/swat
-smbgroupedit=/usr/bin/smbgroupedit
-samba_password_program=/usr/bin/smbpasswd
-samba_status_program=/usr/bin/smbstatus
 dont_convert=-499
 restart_cmd=service smbd restart ; service nmbd restart
-name_server=/usr/sbin/nmbd
-smb_conf=/etc/samba/smb.conf
-sort_mode=0
-samba_server=/usr/sbin/smbd
+text_lists=0
+smbgroupedit=/usr/bin/smbgroupedit
+smb_passwd=/etc/samba/smbpasswd
+swat=/usr/sbin/swat
+net=/usr/bin/net
 run_from_inetd=0
+sort_mode=0
+samba_password_program=/usr/bin/smbpasswd
 pdbedit=/usr/bin/pdbedit
+name_server=/usr/sbin/nmbd
 start_cmd=service smbd start ; service nmbd start
-net=/usr/bin/net
-smb_passwd=/etc/samba/smbpasswd
+samba_server=/usr/sbin/smbd
 stop_cmd=service smbd stop ; service nmbd stop
+samba_status_program=/usr/bin/smbstatus
 list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
-text_lists=0
+smb_conf=/etc/samba/smb.conf
diff --git a/webmin/sarg/config b/webmin/sarg/config
index 75406f229..2afcf8310 100644
--- a/webmin/sarg/config
+++ b/webmin/sarg/config
@@ -1,4 +1,4 @@
+sarg_conf=/etc/sarg/sarg.conf
 naked=0
-clear=1
 sarg=sarg
-sarg_conf=/etc/sarg/sarg.conf
+clear=1
diff --git a/webmin/sendmail/config b/webmin/sendmail/config
index 68d2407e2..aea6fbd41 100644
--- a/webmin/sendmail/config
+++ b/webmin/sendmail/config
@@ -1,30 +1,30 @@
-prefix_cmts=0
-mailq_count=0
-smrsh_dir=/etc/smrsh
-show_to=0
-index_min=1000000
+mail_dir=/var/spool/mail
 sendmail_command=/usr/lib/sendmail -bd -q1h
-fwd_mode=0
-perpage=20
-mailq_sort=0
-columns=2
-sort_mode=0
-max_records=200
-track_read=0
-sendmail_mc=/etc/mail/sendmail.mc
+smrsh_dir=/etc/smrsh
+makemap_path=makemap
 order_mail=0
-mailq_show=Date,From,To,Size,Status
-sendmail_path=/usr/lib/sendmail
-mail_type=0
-top_buttons=1
-mail_dir=/var/spool/mail
 delete_confirm=1
-makemap_path=makemap
-delete_warn=1
 sendmail_cf=/etc/mail/sendmail.cf
-show_cmts=0
+mail_type=0
+mailq_sort=0
+mail_file=mbox
+perpage=20
+fwd_mode=0
+mailq_count=0
+index_min=1000000
+track_read=0
 mail_style=0
+delete_warn=1
+prefix_cmts=0
+columns=2
+sendmail_path=/usr/lib/sendmail
+top_buttons=1
+mailq_show=Date,From,To,Size,Status
+sort_mode=0
 sendmail_features=/usr/share/sendmail/cf
+sendmail_mc=/etc/mail/sendmail.mc
+show_cmts=0
+show_to=0
+max_records=200
 wrap_width=80
-mail_file=mbox
 sendmail_pid=/var/run/sendmail/mta/sendmail.pid
diff --git a/webmin/servers/config b/webmin/servers/config
index 4a96d8796..beb720898 100644
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
-show_ip=0
-resolve=1
 deflink=0
 show_status=1
-display_mode=0
+capath=/usr/share/ca-certificates
 scan_time=5
 deffast=2
-sort_mode=0
+display_mode=0
 groups_dir=/etc/cluster/groups
-capath=/usr/share/ca-certificates
+sort_mode=0
+show_ip=0
+resolve=1
 max_servers=100
diff --git a/webmin/shorewall/config b/webmin/shorewall/config
index 4483568a6..dec64fade 100644
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
-actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
-display_zone_descriptions=1
+shorewall=shorewall
 config_dir=/etc/shorewall
+display_zone_descriptions=1
+actions=/etc/shorewall/actions	/usr/share/shorewall/actions.std
 macros=/usr/share/shorewall
-shorewall=shorewall
diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config
index d0d859976..dfbbf3b01 100644
--- a/webmin/shorewall6/config
+++ b/webmin/shorewall6/config
@@ -1,5 +1,5 @@
-display_zone_descriptions=1
+macros=/usr/share/shorewall6
 actions=/etc/shorewall6/actions	/usr/share/shorewall6/actions.std
+display_zone_descriptions=1
 shorewall6=shorewall6
-macros=/usr/share/shorewall6
 config_dir=/etc/shorewall6
diff --git a/webmin/smart-status/config b/webmin/smart-status/config
index 2f395c4f9..1c8af5754 100644
--- a/webmin/smart-status/config
+++ b/webmin/smart-status/config
@@ -1,4 +1,4 @@
+attribs=1
 smartctl=smartctl
 mode=1
-attribs=1
 ata=0
diff --git a/webmin/software/config b/webmin/software/config
index 9476e6757..abefc9ae1 100644
--- a/webmin/software/config
+++ b/webmin/software/config
@@ -1,3 +1,3 @@
 apt_mode=0
-update_system=apt
 package_system=debian
+update_system=apt
diff --git a/webmin/spam/config b/webmin/spam/config
index d861a1900..4d5e529fa 100644
--- a/webmin/spam/config
+++ b/webmin/spam/config
@@ -1,12 +1,12 @@
+restart_cmd=/etc/init.d/spamassassin restart
+processes=spamd amavisd
+local_cf=/etc/spamassassin/local.cf
+max_awl=200
 procmail_cmd=*
+sa_learn=sa-learn
 call_spam=1
-procmailrc=/etc/procmailrc
-local_cf=/etc/spamassassin/local.cf
-mode=0
-processes=spamd amavisd
-addto=0
 spamassassin=spamassassin
-sa_learn=sa-learn
-restart_cmd=/etc/init.d/spamassassin restart
+procmailrc=/etc/procmailrc
 warn_procmail=1
-max_awl=200
+addto=0
+mode=0
diff --git a/webmin/squid/config b/webmin/squid/config
index 31ba1e3d4..2f77ad027 100644
--- a/webmin/squid/config
+++ b/webmin/squid/config
@@ -1,21 +1,21 @@
-sync_delete=0
-pid_file=/var/run/squid.pid
-squid_restart=service squid reload
-cal_max=50000
-restart_pos=0
-sort_conf=0
-cal_args=-aw
-squid_path=squid
+cache_dir=/var/spool/squid
+log_dir=/var/log/squid
 squid_conf=/etc/squid/squid.conf
-crypt_conf=0
-cal_all=1
-sync_modify=1
 squid_start=service squid start
-log_dir=/var/log/squid
 calamaris=calamaris
-squid_stop=service squid stop
 squidclient=squidclient
-sync_create=0
+sort_conf=0
+cal_max=50000
+squid_stop=service squid stop
 cal_fmt=w
+squid_restart=service squid reload
+pid_file=/var/run/squid.pid
+squid_path=squid
+sync_delete=0
+sync_create=0
+sync_modify=1
+cal_all=1
+cal_args=-aw
 cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
-cache_dir=/var/spool/squid
+restart_pos=0
+crypt_conf=0
diff --git a/webmin/sshd/config b/webmin/sshd/config
index 9c6656ead..7754ad93a 100644
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,11 +1,11 @@
-keygen_path=/usr/bin/ssh-keygen
-sync_create=0
+sync_gnupg=0
 sync_auth=1
+sshd_path=/usr/sbin/sshd
+pid_file=/var/run/sshd.pid
 sshd_config=/etc/ssh/sshd_config
 start_cmd=service ssh start
-stop_cmd=service ssh stop
-sync_gnupg=0
 sync_pass=0
-sshd_path=/usr/sbin/sshd
-pid_file=/var/run/sshd.pid
+keygen_path=/usr/bin/ssh-keygen
 client_config=/etc/ssh/ssh_config
+sync_create=0
+stop_cmd=service ssh stop
diff --git a/webmin/status/config b/webmin/status/config
index 3af4fb32a..431165c80 100644
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,13 +1,13 @@
-sched_offset=0
-pager_cmd=sms_client
-snmp_trap=1.3.6.1.4.1.10000.1.1
-columns=2
-sysinfo=0
 index_status=1
+sysinfo=0
+sched_offset=0
+output=0
 subject_mode=0
 snmp_version=2
-sort_mode=0
 sysinfo_users=0
-history_purge=30
 history_show=50
-output=0
+pager_cmd=sms_client
+history_purge=30
+columns=2
+snmp_trap=1.3.6.1.4.1.10000.1.1
+sort_mode=0
diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config
index 94dbf85e8..d86da046b 100644
--- a/webmin/syslog-ng/config
+++ b/webmin/syslog-ng/config
@@ -1,7 +1,7 @@
+syslogng_conf=/etc/syslog-ng/syslog-ng.conf
+pid_file=/var/run/syslog-ng.pid
 stop_cmd=/etc/init.d/syslog-ng stop
-compressed=1
-start_cmd=/etc/init.d/syslog-ng start
 syslogng_cmd=syslog-ng
-syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 lines=20
-pid_file=/var/run/syslog-ng.pid
+compressed=1
+start_cmd=/etc/init.d/syslog-ng start
diff --git a/webmin/syslog/config b/webmin/syslog/config
index 394136cab..1116c5278 100644
--- a/webmin/syslog/config
+++ b/webmin/syslog/config
@@ -1,19 +1,19 @@
 pid_file=/var/run/rsyslogd.pid
-pipe=1
-pri_dir=1
-socket=0
-pri_all=1
-syslogd=/usr/sbin/rsyslogd
-others=1
-sync=1
 reverse=0
 syslog_conf=/etc/rsyslog.conf
-lines=20
+syslogd=/usr/sbin/rsyslogd
 signal_cmd=/usr/sbin/service rsyslog restart
-m4_path=
-compressed=1
-restart_cmd=/usr/sbin/service rsyslog restart
-tags=0
 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
+tags=0
 m4_conf=0
+socket=0
 start_cmd=/usr/sbin/service rsyslog start
+m4_path=
+pri_all=1
+others=1
+sync=1
+pri_dir=1
+pipe=1
+restart_cmd=/usr/sbin/service rsyslog restart
+compressed=1
+lines=20
diff --git a/webmin/system-status/config b/webmin/system-status/config
index c627a9fec..b6a7e4155 100644
--- a/webmin/system-status/config
+++ b/webmin/system-status/config
@@ -1,2 +1,2 @@
-collect_pkgs=1
 collect_interval=5
+collect_pkgs=1
diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config
index ddc301405..9539a8514 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
+hosts_allow=/etc/hosts.allow
diff --git a/webmin/telnet/config b/webmin/telnet/config
index 812381881..c5cad7c93 100644
--- a/webmin/telnet/config
+++ b/webmin/telnet/config
@@ -1,5 +1,5 @@
 sizemode=0
-no_test=0
-proxy=0
 mode=1
+proxy=0
+no_test=0
 detach=0
diff --git a/webmin/time/config b/webmin/time/config
index 44f981974..3a6eb2d4c 100644
--- a/webmin/time/config
+++ b/webmin/time/config
@@ -1,5 +1,5 @@
 seconds=1
+lease=5
+zone_style=linux
 ntp_only=1
 timeserver_hardware=1
-zone_style=linux
-lease=5
diff --git a/webmin/updown/config b/webmin/updown/config
index aba856c09..1c7534ae3 100644
--- a/webmin/updown/config
+++ b/webmin/updown/config
@@ -1,4 +1,4 @@
-ddir=/
-duser=root
 dir=/
+duser=root
 user=root
+ddir=/
diff --git a/webmin/useradmin/config b/webmin/useradmin/config
index 048a9c908..412da5884 100644
--- a/webmin/useradmin/config
+++ b/webmin/useradmin/config
@@ -1,41 +1,41 @@
-extra_real=0
-default_other=1
-delete_root=0
-shells=fixed,passwd,shells
-random_password=0
+alias_check=0
+gid_calc=0
+default_group=users
+user_files=/etc/skel
 delete_only=0
-display_max=400
-homedir_perms=0755
+new_user_group=0
+random_password=0
+selinux_con=user_u:object_r:user_home_dir_t
+gid_mode=1
+uid_calc=0
+empty_mode=0
+delete_root=0
+base_gid=1000
+display_mode=1
 passwd_file=/etc/passwd
-skip_md5=0
+homedir_perms=0755
+display_max=400
+sort_mode=0
+email_type=0
+home_base=/home
+lock_string=*
+group_file=/etc/group
+md5=1
 last_show=0
-empty_mode=0
-membox=0
+shadow_file=/etc/shadow
+extra_real=0
 passwd_same=0
-lock_string=*
-from_files=0
-passwd_progmode=0
+base_uid=1000
+shells=fixed,passwd,shells
 new_user_gid=0
-selinux_con=user_u:object_r:user_home_dir_t
-shadow_file=/etc/shadow
-home_base=/home
+skip_md5=0
+uid_mode=1
 passwd_dict=0
-gshadow_file=/etc/gshadow
-new_user_group=0
 home_style=0
-gid_calc=0
-user_files=/etc/skel
-base_gid=1000
-group_file=/etc/group
-alias_check=0
-sort_mode=0
-base_uid=1000
-default_group=users
-email_type=0
-gid_mode=1
-passwd_stars=0
+passwd_progmode=0
+default_other=1
+gshadow_file=/etc/gshadow
+membox=0
 secmode=0
-md5=1
-uid_calc=0
-display_mode=1
-uid_mode=1
+passwd_stars=0
+from_files=0
diff --git a/webmin/usermin/config b/webmin/usermin/config
index 9da56ca6f..0a674a856 100644
--- a/webmin/usermin/config
+++ b/webmin/usermin/config
@@ -1,7 +1,7 @@
-upshow=1
-usermin_dir=/etc/usermin
 upmissing=0
-cron_mode=0
 updays=1
-update=0
+cron_mode=0
+usermin_dir=/etc/usermin
 uphour=4
+update=0
+upshow=1
diff --git a/webmin/version b/webmin/version
index a181eee04..3c69c6b5b 100644
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.890
+1.900
diff --git a/webmin/webalizer/config b/webmin/webalizer/config
index 389521078..119fa11ad 100644
--- a/webmin/webalizer/config
+++ b/webmin/webalizer/config
@@ -1,6 +1,6 @@
+skip_old=0
+webalizer=/usr/bin/webalizer
 webalizer_conf=/etc/webalizer/webalizer.conf
-alt_conf=/etc/webalizer/webalizer.conf.sample
-naked=0
 auto=apache,squid,proftpd,wuftpd
-webalizer=/usr/bin/webalizer
-skip_old=0
+naked=0
+alt_conf=/etc/webalizer/webalizer.conf.sample
diff --git a/webmin/webmin/config b/webmin/webmin/config
index f0838f566..dc949a4e1 100644
--- a/webmin/webmin/config
+++ b/webmin/webmin/config
@@ -1,11 +1,11 @@
 cron_mode=0
-osdn=1
+last_version_number=1.890
 updays=1
-upshow=1
-warn_days=7
-upmissing=0
 update=0
+osdn=1
+upmissing=0
+last_version_check=1542135688
 upmins=47
+warn_days=7
+upshow=1
 uphour=23
-last_version_number=1.890
-last_version_check=1542135688
diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config
index ca82c0f07..6e98c5a49 100644
--- a/webmin/wuftpd/config
+++ b/webmin/wuftpd/config
@@ -1,8 +1,8 @@
-pid_file=/var/run/ftpd.pids-all
-log_file=/var/log/xferlog
+ftpconversions=/etc/wu-ftpd/ftpconversions
 ftphosts=/etc/wu-ftpd/ftphosts
-ftpusers=/etc/wu-ftpd/ftpusers
 ftpaccess=/etc/wu-ftpd/ftpaccess
-ftpconversions=/etc/wu-ftpd/ftpconversions
-ftpgroups=/etc/wu-ftpd/ftpgroups
+pid_file=/var/run/ftpd.pids-all
 ftpd_path=/usr/sbin/wu-ftpd
+ftpusers=/etc/wu-ftpd/ftpusers
+ftpgroups=/etc/wu-ftpd/ftpgroups
+log_file=/var/log/xferlog
diff --git a/webmin/xinetd/config b/webmin/xinetd/config
index d9ee4fa81..6d03828dd 100644
--- a/webmin/xinetd/config
+++ b/webmin/xinetd/config
@@ -1,5 +1,5 @@
-xinetd_conf=/etc/xinetd.conf
 lookup_servs=1
+xinetd_conf=/etc/xinetd.conf
 start_cmd=/etc/init.d/xinetd start
-protocols_file=/etc/protocols
 pid_file=/var/run/xinetd.pid
+protocols_file=/etc/protocols