From 450f7b4eab8df097ffe09963ef80b42ced528181 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Fri, 16 Aug 2019 11:21:35 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -apache2 2.4.29-1ubuntu4.6 amd64 -apache2-bin 2.4.29-1ubuntu4.6 amd64 -apache2-data 2.4.29-1ubuntu4.6 all -apache2-utils 2.4.29-1ubuntu4.6 amd64 +apache2 2.4.29-1ubuntu4.8 amd64 +apache2-bin 2.4.29-1ubuntu4.8 amd64 +apache2-data 2.4.29-1ubuntu4.8 all +apache2-utils 2.4.29-1ubuntu4.8 amd64 -apt 1.6.10 amd64 +apt 1.6.11 amd64 -apt-transport-https 1.6.10 all -apt-utils 1.6.10 amd64 +apt-transport-https 1.6.11 all +apt-utils 1.6.11 amd64 -base-files 10.1ubuntu2.4 amd64 +base-files 10.1ubuntu2.6 amd64 -bash 4.4.18-2ubuntu1 amd64 +bash 4.4.18-2ubuntu1.2 amd64 -bind9 1:9.11.3+dfsg-1ubuntu1.7 amd64 -bind9-host 1:9.11.3+dfsg-1ubuntu1.7 amd64 -bind9utils 1:9.11.3+dfsg-1ubuntu1.7 amd64 -binutils 2.30-21ubuntu1~18.04 amd64 -binutils-common 2.30-21ubuntu1~18.04 amd64 -binutils-x86-64-linux-gnu 2.30-21ubuntu1~18.04 amd64 +bind9 1:9.11.3+dfsg-1ubuntu1.8 amd64 +bind9-host 1:9.11.3+dfsg-1ubuntu1.8 amd64 +bind9utils 1:9.11.3+dfsg-1ubuntu1.8 amd64 +binutils 2.30-21ubuntu1~18.04.2 amd64 +binutils-common 2.30-21ubuntu1~18.04.2 amd64 +binutils-x86-64-linux-gnu 2.30-21ubuntu1~18.04.2 amd64 -bzip2 1.0.6-8.1 amd64 +bzip2 1.0.6-8.1ubuntu0.2 amd64 -console-setup 1.178ubuntu2.8 all -console-setup-linux 1.178ubuntu2.8 all +console-setup 1.178ubuntu2.9 all +console-setup-linux 1.178ubuntu2.9 all -cpp 4:7.3.0-3ubuntu2.1 amd64 -cpp-7 7.3.0-27ubuntu1~18.04 amd64 +cpp 4:7.4.0-1ubuntu2.3 amd64 +cpp-7 7.4.0-1ubuntu1~18.04.1 amd64 -curl 7.58.0-2ubuntu3.6 amd64 +curl 7.58.0-2ubuntu3.7 amd64 -dbus 1.12.2-1ubuntu1 amd64 -debconf 1.5.66 all -debconf-i18n 1.5.66 all +dbus 1.12.2-1ubuntu1.1 amd64 +debconf 1.5.66ubuntu1 all +debconf-i18n 1.5.66ubuntu1 all -distro-info-data 0.37ubuntu0.4 all +distro-info-data 0.37ubuntu0.5 all -dmsetup 2:1.02.145-4.1ubuntu3 amd64 +dmsetup 2:1.02.145-4.1ubuntu3.18.04.1 amd64 -dnsutils 1:9.11.3+dfsg-1ubuntu1.7 amd64 +dnsutils 1:9.11.3+dfsg-1ubuntu1.8 amd64 -friendly-recovery 0.2.38ubuntu1 all +friendly-recovery 0.2.38ubuntu1.1 all -gcc 4:7.3.0-3ubuntu2.1 amd64 -gcc-7 7.3.0-27ubuntu1~18.04 amd64 -gcc-7-base 7.3.0-27ubuntu1~18.04 amd64 -gcc-8-base 8.2.0-1ubuntu2~18.04 amd64 +gcc 4:7.4.0-1ubuntu2.3 amd64 +gcc-7 7.4.0-1ubuntu1~18.04.1 amd64 +gcc-7-base 7.4.0-1ubuntu1~18.04.1 amd64 +gcc-8-base 8.3.0-6ubuntu1~18.04.1 amd64 -initramfs-tools 0.130ubuntu3.7 all -initramfs-tools-bin 0.130ubuntu3.7 amd64 -initramfs-tools-core 0.130ubuntu3.7 all +initramfs-tools 0.130ubuntu3.8 all +initramfs-tools-bin 0.130ubuntu3.8 amd64 +initramfs-tools-core 0.130ubuntu3.8 all -intel-microcode 3.20180807a.0ubuntu0.18.04.1 amd64 +intel-microcode 3.20190618.0ubuntu0.18.04.1 amd64 -iputils-ping 3:20161105-1ubuntu2 amd64 -iputils-tracepath 3:20161105-1ubuntu2 amd64 +iputils-ping 3:20161105-1ubuntu3 amd64 +iputils-tracepath 3:20161105-1ubuntu3 amd64 -isc-dhcp-client 4.3.5-3ubuntu7 amd64 -isc-dhcp-common 4.3.5-3ubuntu7 amd64 +isc-dhcp-client 4.3.5-3ubuntu7.1 amd64 +isc-dhcp-common 4.3.5-3ubuntu7.1 amd64 -keyboard-configuration 1.178ubuntu2.8 all +keyboard-configuration 1.178ubuntu2.9 all -knockd 0.7-1ubuntu1.18.04.1 amd64 +knockd 0.7-1ubuntu1.18.04.2 amd64 -language-pack-en 1:18.04+20180712 all +language-pack-en 1:18.04+20190718 all -language-pack-gnome-en 1:18.04+20180712 all +language-pack-gnome-en 1:18.04+20190718 all -language-selector-common 0.188.2 all +language-selector-common 0.188.3 all -libapache2-mod-php7.2 7.2.17-0ubuntu0.18.04.1 amd64 +libapache2-mod-php7.2 7.2.19-0ubuntu0.18.04.2 amd64 -libapt-inst2.0 1.6.10 amd64 +libapt-inst2.0 1.6.11 amd64 -libapt-pkg5.0 1.6.10 amd64 +libapt-pkg5.0 1.6.11 amd64 -libasan4 7.3.0-27ubuntu1~18.04 amd64 +libasan4 7.4.0-1ubuntu1~18.04.1 amd64 -libatomic1 8.2.0-1ubuntu2~18.04 amd64 +libatomic1 8.3.0-6ubuntu1~18.04.1 amd64 -libbind9-160 1:9.11.3+dfsg-1ubuntu1.7 amd64 -libbinutils 2.30-21ubuntu1~18.04 amd64 +libbind9-160 1:9.11.3+dfsg-1ubuntu1.8 amd64 +libbinutils 2.30-21ubuntu1~18.04.2 amd64 -libbz2-1.0 1.0.6-8.1 amd64 +libbz2-1.0 1.0.6-8.1ubuntu0.2 amd64 -libcc1-0 8.2.0-1ubuntu2~18.04 amd64 +libcc1-0 8.3.0-6ubuntu1~18.04.1 amd64 -libcilkrts5 7.3.0-27ubuntu1~18.04 amd64 +libcilkrts5 7.4.0-1ubuntu1~18.04.1 amd64 -libcups2 2.2.7-1ubuntu2.4 amd64 -libcurl3-gnutls 7.58.0-2ubuntu3.6 amd64 -libcurl4 7.58.0-2ubuntu3.6 amd64 -libdb5.3 5.3.28-13.1ubuntu1 amd64 +libcups2 2.2.7-1ubuntu2.6 amd64 +libcurl3-gnutls 7.58.0-2ubuntu3.7 amd64 +libcurl4 7.58.0-2ubuntu3.7 amd64 +libdb5.3 5.3.28-13.1ubuntu1.1 amd64 -libdbus-1-3 1.12.2-1ubuntu1 amd64 +libdbus-1-3 1.12.2-1ubuntu1.1 amd64 -libdevmapper1.02.1 2:1.02.145-4.1ubuntu3 amd64 +libdevmapper1.02.1 2:1.02.145-4.1ubuntu3.18.04.1 amd64 -libdns-export1100 1:9.11.3+dfsg-1ubuntu1.7 amd64 -libdns1100 1:9.11.3+dfsg-1ubuntu1.7 amd64 -libdrm-amdgpu1 2.4.95-1~18.04.1 amd64 -libdrm-common 2.4.95-1~18.04.1 all -libdrm-intel1 2.4.95-1~18.04.1 amd64 -libdrm-nouveau2 2.4.95-1~18.04.1 amd64 -libdrm-radeon1 2.4.95-1~18.04.1 amd64 -libdrm2 2.4.95-1~18.04.1 amd64 +libdns-export1100 1:9.11.3+dfsg-1ubuntu1.8 amd64 +libdns1100 1:9.11.3+dfsg-1ubuntu1.8 amd64 +libdrm-amdgpu1 2.4.97-1ubuntu1~18.04.1 amd64 +libdrm-common 2.4.97-1ubuntu1~18.04.1 all +libdrm-intel1 2.4.97-1ubuntu1~18.04.1 amd64 +libdrm-nouveau2 2.4.97-1ubuntu1~18.04.1 amd64 +libdrm-radeon1 2.4.97-1ubuntu1~18.04.1 amd64 +libdrm2 2.4.97-1ubuntu1~18.04.1 amd64 -libelf1 0.170-0.4 amd64 +libelf1 0.170-0.4ubuntu0.1 amd64 -libexpat1 2.2.5-3 amd64 +libexpat1 2.2.5-3ubuntu0.1 amd64 -libgcc-7-dev 7.3.0-27ubuntu1~18.04 amd64 -libgcc1 1:8.2.0-1ubuntu2~18.04 amd64 +libgcc-7-dev 7.4.0-1ubuntu1~18.04.1 amd64 +libgcc1 1:8.3.0-6ubuntu1~18.04.1 amd64 -libgl1 1.0.0-2ubuntu2.2 amd64 +libgl1 1.0.0-2ubuntu2.3 amd64 -libgl1-mesa-glx 18.2.8-0ubuntu0~18.04.2 amd64 -libglapi-mesa 18.2.8-0ubuntu0~18.04.2 amd64 -libglib2.0-0 2.56.3-0ubuntu0.18.04.1 amd64 -libglib2.0-data 2.56.3-0ubuntu0.18.04.1 all -libglvnd0 1.0.0-2ubuntu2.2 amd64 -libglx-mesa0 18.2.8-0ubuntu0~18.04.2 amd64 -libglx0 1.0.0-2ubuntu2.2 amd64 +libgl1-mesa-glx 19.0.8-0ubuntu0~18.04.1 amd64 +libglapi-mesa 19.0.8-0ubuntu0~18.04.1 amd64 +libglib2.0-0 2.56.4-0ubuntu0.18.04.4 amd64 +libglib2.0-data 2.56.4-0ubuntu0.18.04.4 all +libglvnd0 1.0.0-2ubuntu2.3 amd64 +libglx-mesa0 19.0.8-0ubuntu0~18.04.1 amd64 +libglx0 1.0.0-2ubuntu2.3 amd64 -libgnutls30 3.5.18-1ubuntu1 amd64 -libgomp1 8.2.0-1ubuntu2~18.04 amd64 +libgnutls30 3.5.18-1ubuntu1.1 amd64 +libgomp1 8.3.0-6ubuntu1~18.04.1 amd64 -libio-socket-ssl-perl 2.056-1 all +libio-socket-ssl-perl 2.060-3~ubuntu18.04.1 all -libirs160 1:9.11.3+dfsg-1ubuntu1.7 amd64 -libisc-export169 1:9.11.3+dfsg-1ubuntu1.7 amd64 -libisc169 1:9.11.3+dfsg-1ubuntu1.7 amd64 -libisccc160 1:9.11.3+dfsg-1ubuntu1.7 amd64 -libisccfg160 1:9.11.3+dfsg-1ubuntu1.7 amd64 +libirs160 1:9.11.3+dfsg-1ubuntu1.8 amd64 +libisc-export169 1:9.11.3+dfsg-1ubuntu1.8 amd64 +libisc169 1:9.11.3+dfsg-1ubuntu1.8 amd64 +libisccc160 1:9.11.3+dfsg-1ubuntu1.8 amd64 +libisccfg160 1:9.11.3+dfsg-1ubuntu1.8 amd64 -libitm1 8.2.0-1ubuntu2~18.04 amd64 +libitm1 8.3.0-6ubuntu1~18.04.1 amd64 -libldap-2.4-2 2.4.45+dfsg-1ubuntu1.1 amd64 -libldap-common 2.4.45+dfsg-1ubuntu1.1 all +libldap-2.4-2 2.4.45+dfsg-1ubuntu1.3 amd64 +libldap-common 2.4.45+dfsg-1ubuntu1.3 all -liblsan0 8.2.0-1ubuntu2~18.04 amd64 +liblsan0 8.3.0-6ubuntu1~18.04.1 amd64 -liblwres160 1:9.11.3+dfsg-1ubuntu1.7 amd64 +liblwres160 1:9.11.3+dfsg-1ubuntu1.8 amd64 -libmpx2 8.2.0-1ubuntu2~18.04 amd64 -libmysqlclient20 5.7.25-0ubuntu0.18.04.2 amd64 +libmpx2 8.3.0-6ubuntu1~18.04.1 amd64 +libmysqlclient20 5.7.27-0ubuntu0.18.04.1 amd64 -libnet-ssleay-perl 1.84-1build1 amd64 +libnet-ssleay-perl 1.84-1ubuntu0.1 amd64 -libnss-systemd 237-3ubuntu10.21 amd64 +libnss-systemd 237-3ubuntu10.25 amd64 -libpam-systemd 237-3ubuntu10.21 amd64 +libpam-systemd 237-3ubuntu10.25 amd64 -libpng16-16 1.6.34-1ubuntu0.18.04.1 amd64 +libpng16-16 1.6.34-1ubuntu0.18.04.2 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 +libpython2.7 2.7.15-4ubuntu4~18.04 amd64 +libpython2.7-minimal 2.7.15-4ubuntu4~18.04 amd64 +libpython2.7-stdlib 2.7.15-4ubuntu4~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 -libquadmath0 8.2.0-1ubuntu2~18.04 amd64 +libpython3.6 3.6.8-1~18.04.1 amd64 +libpython3.6-minimal 3.6.8-1~18.04.1 amd64 +libpython3.6-stdlib 3.6.8-1~18.04.1 amd64 +libquadmath0 8.3.0-6ubuntu1~18.04.1 amd64 -libseccomp2 2.3.1-2.1ubuntu4.1 amd64 +libseccomp2 2.4.1-0ubuntu0.18.04.2 amd64 -libsqlite3-0 3.22.0-1 amd64 +libsqlite3-0 3.22.0-1ubuntu0.1 amd64 -libssl1.1 1.1.0g-2ubuntu4.3 amd64 -libstdc++6 8.2.0-1ubuntu2~18.04 amd64 +libssl1.1 1.1.1-1ubuntu2.1~18.04.4 amd64 +libstdc++6 8.3.0-6ubuntu1~18.04.1 amd64 -libsystemd0 237-3ubuntu10.21 amd64 +libsystemd0 237-3ubuntu10.25 amd64 -libtsan0 8.2.0-1ubuntu2~18.04 amd64 -libubsan0 7.3.0-27ubuntu1~18.04 amd64 -libudev1 237-3ubuntu10.21 amd64 +libtsan0 8.3.0-6ubuntu1~18.04.1 amd64 +libubsan0 7.4.0-1ubuntu1~18.04.1 amd64 +libudev1 237-3ubuntu10.25 amd64 -linux-firmware 1.173.5 all +linux-firmware 1.173.9 all -linux-libc-dev 4.15.0-48.51 amd64 +linux-libc-dev 4.15.0-58.64 amd64 -mysql-client-5.7 5.7.25-0ubuntu0.18.04.2 amd64 -mysql-client-core-5.7 5.7.25-0ubuntu0.18.04.2 amd64 +mysql-client-5.7 5.7.27-0ubuntu0.18.04.1 amd64 +mysql-client-core-5.7 5.7.27-0ubuntu0.18.04.1 amd64 -mysql-server 5.7.25-0ubuntu0.18.04.2 all -mysql-server-5.7 5.7.25-0ubuntu0.18.04.2 amd64 -mysql-server-core-5.7 5.7.25-0ubuntu0.18.04.2 amd64 +mysql-server 5.7.27-0ubuntu0.18.04.1 all +mysql-server-5.7 5.7.27-0ubuntu0.18.04.1 amd64 +mysql-server-core-5.7 5.7.27-0ubuntu0.18.04.1 amd64 -nplan 0.40.1~18.04.4 all +nplan 0.97-0ubuntu1~18.04.1 all -openssl 1.1.0g-2ubuntu4.3 amd64 +openssl 1.1.1-1ubuntu2.1~18.04.4 amd64 -patch 2.7.6-2ubuntu1 amd64 +patch 2.7.6-2ubuntu1.1 amd64 -php7.2 7.2.17-0ubuntu0.18.04.1 all -php7.2-bz2 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-cli 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-common 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-curl 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-gd 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-intl 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-json 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-mbstring 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-mysql 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-opcache 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-readline 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-xml 7.2.17-0ubuntu0.18.04.1 amd64 -php7.2-zip 7.2.17-0ubuntu0.18.04.1 amd64 +php7.2 7.2.19-0ubuntu0.18.04.2 all +php7.2-bz2 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-cli 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-common 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-curl 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-gd 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-intl 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-json 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-mbstring 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-mysql 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-opcache 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-readline 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-xml 7.2.19-0ubuntu0.18.04.2 amd64 +php7.2-zip 7.2.19-0ubuntu0.18.04.2 amd64 -python-apt-common 1.6.3ubuntu1 all +python-apt-common 1.6.4 all -python2.7 2.7.15~rc1-1ubuntu0.1 amd64 -python2.7-minimal 2.7.15~rc1-1ubuntu0.1 amd64 +python2.7 2.7.15-4ubuntu4~18.04 amd64 +python2.7-minimal 2.7.15-4ubuntu4~18.04 amd64 -python3-apt 1.6.3ubuntu1 amd64 +python3-apt 1.6.4 amd64 -python3-cryptography 2.1.4-1ubuntu1.2 amd64 +python3-cryptography 2.1.4-1ubuntu1.3 amd64 -python3-distupgrade 1:18.04.31 all +python3-distupgrade 1:18.04.34 all -python3-gdbm 3.6.7-1~18.04 amd64 +python3-gdbm 3.6.8-1~18.04 amd64 -python3-lib2to3 3.6.7-1~18.04 all +python3-lib2to3 3.6.8-1~18.04 all -python3-urllib3 1.22-1 all +python3-urllib3 1.22-1ubuntu0.18.04.1 all -python3.6 3.6.7-1~18.04 amd64 -python3.6-minimal 3.6.7-1~18.04 amd64 +python3.6 3.6.8-1~18.04.1 amd64 +python3.6-minimal 3.6.8-1~18.04.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 +redis 5:4.0.9-1ubuntu0.2 all +redis-server 5:4.0.9-1ubuntu0.2 amd64 +redis-tools 5:4.0.9-1ubuntu0.2 amd64 -systemd 237-3ubuntu10.21 amd64 -systemd-sysv 237-3ubuntu10.21 amd64 +systemd 237-3ubuntu10.25 amd64 +systemd-sysv 237-3ubuntu10.25 amd64 -tzdata 2019a-0ubuntu0.18.04 all +tzdata 2019b-0ubuntu0.18.04 all -ubuntu-minimal 1.417.1 amd64 -ubuntu-release-upgrader-core 1:18.04.31 all -ubuntu-standard 1.417.1 amd64 +ubuntu-minimal 1.417.3 amd64 +ubuntu-release-upgrader-core 1:18.04.34 all +ubuntu-standard 1.417.3 amd64 -udev 237-3ubuntu10.21 amd64 +udev 237-3ubuntu10.25 amd64 -vim 2:8.0.1453-1ubuntu1 amd64 -vim-common 2:8.0.1453-1ubuntu1 all -vim-runtime 2:8.0.1453-1ubuntu1 all -vim-tiny 2:8.0.1453-1ubuntu1 amd64 +vim 2:8.0.1453-1ubuntu1.1 amd64 +vim-common 2:8.0.1453-1ubuntu1.1 all +vim-runtime 2:8.0.1453-1ubuntu1.1 all +vim-tiny 2:8.0.1453-1ubuntu1.1 amd64 -webmin 1.900 all +webmin 1.920 all -xxd 2:8.0.1453-1ubuntu1 amd64 +xxd 2:8.0.1453-1ubuntu1.1 amd64 --- .etckeeper | 2 +- apt/apt.conf.d/01autoremove | 5 ++ console-setup/cached_setup_keyboard.sh | 2 +- .../64-language-selector-prefer.conf | 2 + .../69-language-selector-zh-hk.conf | 4 +- issue | 2 +- issue.net | 2 +- lsb-release | 2 +- php/7.2/cli/php.ini | 2 +- ssl/openssl.cnf | 6 ++ webmin/acl/config | 4 +- webmin/adsl-client/config | 8 +- webmin/ajaxterm/config | 2 +- webmin/apache/config | 36 ++++----- webmin/apache/httpd-info | 2 +- webmin/apache/site | 4 - webmin/bacula-backup/config | 12 +-- webmin/bind8/config | 70 ++++++++-------- webmin/burner/config | 4 +- webmin/cluster-passwd/config | 2 +- webmin/cluster-software/config | 2 +- webmin/cluster-useradmin/config | 8 +- webmin/config | 44 +++++----- webmin/cpan/config | 6 +- webmin/cron/config | 31 +++---- webmin/custom/config | 4 +- webmin/dhcpd/config | 22 ++--- webmin/dovecot/config | 4 +- webmin/exim/config | 10 +-- webmin/exports/config | 4 +- webmin/fail2ban/config | 4 +- webmin/fetchmail/config | 4 +- webmin/filter/config | 6 +- webmin/firewall/config | 6 +- webmin/firewall6/config | 6 +- webmin/firewalld/config | 2 +- webmin/fsdump/config | 6 +- webmin/grub/config | 2 +- webmin/heartbeat/config | 20 ++--- webmin/htaccess-htpasswd/config | 6 +- webmin/idmapd/config | 2 +- webmin/inetd/config | 20 ++--- webmin/init/config | 24 +++--- webmin/ipfilter/config | 4 +- webmin/ipfw/config | 8 +- webmin/ipsec/config | 8 +- webmin/iscsi-client/config | 6 +- webmin/iscsi-server/config | 6 +- webmin/iscsi-target/config | 8 +- webmin/iscsi-tgtd/config | 6 +- webmin/jabber/config | 6 +- webmin/ldap-client/config | 2 +- webmin/ldap-server/config | 12 +-- webmin/ldap-useradmin/config | 30 +++---- webmin/logrotate/config | 4 +- webmin/lpadmin/config | 20 ++--- webmin/mailboxes/config | 80 +++++++++---------- webmin/man/config | 8 +- webmin/miniserv.conf | 2 +- webmin/mon/config | 8 +- webmin/mount/config | 8 +- webmin/mysql/config | 26 +++--- webmin/mysql/version | 1 + webmin/net/config | 2 +- webmin/nis/config | 4 +- webmin/openslp/config | 2 +- webmin/package-updates/config | 2 +- webmin/pam/config | 2 +- webmin/pap/config | 8 +- webmin/passwd/config | 2 +- webmin/postfix/config | 34 ++++---- webmin/postgresql/config | 36 ++++----- webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 8 +- webmin/proc/config | 4 +- webmin/procmail/config | 4 +- webmin/proftpd/config | 8 +- webmin/qmailadmin/config | 16 ++-- webmin/quota/config | 38 ++++----- webmin/raid/config | 4 +- webmin/samba/config | 20 ++--- webmin/sarg/config | 2 +- webmin/sendmail/config | 48 +++++------ webmin/servers/config | 10 +-- webmin/shell/config | 2 +- webmin/shorewall/config | 4 +- webmin/shorewall6/config | 2 +- webmin/smart-status/config | 4 +- webmin/software/config | 4 +- webmin/spam/config | 12 +-- webmin/squid/config | 30 +++---- webmin/sshd/config | 14 ++-- webmin/status/config | 18 ++--- webmin/syslog-ng/config | 8 +- webmin/syslog/config | 22 ++--- webmin/telnet/config | 4 +- webmin/time/config | 4 +- webmin/updown/config | 2 +- webmin/useradmin/config | 60 +++++++------- webmin/usermin/config | 6 +- webmin/version | 2 +- webmin/webalizer/config | 8 +- webmin/webmin/config | 16 ++-- webmin/wuftpd/config | 8 +- webmin/xinetd/config | 4 +- 106 files changed, 587 insertions(+), 576 deletions(-) delete mode 100644 webmin/apache/site create mode 100644 webmin/mysql/version diff --git a/.etckeeper b/.etckeeper index 059f88555..c2a087824 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3007,7 +3007,6 @@ 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 chmod 0644 'webmin/apache/site' maybe chgrp 'bin' 'webmin/at' maybe chmod 0711 'webmin/at' maybe chgrp 'bin' 'webmin/at/config' @@ -3267,6 +3266,7 @@ maybe chgrp 'bin' 'webmin/mysql' maybe chmod 0711 'webmin/mysql' maybe chgrp 'bin' 'webmin/mysql/config' maybe chmod 0600 'webmin/mysql/config' +maybe chmod 0644 'webmin/mysql/version' maybe chgrp 'bin' 'webmin/net' maybe chmod 0711 'webmin/net' maybe chgrp 'bin' 'webmin/net/config' diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove index f7775b183..f9d9e85d4 100644 --- a/apt/apt.conf.d/01autoremove +++ b/apt/apt.conf.d/01autoremove @@ -17,6 +17,7 @@ APT "linux-modules"; "linux-modules-extra"; "linux-signed-image"; + "linux-image-unsigned"; # kfreebsd kernels "kfreebsd-image"; "kfreebsd-headers"; @@ -30,6 +31,10 @@ APT # tools "linux-tools"; "linux-cloud-tools"; + # build info + "linux-buildinfo"; + # source code + "linux-source"; }; Never-MarkAuto-Sections diff --git a/console-setup/cached_setup_keyboard.sh b/console-setup/cached_setup_keyboard.sh index e740e959d..6b2a327b3 100755 --- a/console-setup/cached_setup_keyboard.sh +++ b/console-setup/cached_setup_keyboard.sh @@ -10,4 +10,4 @@ kbd_mode '-u' < '/dev/tty3' kbd_mode '-u' < '/dev/tty4' kbd_mode '-u' < '/dev/tty5' kbd_mode '-u' < '/dev/tty6' -loadkeys '/run/tmpkbd.TqMNs8' > '/dev/null' +loadkeys '/run/tmpkbd.IpwUxQ' > '/dev/null' diff --git a/fonts/conf.avail/64-language-selector-prefer.conf b/fonts/conf.avail/64-language-selector-prefer.conf index cdcc11e6b..8cf9d25ce 100644 --- a/fonts/conf.avail/64-language-selector-prefer.conf +++ b/fonts/conf.avail/64-language-selector-prefer.conf @@ -8,6 +8,7 @@ Noto Sans CJK KR Noto Sans CJK SC Noto Sans CJK TC + Noto Sans CJK HK @@ -26,6 +27,7 @@ Noto Sans Mono CJK KR Noto Sans Mono CJK SC Noto Sans Mono CJK TC + Noto Sans Mono CJK HK diff --git a/fonts/conf.avail/69-language-selector-zh-hk.conf b/fonts/conf.avail/69-language-selector-zh-hk.conf index ee23e6d3e..cc277be58 100644 --- a/fonts/conf.avail/69-language-selector-zh-hk.conf +++ b/fonts/conf.avail/69-language-selector-zh-hk.conf @@ -27,7 +27,7 @@ zh-hk - Noto Sans CJK TC + Noto Sans CJK HK AR PL UMing HK AR PL New Sung HYSong @@ -44,7 +44,7 @@ DejaVu Sans Mono - Noto Sans Mono CJK TC + Noto Sans Mono CJK HK AR PL UMing HK AR PL New Sung HYSong diff --git a/issue b/issue index 78deed636..5c068353e 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Ubuntu 18.04.2 LTS \n \l +Ubuntu 18.04.3 LTS \n \l diff --git a/issue.net b/issue.net index 71dc0c0f6..28d9296c2 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Ubuntu 18.04.2 LTS +Ubuntu 18.04.3 LTS diff --git a/lsb-release b/lsb-release index 2cb44ac6a..fec85e423 100644 --- a/lsb-release +++ b/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=Ubuntu DISTRIB_RELEASE=18.04 DISTRIB_CODENAME=bionic -DISTRIB_DESCRIPTION="Ubuntu 18.04.2 LTS" +DISTRIB_DESCRIPTION="Ubuntu 18.04.3 LTS" diff --git a/php/7.2/cli/php.ini b/php/7.2/cli/php.ini index 737b619e2..b1dbc94a2 100644 --- a/php/7.2/cli/php.ini +++ b/php/7.2/cli/php.ini @@ -1004,7 +1004,7 @@ cli_server.color = On ; the sqlite_dbpage virtual table. ; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html ; (for older SQLite versions, this flag has no use) -sqlite3.defensive = 1 +;sqlite3.defensive = 1 [Pcre] ;PCRE library backtracking limit. diff --git a/ssl/openssl.cnf b/ssl/openssl.cnf index b3e7444e5..7d1a8bb6e 100644 --- a/ssl/openssl.cnf +++ b/ssl/openssl.cnf @@ -3,6 +3,10 @@ # This is mostly being used for generation of certificate requests. # +# Note that you can include other files from the main configuration +# file using the .include directive. +#.include filename + # This definition stops the following lines choking if HOME isn't # defined. HOME = . @@ -344,3 +348,5 @@ tsa_name = yes # Must the TSA name be included in the reply? # (optional, default: no) ess_cert_id_chain = no # Must the ESS cert id chain be included? # (optional, default: no) +ess_cert_id_alg = sha1 # algorithm to compute certificate + # identifier (optional, default: sha1) diff --git a/webmin/acl/config b/webmin/acl/config index ad7d02089..e5e83c2ab 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ -ssleay=/usr/bin/openssl -display=1 order=0 +display=1 +ssleay=/usr/bin/openssl diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index 230331ded..90d5445b4 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -stop_cmd=adsl-stop -pap_file=/etc/ppp/pap-secrets -pppoe_conf=/etc/ppp/pppoe.conf start_cmd=adsl-start +conf_style=0 pppoe_cmd=pppoe +stop_cmd=adsl-stop status_cmd=adsl-status -conf_style=0 +pap_file=/etc/ppp/pap-secrets +pppoe_conf=/etc/ppp/pppoe.conf diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config index 003ebb11c..a31edabcb 100644 --- a/webmin/ajaxterm/config +++ b/webmin/ajaxterm/config @@ -1,2 +1,2 @@ -timeout=120 autologin=0 +timeout=120 diff --git a/webmin/apache/config b/webmin/apache/config index 78c0c18ce..3a4137132 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -show_list=0 -allow_virtualmin=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 +virt_file=/etc/apache2/sites-available defines_name=APACHE_ARGUMENTS -test_config=1 -defines_file=/etc/apache2/envvars -apply_cmd=/usr/sbin/apache2ctl graceful -test_manual=0 +show_order=0 +max_servers=100 stop_cmd=/etc/init.d/apache2 stop -mime_types=/etc/apache2/mime.types -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_manual=0 test_always=0 +start_cmd=/etc/init.d/apache2 start +allow_virtualmin=0 +access_conf=/etc/apache2/access.conf +httpd_conf=/etc/apache2/apache2.conf test_apachectl=1 +auto_mods=1 +apply_cmd=/usr/sbin/apache2ctl graceful +httpd_dir=/etc/apache2 +apachectl_path=/usr/sbin/apache2ctl +defines_file=/etc/apache2/envvars +link_dir=/etc/apache2/sites-enabled +srm_conf=/etc/apache2/srm.conf +mime_types=/etc/apache2/mime.types +show_list=0 +test_config=1 diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index c3a18f6e6..632666a23 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,4 +1,4 @@ -time=1539197965 +time=1563300885 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/apache/site b/webmin/apache/site deleted file mode 100644 index df5e1a457..000000000 --- a/webmin/apache/site +++ /dev/null @@ -1,4 +0,0 @@ -path=/usr/sbin/apache2 -modules=core/2.429 mod_log_config/2.429 mod_alias/2.429 mod_auth_basic/2.429 mod_authn_file/2.429 mod_authz_host/2.429 mod_autoindex/2.429 mod_dir/2.429 mod_env/2.429 mod_mime/2.429 mod_mpm_prefork/2.429 mod_negotiation/2.429 mod_proxy/2.429 mod_rewrite/2.429 mod_setenvif/2.429 mod_ssl/2.429 mod_status/2.429 mod_php7/2.429 -size=671392 -webmin=1.900 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index 7d5fb895e..2ed9f8aa8 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -wait=1 driver=Pg +showdirs=0 +init_start=0 btape=btape bls=bls -bextract=bextract -bacula_dir=/etc/bacula -user=bacula apply=1 -init_start=0 pass= db=bacula -showdirs=0 +user=bacula +bextract=bextract +wait=1 +bacula_dir=/etc/bacula diff --git a/webmin/bind8/config b/webmin/bind8/config index 02884a399..37eeb7e78 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,45 +1,45 @@ -checkzone=named-checkzone allow_long=0 -no_pid_chroot=0 -zones_file=/etc/bind/named.conf.local -ipv6_mode=1 -signzone=dnssec-signzone -confirm_rec=0 -other_slaves=1 -confirm_zone=1 -force_random=0 -updserial_man=1 -checkconf=named-checkconf -max_zones=50 -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 -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 +updserial_on=1 +signzone=dnssec-signzone +master_dir=/var/lib/bind +soa_style=0 +other_slaves=1 +keygen=dnssec-keygen updserial_def=0 -ndc_cmd=ndc +rev_must=0 +no_pid_chroot=0 +updserial_man=1 +show_list=0 +rndc_cmd=rndc largezones=0 +master_ttl=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 +confirm_rec=0 +named_path=/usr/sbin/named +force_random=0 +checkconf=named-checkconf +allow_comments=0 +relative_paths=0 allow_underscore=1 -show_list=0 -updserial_on=1 -short_names=0 -rev_must=0 -rev_def=0 -keygen=dnssec-keygen +max_zones=50 by_view=0 +allow_wild=1 +confirm_zone=1 forwardzonefilename_format=ZONE.hosts +short_names=0 +rev_def=0 +no_chroot=0 +records_order=0 +named_conf=/etc/bind/named.conf +zones_file=/etc/bind/named.conf.local +rndcconf_cmd=rndc-confgen +reversezonefilename_format=ZONE.rev +slave_dir=/var/lib/bind +ipv6_mode=1 +checkzone=named-checkzone +rndc_conf=/etc/bind/rndc.conf +ndc_cmd=ndc diff --git a/webmin/burner/config b/webmin/burner/config index 0cf5e2dc9..e8769fdd4 100644 --- a/webmin/burner/config +++ b/webmin/burner/config @@ -1,6 +1,6 @@ +mkisofs=mkisofs sox=sox cdrdao=cdrdao +cdrecord=cdrecord speed=1 -mkisofs=mkisofs mpg123=mpg123 -cdrecord=cdrecord diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 294c79b71..04110de95 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ max_users=200 -sort_mode=0 input_type=0 +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 eca989069..b92d9fe1e 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -conf_add_user=1 conf_allow_refresh=1 +conf_add_user=1 +conf_add_group=1 conf_find_group=1 +conf_allow_sync=1 +table_mode=0 conf_host_links=1 sort_mode=0 -conf_add_group=1 -conf_allow_sync=1 conf_find_user=1 -table_mode=0 diff --git a/webmin/config b/webmin/config index 32fe2851b..9987b97b8 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -tempdelete_days=7 -webprefix= +nofeedbackcc=0 +hostnamemode=0 lang=en.UTF-8 +product=webmin +lang_root=de.UTF-8 +webprefix= sysinfo=0 -nofeedbackcc=0 -help_height= +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +os_version=9.0 referers_none=1 +passwd_uindex=0 os_type=debian-linux -hostnamemode=0 -help_width= -md5pass=1 +ld_env=LD_LIBRARY_PATH +by_view=0 log=1 +hostnamedisplay= +help_width= +showlogin=0 dateformat=dd/mon/yyyy +passwd_file=/etc/shadow +passwd_pindex=1 +theme=authentic-theme +passwd_mindex=4 +real_os_version=18.04.1 +feedback_to= 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 -passwd_pindex=1 -ld_env=LD_LIBRARY_PATH +tempdelete_days=7 +md5pass=1 +help_height= diff --git a/webmin/cpan/config b/webmin/cpan/config index b12b0248c..84340ff2d 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -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 +incpackages=1 +cpan=http://www.cpan.org/authors/id +packages=http://www.cpan.org/modules/02packages.details.txt.gz diff --git a/webmin/cron/config b/webmin/cron/config index 4d021439b..ac79258e0 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,24 +1,25 @@ -match_user=1 -cron_user_get_command=crontab -l -cron_edit_command=crontab -u USER -e -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 -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 -cronfiles_dir=/etc/cron.d +max_jobs=100 +show_run=0 +cron_deny_file=/var/spool/cron/deny +vixie_cron=1 +match_user=1 +system_crontab=/etc/crontab +cron_dir=/var/spool/cron/crontabs +match_mode=0 cron_input=1 max_len=80 +show_comment=0 +show_next=0 +cron_edit_command=crontab -u USER -e +cron_deny_all=2 +cron_user_get_command=crontab -l cron_get_command=crontab -u USER -l +cron_delete_command=crontab -u USER -r +cron_user_delete_command=crontab -r +cronfiles_dir=/etc/cron.d diff --git a/webmin/custom/config b/webmin/custom/config index 777fdaf3a..dec7928fb 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 +display_mode=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index fc3774f1f..c0686e7db 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 -show_mac=0 lease_sort=0 +group_name=0 interfaces_type=debian -lease_tz=0 -restart_cmd=service isc-dhcp-server restart +dhcpd_path=/usr/sbin/dhcpd dhcpd_conf=/etc/dhcp/dhcpd.conf -lease_file=/var/lib/dhcp/dhcpd.leases +desc_name=0 +restart_cmd=service isc-dhcp-server restart +dhcpd_nocols=5 show_ip=0 +lease_tz=0 +show_mac=0 +lease_file=/var/lib/dhcp/dhcpd.leases +start_cmd=service isc-dhcp-server start display_max=100 -dhcpd_path=/usr/sbin/dhcpd -desc_name=0 +pid_file=/var/run/dhcpd.pid +stop_cmd=service isc-dhcp-server stop diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 658fb103e..3046deb50 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ -dovecot=/usr/sbin/dovecot -dovecot_config=/etc/dovecot/dovecot.conf init_script=dovecot +dovecot_config=/etc/dovecot/dovecot.conf +dovecot=/usr/sbin/dovecot pid_file=/var/run/dovecot/master.pid diff --git a/webmin/exim/config b/webmin/exim/config index f5db7f930..2b0ae6eba 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ +mail_system=1 +exim_dbmfile=/etc/exim4/local_domains +exim_virt_dir=/etc/exim4/aliases exim_aliasfileext= +exim_dbmext=.dbm 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_mail_file=Maildir diff --git a/webmin/exports/config b/webmin/exports/config index 5a48ca66f..b8864bec5 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ -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 +restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi +apply_cmd=exportfs -r diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index 6b240d5ac..cae702a7a 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 +config_dir=/etc/fail2ban server_cmd=/usr/bin/fail2ban-server +client_cmd=/usr/bin/fail2ban-client diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 3fe3c9378..b00c416d0 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ +config_file= max_users=400 pid_file=/var/run/fetchmail.pid -view_mode=0 -config_file= daemon_user=root fetchmail_path=fetchmail +view_mode=0 diff --git a/webmin/filter/config b/webmin/filter/config index 48ffb01a0..1ad8c0465 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 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 +reply_force=0 diff --git a/webmin/firewall/config b/webmin/firewall/config index 925163f1e..85d851b8d 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -cluster_mode=1 -view_comment=0 force_init=0 -direct=0 view_condition=1 +cluster_mode=1 +direct=0 comment_mod=0 +view_comment=0 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 4623fa367..91bcfc09d 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -direct=0 -force_init=0 comment_mod=0 -view_condition=1 view_comment=0 cluster_mode=1 +view_condition=1 +direct=0 +force_init=0 diff --git a/webmin/firewalld/config b/webmin/firewalld/config index 0aae64fac..ff329a00d 100644 --- a/webmin/firewalld/config +++ b/webmin/firewalld/config @@ -1,2 +1,2 @@ -init_name=firewalld firewall_cmd=firewall-cmd +init_name=firewalld diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 7b072bafc..3db0b4e87 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ +webmin_subs=0 nonewtape=0 -date_subs=0 simple_sched=0 -run_mode=0 +date_subs=0 error_email=0 always_tar=0 -webmin_subs=0 +run_mode=0 diff --git a/webmin/grub/config b/webmin/grub/config index 2bb2e4e49..49d2d2860 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ +menu_file=/boot/grub/menu.lst grub_path=grub install=(hd0) -menu_file=/boot/grub/menu.lst diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 9a628e429..0cba32d44 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -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 -pid_file=/var/run/heartbeat.pid -alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +heartbeat=/usr/lib/heartbeat/heartbeat resource_d= +authkeys= +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys serials=/dev/ttyS* -start_cmd=/etc/init.d/heartbeat start -alt_haresources=/usr/share/doc/packages/heartbeat/haresources -haresources= apply_cmd=/etc/init.d/heartbeat reload -stop_cmd=/etc/init.d/heartbeat stop -authkeys= +ha_dir=/etc/ha.d +haresources= ha_cf= +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +alt_haresources=/usr/share/doc/packages/heartbeat/haresources +pid_file=/var/run/heartbeat.pid +stop_cmd=/etc/init.d/heartbeat stop +start_cmd=/etc/init.d/heartbeat start diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index 5bc39aba0..fa141a725 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -htgroups=.htgroups +htaccess=.htaccess md5=1 +sha1=0 sort=0 -htaccess=.htaccess digest=1 htpasswd=.htpasswd +htgroups=.htgroups extra_directives= -sha1=0 diff --git a/webmin/idmapd/config b/webmin/idmapd/config index d6cd4227f..bbb774e0d 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ idmapd_conf=/etc/idmapd.conf -restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi idmapd_path=/usr/sbin/rpc.idmapd +restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi diff --git a/webmin/inetd/config b/webmin/inetd/config index e8f0e7a68..499ad9424 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ +rpc_protocols=tcp udp inetd_conf_file=/etc/inetd.conf -allow_file=/etc/hosts.allow +rpc_file=/etc/rpc display_max=100 -extended_inetd=1 -sort_mode=0 -services_file=/etc/services -ipv6=0 show_empty=1 -deny_file=/etc/hosts.deny -rpc_protocols=tcp udp -qm_mode=0 protocols_file=/etc/protocols -restart_command=killall -HUP inetd rpc_inetd=1 -rpc_file=/etc/rpc +deny_file=/etc/hosts.deny tcpd_path=/usr/sbin/tcpd +restart_command=killall -HUP inetd +extended_inetd=1 +allow_file=/etc/hosts.allow +services_file=/etc/services +sort_mode=0 +ipv6=0 +qm_mode=0 diff --git a/webmin/init/config b/webmin/init/config index 44c9a8458..e3a6ba222 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ +inittab_id=id +status_check=0 +init_info=1 +soft_links=1 +show_opts=0 sort_mode=0 -init_dir=/etc/init.d 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 +init_base=/etc/ order_digits=2 -status_check=0 -soft_links=1 +init_dir=/etc/init.d +expert=0 +atboot_product=webmin desc=1 -show_opts=0 +order=0 +shutdown_command=poweroff +boot_levels=2 3 5 diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 684094999..5f11efea4 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ cluster_nat=1 ipf_conf=/etc/ipf/ipf.conf +ipnat=ipnat view_condition=1 +ipnat_conf=/etc/ipf/ipnat.conf ipf=ipf ipfstat=ipfstat view_comment=0 -ipnat_conf=/etc/ipf/ipnat.conf cluster_mode=0 -ipnat=ipnat diff --git a/webmin/ipfw/config b/webmin/ipfw/config index aad8551b3..933e756be 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -view_condition=1 -view_counters=0 -version=2 -ipfw=/sbin/ipfw cluster_mode=0 +view_counters=0 +view_condition=1 view_comment=0 +ipfw=/sbin/ipfw +version=2 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index d1310093b..177bcb69e 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 -logfile=/var/log/messages -restart_cmd=/etc/init.d/ipsec restart policies_dir=/etc/ipsec.d/policies +restart_cmd=/etc/init.d/ipsec restart stop_cmd=/etc/init.d/ipsec stop secrets=/etc/ipsec.secrets +start_cmd=/etc/init.d/ipsec start +logfile=/var/log/messages +file=/etc/ipsec.conf diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 4ebe2dcc1..323769eb9 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -iscsiiname=iscsi-iname +config_file=/etc/iscsi/iscsid.conf initiator_file=/etc/iscsi/initiatorname.iscsi iscsiadm=iscsiadm -config_file=/etc/iscsi/iscsid.conf -ifaces_dir=/var/lib/iscsi/ifaces init_name=open-iscsi +iscsiiname=iscsi-iname +ifaces_dir=/var/lib/iscsi/ifaces diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 48d20e911..de7785e59 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 +targets_file=/etc/iscsi/targets pid_file=/var/run/iscsi-target.pid -iscsi_server=/usr/sbin/iscsi-target auths_file=/etc/iscsi/auths +iscsi_server=/usr/sbin/iscsi-target +init_name=netbsd-iscsi diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 91c1974d1..29c489c37 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ -config_file=/etc/iet/ietd.conf +opts_file=/etc/default/iscsitarget +targets_file=/etc/iet/targets.allow pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid +config_file=/etc/iet/ietd.conf +init_name=iscsitarget 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 618c982d6..01aef2fc0 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ -config_file=/etc/tgt/targets.conf -tgtadm=tgtadm -tgtd=tgtd tgtadmin=tgt-admin init_name=tgtd +tgtd=tgtd +tgtadm=tgtadm +config_file=/etc/tgt/targets.conf diff --git a/webmin/jabber/config b/webmin/jabber/config index 8a11d07ca..c8a6e69cd 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -jabber_dir=/var/lib/jabber -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 +stop_cmd=/etc/init.d/jabberd stop +start_cmd=/etc/init.d/jabberd start +jabber_dir=/var/lib/jabber diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 41ce77d5e..4587ce571 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ +auth_ldap=/etc/ldap.conf init_name=nslcd secret=/etc/ldap.secret -auth_ldap=/etc/ldap.conf diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index d9a3fa7b6..38f0c81f7 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ -ldap_user=openldap -config_file=/etc/ldap/slapd.d -slapd=slapd +attr_count=6 init_name=slapd -browse_max=100 schema_dir=/etc/ldap/schema -start_cmd=/etc/init.d/slapd start -attr_count=6 stop_cmd=/etc/init.d/slapd stop +start_cmd=/etc/init.d/slapd start +browse_max=100 +slapd=slapd +config_file=/etc/ldap/slapd.d +ldap_user=openldap apply_cmd=/etc/init.d/slapd restart diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 65781b214..6a4add16e 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ +samba_class=sambaSamAccount +given_order=0 person=1 -alias_same=0 -samba_gclass=sambaGroup -membox=0 -auth_ldap=/etc/ldap.conf secmode=0 +alias_same=0 +ldap_tls=0 +mailfmt=0 md5=0 imap_login=cyrus -samba_class=sambaSamAccount -imap_folders=old public sent-mail -imap_def=0 -mailfmt=0 -gecos=1 -quota_support=0 +membox=0 samba_def=0 -imap_class=SuSEeMailObject -given_order=0 slappasswd=slappasswd -other_class=inetOrgPerson +quota_support=0 +imap_foldersep=. +imap_folders=old public sent-mail +imap_def=0 +auth_ldap=/etc/ldap.conf shells=fixed,ldap,passwd,shells given=0 -imap_foldersep=. +other_class=inetOrgPerson +samba_gclass=sambaGroup multi_fields=0 -ldap_tls=0 +imap_class=SuSEeMailObject +gecos=1 diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 89afab6d0..80a83e4f0 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -logrotate_conf=/etc/logrotate.conf logrotate=logrotate -add_file=/etc/logrotate.d sort_mode=0 +logrotate_conf=/etc/logrotate.conf +add_file=/etc/logrotate.d diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index d1a7ed64b..01f572536 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ iface_arg= -driver_style=cups +gs_path=gs +iface_owner=lp:lp show_jobs=0 -print_style=cups -spool_dir=/var/spool/cups -gs_fontpath= -sort_mode=0 model_path=/usr/share/foomatic/db /usr/share/ppd -display_mode=0 +sort_mode=0 +gs_fontpath= show_status=0 +print_style=cups +spool_dir=/var/spool/cups +smbclient_path=smbclient 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 +gs_lib= +display_mode=0 +driver_style=cups diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index ee9b9976e..0cae89159 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -link_mode=0 -auto=1 -mailbox_user=.usermin/mailbox -sort_mode=1 -column_count=4 +show_size_below=0 +size_mode=1 +fwd_mode=0 +show_mail=0 top_buttons=2 -track_read=0 -mail_style=0 -spam_report= -spam_del=0 -spam_buttons=mail -show_unread=0 +column_count=4 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 -log_read=0 -sync_create=0 -mail_system=3 -arrows=1 -delete_warn=y no_crlf=0 -size_mode=1 noindex_hostname=0 -show_size_below=0 -mail_usermin=mail -from_virtualmin=1 -mail_file=Mailbox -perpage=20 -no_mailer=0 -fwd_mode=0 +vpopmail_dir=/home/vpopmail +spam_buttons=mail html_edit=0 -ignore_users= +from_virtualmin=1 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 +spam_report= +delete_warn=y check_mod=1 -no_orig_ip=0 +sort_mode=1 show_size=1 -maildir_deleted=0 +show_body=0 date_fmt=dmy +track_read=0 +maildir_deleted=0 +link_mode=0 +show_delall=0 +max_records=200 +show_sent=0 +mail_style=0 +log_read=0 +spam_del=0 +perpage=20 +mailbox_user=.usermin/mailbox +mail_file=Mailbox +wrap_width=80 +auto=1 +sync_delete=1 show_to=0 +sync_create=0 +show_unread=0 +sync_perms=0700 +no_orig_ip=0 +sig_file=* +ignore_users_enabled=0 +no_mailer=0 +ignore_users= +mail_usermin=mail +arrows=1 +mail_system=3 +open_mode=0 +sync_modify=1 diff --git a/webmin/man/config b/webmin/man/config index 8ac4a7114..009ff7463 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -doc_dir=/usr/share/doc +man_cmd=man PAGE list_cmd_sect=man -w SECTION PAGE +kernel_dir=/usr/src/linux/Documentation +search_cmd=man -k PAGE list_cmd=man -w PAGE man2html_path=man2html man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man -man_cmd=man PAGE -kernel_dir=/usr/src/linux/Documentation -search_cmd=man -k PAGE man_cmd_sect=man SECTION PAGE +doc_dir=/usr/share/doc diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index c0e69b04a..cf6315ce1 100644 --- a/webmin/miniserv.conf +++ b/webmin/miniserv.conf @@ -44,4 +44,4 @@ nolog=.*xhr.* logouttimes= root=/usr/share/webmin mimetypes=/usr/share/webmin/mime.types -server=MiniServ/1.900 +server=MiniServ/1.920 diff --git a/webmin/mon/config b/webmin/mon/config index 6c435fc5f..b8ba843df 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -mon_cgi=/var/www/cgi-bin/mon.cgi -pid_file=/var/run/mon.pid stop_cmd=/etc/init.d/mon stop +pid_file=/var/run/mon.pid +mon_cgi=/var/www/cgi-bin/mon.cgi +start_cmd=/etc/init.d/mon start monshow=/usr/bin/monshow -restart_cmd=/etc/init.d/mon restart cfbasedir=/etc/mon -start_cmd=/etc/init.d/mon start +restart_cmd=/etc/init.d/mon restart diff --git a/webmin/mount/config b/webmin/mount/config index 479080635..64e78541c 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,8 +1,8 @@ smbclient_path=smbclient -nmblookup_path=nmblookup -show_used=1 -nfs_check=1 long_fstypes=1 +show_used=1 +nmblookup_path=nmblookup +auto_file=/etc/am-utils/amd.conf autofs_file=/etc/auto.master fstab_file=/etc/fstab -auto_file=/etc/am-utils/amd.conf +nfs_check=1 diff --git a/webmin/mysql/config b/webmin/mysql/config index 8c4cbad56..21d7b0756 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -webmin_subs=0 +passwd_mode=0 login=root -date_subs=0 -add_mode=1 -nopwd=0 blob_mode=0 +mysqlshow=/usr/bin/mysqlshow +nodbi=0 +mysqladmin=/usr/bin/mysqladmin +max_dbs=50 +date_subs=0 mysqldump=/usr/bin/mysqldump +add_mode=1 access=*: * -mysqladmin=/usr/bin/mysqladmin -mysqlshow=/usr/bin/mysqlshow perpage=25 -mysql=/usr/bin/mysql -passwd_mode=0 start_cmd=service mysql start -mysql_libs=/usr/local/mysql/lib +webmin_subs=0 mysql_data=/var/lib/mysql -max_dbs=50 -stop_cmd=service mysql stop max_text=1000 +nopwd=0 +stop_cmd=service mysql stop +mysqlimport=/usr/bin/mysqlimport +mysql=/usr/bin/mysql my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf style=0 -mysqlimport=/usr/bin/mysqlimport -nodbi=0 +mysql_libs=/usr/local/mysql/lib diff --git a/webmin/mysql/version b/webmin/mysql/version new file mode 100644 index 000000000..508a0a97e --- /dev/null +++ b/webmin/mysql/version @@ -0,0 +1 @@ +5.7.27 diff --git a/webmin/net/config b/webmin/net/config index 56c61c18e..04c0295d5 100644 --- a/webmin/net/config +++ b/webmin/net/config @@ -1,2 +1,2 @@ -hosts_file=/etc/hosts def_netmask=255.255.255.0 +hosts_file=/etc/hosts diff --git a/webmin/nis/config b/webmin/nis/config index fb10df359..cf382fa57 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ -max_size=100 +securenets=/etc/ypserv.securenets 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 ca257d6e5..0eeb37ff5 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -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 195d872e7..226c127d1 100644 --- a/webmin/package-updates/config +++ b/webmin/package-updates/config @@ -1,2 +1,2 @@ -update_multiple=1 cache_time=6 +update_multiple=1 diff --git a/webmin/pam/config b/webmin/pam/config index 2d867ee25..2335d1bf6 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ lib_dirs=/lib/security /lib/*/security pam_dir=/etc/pam.d -mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so ignore=README +mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so diff --git a/webmin/pap/config b/webmin/pap/config index cbaaf2fab..d1c2d3c04 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -encrypt_pass=0 dialin_config=/etc/mgetty+sendfax/dialin.config +login_config=/etc/mgetty+sendfax/login.config +mgetty=mgetty 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 +encrypt_pass=0 +ppp_options=/etc/ppp/options diff --git a/webmin/passwd/config b/webmin/passwd/config index 294c79b71..04110de95 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ max_users=200 -sort_mode=0 input_type=0 +sort_mode=0 diff --git a/webmin/postfix/config b/webmin/postfix/config index f4338685f..11b2bc79a 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_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 +postfix_queue_command=postqueue +wrap_width=80 +postfix_lookup_table_command=/usr/sbin/postmap columns=2 +delete_warn=1 +postfix_master=/etc/postfix/master.cf prefix_cmts=0 -postfix_queue_command=postqueue -top_buttons=1 sort_mode=0 +postfix_aliases_table_command=/usr/sbin/postalias +postfix_super_command=/usr/sbin/postsuper +index_check=1 +fwd_mode=0 +postfix_control_command=/usr/sbin/postfix +top_buttons=1 postcat_cmd=/usr/sbin/postcat show_cmts=0 -postfix_master=/etc/postfix/master.cf -mailq_cmd=postqueue -p -wrap_width=80 +postfix_config_file=/etc/postfix/main.cf +postfix_newaliases_command=/usr/bin/newaliases max_records=200 -postfix_aliases_table_command=/usr/sbin/postalias mailq_dir=/var/spool/postfix +delete_confirm=1 +ldap_doms=0 postfix_config_command=/usr/sbin/postconf +mailq_sort=0 +mailq_cmd=postqueue -p check_config=1 -postfix_newaliases_command=/usr/bin/newaliases diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 947472407..90a3b4aed 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 -hba_conf=/etc/postgresql/*/main/pg_hba.conf -dump_cmd=/usr/bin/pg_dump -access_own=0 -pid_file=/var/run/postmaster.pid -psql=/usr/bin/psql -rstr_cmd=/usr/bin/pg_restore +date_subs=0 nodbi=0 blob_mode=0 -date_subs=0 -add_mode=1 -pass= -webmin_subs=0 login=postgres -basedb=template1 -plib= +rstr_cmd=/usr/bin/pg_restore perpage=25 access=*: * +basedb=template1 +simple_sched=0 +add_mode=1 +plib= +pass= +psql=/usr/bin/psql +pid_file=/var/run/postmaster.pid +stop_cmd=/etc/init.d/postgresql* stop +webmin_subs=0 +access_own=0 +start_cmd=/etc/init.d/postgresql* start +dump_cmd=/usr/bin/pg_dump +sameunix=1 +max_text=1000 +style=0 +hba_conf=/etc/postgresql/*/main/pg_hba.conf diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 237c75238..54849d0a2 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ -wvdial=wvdial wvdialconf=wvdialconf +wvdial=wvdial file=/etc/wvdial.conf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 6525162d6..eb9c22d12 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 +pptp=pptp pptp_options=/etc/ppp/options.pptp +pap_file=/etc/ppp/chap-secrets peers_dir=/etc/ppp/peers diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index fc7b5955a..c29c556ff 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -pptpd=pptpd pap_file=/etc/ppp/chap-secrets -log_file=/var/log/messages +file=/etc/pptpd.conf +pptpd=pptpd stop_cmd=/etc/init.d/pptpd stop +pid_file=/var/run/pptpd.pid 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 +log_file=/var/log/messages diff --git a/webmin/proc/config b/webmin/proc/config index 73cf7c430..7f9ae4348 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ +default_mode=last trace_java=0 base_ppid=1 cut_length=80 -hide_self=1 ps_style=linux -default_mode=last +hide_self=1 diff --git a/webmin/procmail/config b/webmin/procmail/config index 9b36ccfbe..d5df94749 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -procmail=procmail -procmailrc=/etc/procmailrc includes=0 +procmailrc=/etc/procmailrc +procmail=procmail diff --git a/webmin/proftpd/config b/webmin/proftpd/config index b8ada1449..4e71caf38 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -start_cmd=/etc/init.d/proftpd start test_config=1 +start_cmd=/etc/init.d/proftpd start ftpusers=/etc/ftpusers -proftpd_path=/usr/sbin/proftpd +proftpd_conf=/etc/proftpd/proftpd.conf test_manual=0 +test_always=0 stop_cmd=/etc/init.d/proftpd stop -proftpd_conf=/etc/proftpd/proftpd.conf pid_file=/var/run/proftpd.pid -test_always=0 +proftpd_path=/usr/sbin/proftpd diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 677a8748b..561e9e5f3 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ +mailq_sort=0 mail_system=1 mail_dir= +delete_warn=1 +columns=2 +index_min=1000000 +sort_mode=0 +qmail_dir=/var/qmail max_records=200 -mailq_sort=0 mail_file=Mailbox -fwd_mode=0 +mail_dir_qmail=Maildir perpage=20 -qmail_dir=/var/qmail -index_min=1000000 +fwd_mode=0 mailq_count=0 -delete_warn=1 -mail_dir_qmail=Maildir -columns=2 -sort_mode=0 diff --git a/webmin/quota/config b/webmin/quota/config index a91b5804f..cc6fc7feb 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -user_quotaoff_command=quotaoff -u -group_setquota_command=setquota -g -show_grace=1 -group_quota_command=quota -v -g -user_setquota_command=setquota -u -pc_show=1 -block_mode=1 -group_edquota_command=edquota -g -user_quotaon_command=quotaon -u -user_copy_command=edquota -u -p -quotacheck_command=quotacheck -u -g +group_quotaon_command=quotaon -g +user_quota_command=quota -v -u group_repquota_command=repquota -g -v -user_grace_command=edquota -u -t -sort_mode=0 user_repquota_command=repquota -u -v +group_quotaoff_command=quotaoff -g +pc_show=1 block_size=1024 -user_edquota_command=edquota -u -display_max=100 group_grace_command=edquota -g -t +user_setquota_command=setquota -u +sort_mode=0 +group_setquota_command=setquota -g +user_copy_command=edquota -u -p +block_mode=1 +user_grace_command=edquota -u -t +user_quotaoff_command=quotaoff -u +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_quotaon_command=quotaon -u +quotacheck_command=quotacheck -u -g +show_grace=1 group_copy_command=edquota -g -p -user_quota_command=quota -v -u +user_edquota_command=edquota -u +group_quota_command=quota -v -g +group_edquota_command=edquota -g 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 +display_max=100 diff --git a/webmin/raid/config b/webmin/raid/config index 4bd2da90e..76eb03452 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ -mdstat=/proc/mdstat -raidtab=/etc/raidtab mdadm=/etc/mdadm/mdadm.conf +raidtab=/etc/raidtab +mdstat=/proc/mdstat diff --git a/webmin/samba/config b/webmin/samba/config index 41d821ebd..7f9d65da5 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -dont_convert=-499 -restart_cmd=service smbd restart ; service nmbd restart -text_lists=0 -smbgroupedit=/usr/bin/smbgroupedit smb_passwd=/etc/samba/smbpasswd -swat=/usr/sbin/swat net=/usr/bin/net -run_from_inetd=0 +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +swat=/usr/sbin/swat +name_server=/usr/sbin/nmbd +pdbedit=/usr/bin/pdbedit +smbgroupedit=/usr/bin/smbgroupedit sort_mode=0 +dont_convert=-499 +run_from_inetd=0 +restart_cmd=service smbd restart ; service nmbd restart samba_password_program=/usr/bin/smbpasswd -pdbedit=/usr/bin/pdbedit -name_server=/usr/sbin/nmbd +stop_cmd=service smbd stop ; service nmbd stop start_cmd=service smbd start ; service nmbd start 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' smb_conf=/etc/samba/smb.conf +text_lists=0 diff --git a/webmin/sarg/config b/webmin/sarg/config index 2afcf8310..b9009faeb 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ sarg_conf=/etc/sarg/sarg.conf -naked=0 sarg=sarg +naked=0 clear=1 diff --git a/webmin/sendmail/config b/webmin/sendmail/config index aea6fbd41..41fa1cce7 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -mail_dir=/var/spool/mail -sendmail_command=/usr/lib/sendmail -bd -q1h -smrsh_dir=/etc/smrsh -makemap_path=makemap -order_mail=0 -delete_confirm=1 -sendmail_cf=/etc/mail/sendmail.cf -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 +sendmail_features=/usr/share/sendmail/cf +perpage=20 +wrap_width=80 +mail_file=mbox +sendmail_cf=/etc/mail/sendmail.cf prefix_cmts=0 +sort_mode=0 +show_to=0 +delete_warn=1 +index_min=1000000 columns=2 -sendmail_path=/usr/lib/sendmail -top_buttons=1 +makemap_path=makemap +track_read=0 +order_mail=0 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 +top_buttons=1 +fwd_mode=0 +delete_confirm=1 +sendmail_command=/usr/lib/sendmail -bd -q1h sendmail_pid=/var/run/sendmail/mta/sendmail.pid +sendmail_path=/usr/lib/sendmail +max_records=200 +smrsh_dir=/etc/smrsh +sendmail_mc=/etc/mail/sendmail.mc +mail_style=0 +mail_type=0 +mail_dir=/var/spool/mail +mailq_sort=0 diff --git a/webmin/servers/config b/webmin/servers/config index beb720898..b17a5706c 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -deflink=0 +resolve=1 +show_ip=0 show_status=1 -capath=/usr/share/ca-certificates +max_servers=100 scan_time=5 deffast=2 +deflink=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/shell/config b/webmin/shell/config index af7728831..4b3e40b52 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 dec64fade..343105911 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -shorewall=shorewall config_dir=/etc/shorewall -display_zone_descriptions=1 actions=/etc/shorewall/actions /usr/share/shorewall/actions.std macros=/usr/share/shorewall +display_zone_descriptions=1 +shorewall=shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index dfbbf3b01..f51cfb550 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ +config_dir=/etc/shorewall6 macros=/usr/share/shorewall6 actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std display_zone_descriptions=1 shorewall6=shorewall6 -config_dir=/etc/shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index 1c8af5754..f4c63c585 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ -attribs=1 +ata=0 smartctl=smartctl mode=1 -ata=0 +attribs=1 diff --git a/webmin/software/config b/webmin/software/config index abefc9ae1..c93f3edb6 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ -apt_mode=0 -package_system=debian update_system=apt +package_system=debian +apt_mode=0 diff --git a/webmin/spam/config b/webmin/spam/config index 4d5e529fa..ed6f8e8b2 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -restart_cmd=/etc/init.d/spamassassin restart processes=spamd amavisd +procmail_cmd=* local_cf=/etc/spamassassin/local.cf max_awl=200 -procmail_cmd=* -sa_learn=sa-learn call_spam=1 -spamassassin=spamassassin -procmailrc=/etc/procmailrc warn_procmail=1 -addto=0 mode=0 +sa_learn=sa-learn +addto=0 +restart_cmd=/etc/init.d/spamassassin restart +procmailrc=/etc/procmailrc +spamassassin=spamassassin diff --git a/webmin/squid/config b/webmin/squid/config index 2f77ad027..548cd6ddb 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -cache_dir=/var/spool/squid -log_dir=/var/log/squid -squid_conf=/etc/squid/squid.conf -squid_start=service squid start -calamaris=calamaris -squidclient=squidclient -sort_conf=0 cal_max=50000 -squid_stop=service squid stop -cal_fmt=w -squid_restart=service squid reload +crypt_conf=0 +sort_conf=0 +squid_start=service squid start pid_file=/var/run/squid.pid squid_path=squid -sync_delete=0 -sync_create=0 -sync_modify=1 +squid_stop=service squid stop cal_all=1 -cal_args=-aw cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +sync_delete=0 +log_dir=/var/log/squid +cal_args=-aw +squidclient=squidclient +calamaris=calamaris +squid_conf=/etc/squid/squid.conf +squid_restart=service squid reload +cache_dir=/var/spool/squid +sync_modify=1 +cal_fmt=w +sync_create=0 restart_pos=0 -crypt_conf=0 diff --git a/webmin/sshd/config b/webmin/sshd/config index 7754ad93a..2397ad873 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -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 sync_pass=0 -keygen_path=/usr/bin/ssh-keygen client_config=/etc/ssh/ssh_config +keygen_path=/usr/bin/ssh-keygen +sync_auth=1 sync_create=0 +sshd_config=/etc/ssh/sshd_config +start_cmd=service ssh start stop_cmd=service ssh stop +pid_file=/var/run/sshd.pid +sshd_path=/usr/sbin/sshd +sync_gnupg=0 diff --git a/webmin/status/config b/webmin/status/config index 431165c80..7b7843c80 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ -index_status=1 +sysinfo_users=0 sysinfo=0 -sched_offset=0 -output=0 subject_mode=0 -snmp_version=2 -sysinfo_users=0 -history_show=50 -pager_cmd=sms_client -history_purge=30 +sort_mode=0 columns=2 snmp_trap=1.3.6.1.4.1.10000.1.1 -sort_mode=0 +history_purge=30 +sched_offset=0 +output=0 +pager_cmd=sms_client +history_show=50 +index_status=1 +snmp_version=2 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index d86da046b..ae93780b1 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 syslogng_cmd=syslog-ng lines=20 -compressed=1 start_cmd=/etc/init.d/syslog-ng start +syslogng_conf=/etc/syslog-ng/syslog-ng.conf +stop_cmd=/etc/init.d/syslog-ng stop +pid_file=/var/run/syslog-ng.pid diff --git a/webmin/syslog/config b/webmin/syslog/config index 1116c5278..e8ffd1641 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -pid_file=/var/run/rsyslogd.pid -reverse=0 syslog_conf=/etc/rsyslog.conf -syslogd=/usr/sbin/rsyslogd -signal_cmd=/usr/sbin/service rsyslog restart +sync=1 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -tags=0 +pipe=1 m4_conf=0 -socket=0 -start_cmd=/usr/sbin/service rsyslog start +syslogd=/usr/sbin/rsyslogd +signal_cmd=/usr/sbin/service rsyslog restart m4_path= +lines=20 pri_all=1 -others=1 -sync=1 +socket=0 pri_dir=1 -pipe=1 +pid_file=/var/run/rsyslogd.pid +reverse=0 +start_cmd=/usr/sbin/service rsyslog start restart_cmd=/usr/sbin/service rsyslog restart +others=1 compressed=1 -lines=20 +tags=0 diff --git a/webmin/telnet/config b/webmin/telnet/config index c5cad7c93..090693df7 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ -sizemode=0 -mode=1 proxy=0 no_test=0 detach=0 +sizemode=0 +mode=1 diff --git a/webmin/time/config b/webmin/time/config index 3a6eb2d4c..6d1285b2f 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,5 +1,5 @@ -seconds=1 lease=5 +seconds=1 zone_style=linux -ntp_only=1 timeserver_hardware=1 +ntp_only=1 diff --git a/webmin/updown/config b/webmin/updown/config index 1c7534ae3..2cae87648 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ dir=/ +ddir=/ duser=root user=root -ddir=/ diff --git a/webmin/useradmin/config b/webmin/useradmin/config index 412da5884..4ae789ff9 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -alias_check=0 +secmode=0 gid_calc=0 default_group=users -user_files=/etc/skel -delete_only=0 -new_user_group=0 -random_password=0 +from_files=0 +membox=0 +uid_mode=1 +display_max=400 +passwd_file=/etc/passwd +base_uid=1000 +shells=fixed,passwd,shells +passwd_dict=0 selinux_con=user_u:object_r:user_home_dir_t +last_show=0 gid_mode=1 -uid_calc=0 -empty_mode=0 -delete_root=0 -base_gid=1000 -display_mode=1 -passwd_file=/etc/passwd -homedir_perms=0755 -display_max=400 -sort_mode=0 +user_files=/etc/skel +random_password=0 +shadow_file=/etc/shadow email_type=0 -home_base=/home +delete_only=0 +alias_check=0 lock_string=* -group_file=/etc/group -md5=1 -last_show=0 -shadow_file=/etc/shadow +uid_calc=0 +empty_mode=0 +passwd_stars=0 extra_real=0 -passwd_same=0 -base_uid=1000 -shells=fixed,passwd,shells new_user_gid=0 -skip_md5=0 -uid_mode=1 -passwd_dict=0 +group_file=/etc/group home_style=0 -passwd_progmode=0 +md5=1 +new_user_group=0 default_other=1 +display_mode=1 +passwd_progmode=0 +skip_md5=0 +base_gid=1000 gshadow_file=/etc/gshadow -membox=0 -secmode=0 -passwd_stars=0 -from_files=0 +delete_root=0 +home_base=/home +passwd_same=0 +sort_mode=0 +homedir_perms=0755 diff --git a/webmin/usermin/config b/webmin/usermin/config index 0a674a856..b01f02d93 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -upmissing=0 +update=0 updays=1 -cron_mode=0 usermin_dir=/etc/usermin uphour=4 -update=0 upshow=1 +upmissing=0 +cron_mode=0 diff --git a/webmin/version b/webmin/version index 3c69c6b5b..dda46a367 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.900 +1.920 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index 119fa11ad..7ad21a96b 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 -auto=apache,squid,proftpd,wuftpd -naked=0 +webalizer=/usr/bin/webalizer +skip_old=0 alt_conf=/etc/webalizer/webalizer.conf.sample +naked=0 +auto=apache,squid,proftpd,wuftpd diff --git a/webmin/webmin/config b/webmin/webmin/config index de24f47c0..b0d87d1b3 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,11 +1,11 @@ -cron_mode=0 -last_version_number=1.900 -updays=1 -update=0 -osdn=1 +warn_days=7 upmissing=0 -last_version_check=1549050668 upmins=47 -warn_days=7 -upshow=1 +last_version_check=1549050668 +osdn=1 +cron_mode=0 uphour=23 +upshow=1 +updays=1 +last_version_number=1.900 +update=0 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index 6e98c5a49..3ae6748b3 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftpconversions=/etc/wu-ftpd/ftpconversions -ftphosts=/etc/wu-ftpd/ftphosts ftpaccess=/etc/wu-ftpd/ftpaccess +ftphosts=/etc/wu-ftpd/ftphosts +log_file=/var/log/xferlog +ftpconversions=/etc/wu-ftpd/ftpconversions pid_file=/var/run/ftpd.pids-all -ftpd_path=/usr/sbin/wu-ftpd ftpusers=/etc/wu-ftpd/ftpusers +ftpd_path=/usr/sbin/wu-ftpd ftpgroups=/etc/wu-ftpd/ftpgroups -log_file=/var/log/xferlog diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 6d03828dd..c388770ef 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -lookup_servs=1 -xinetd_conf=/etc/xinetd.conf start_cmd=/etc/init.d/xinetd start +lookup_servs=1 pid_file=/var/run/xinetd.pid +xinetd_conf=/etc/xinetd.conf protocols_file=/etc/protocols -- 2.43.0