From 7b134cde83153b7d650a39859af4698298d9b0dd Mon Sep 17 00:00:00 2001 From: mhoellein Date: Mon, 13 Apr 2020 22:49:35 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -amd64-microcode 3.20180524.1~ubuntu0.18.04.2 amd64 +amd64-microcode 3.20191021.1+really3.20181128.1~ubuntu0.18.04.1 amd64 -base-files 10.1ubuntu2.6 amd64 +base-files 10.1ubuntu2.8 amd64 -bind9 1:9.11.3+dfsg-1ubuntu1.9 amd64 -bind9-host 1:9.11.3+dfsg-1ubuntu1.9 amd64 -bind9utils 1:9.11.3+dfsg-1ubuntu1.9 amd64 +bind9 1:9.11.3+dfsg-1ubuntu1.11 amd64 +bind9-host 1:9.11.3+dfsg-1ubuntu1.11 amd64 +bind9utils 1:9.11.3+dfsg-1ubuntu1.11 amd64 -bsdutils 1:2.31.1-0.4ubuntu3.4 amd64 +bsdutils 1:2.31.1-0.4ubuntu3.6 amd64 -code-brand 4.0-2 all +code-brand 4.2-19 all -cpio 2.12+dfsg-6 amd64 +cpio 2.12+dfsg-6ubuntu0.18.04.1 amd64 -cpp-7 7.4.0-1ubuntu1~18.04.1 amd64 +cpp-7 7.5.0-3ubuntu1~18.04 amd64 -distro-info-data 0.37ubuntu0.5 all -dmidecode 3.1-1 amd64 -dmsetup 2:1.02.145-4.1ubuntu3.18.04.1 amd64 +distro-info-data 0.37ubuntu0.6 all +dmidecode 3.1-1ubuntu0.1 amd64 +dmsetup 2:1.02.145-4.1ubuntu3.18.04.2 amd64 -dnsutils 1:9.11.3+dfsg-1ubuntu1.9 amd64 +dnsutils 1:9.11.3+dfsg-1ubuntu1.11 amd64 -e2fsprogs 1.44.1-1ubuntu1.2 amd64 +e2fsprogs 1.44.1-1ubuntu1.3 amd64 -fdisk 2.31.1-0.4ubuntu3.4 amd64 -file 1:5.32-2ubuntu0.2 amd64 +fdisk 2.31.1-0.4ubuntu3.6 amd64 +file 1:5.32-2ubuntu0.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 +gcc-7 7.5.0-3ubuntu1~18.04 amd64 +gcc-7-base 7.5.0-3ubuntu1~18.04 amd64 +gcc-8-base 8.4.0-1ubuntu1~18.04 amd64 -git 1:2.17.1-1ubuntu0.4 amd64 -git-man 1:2.17.1-1ubuntu0.4 all +git 1:2.17.1-1ubuntu0.5 amd64 +git-man 1:2.17.1-1ubuntu0.5 all -grub-common 2.02-2ubuntu8.13 amd64 +grub-common 2.02-2ubuntu8.15 amd64 -grub-pc 2.02-2ubuntu8.13 amd64 -grub-pc-bin 2.02-2ubuntu8.13 amd64 -grub2-common 2.02-2ubuntu8.13 amd64 +grub-pc 2.02-2ubuntu8.15 amd64 +grub-pc-bin 2.02-2ubuntu8.15 amd64 +grub2-common 2.02-2ubuntu8.15 amd64 -initramfs-tools 0.130ubuntu3.8 all -initramfs-tools-bin 0.130ubuntu3.8 amd64 -initramfs-tools-core 0.130ubuntu3.8 all +initramfs-tools 0.130ubuntu3.9 all +initramfs-tools-bin 0.130ubuntu3.9 amd64 +initramfs-tools-core 0.130ubuntu3.9 all -intel-microcode 3.20190618.0ubuntu0.18.04.1 amd64 +intel-microcode 3.20191115.1ubuntu0.18.04.2 amd64 -letsencrypt 0.23.0-1 all +letsencrypt 0.27.0-1~ubuntu18.04.1 all -libapache2-mod-php7.2 7.2.19-0ubuntu0.18.04.2 amd64 +libapache2-mod-php7.2 7.2.24-0ubuntu0.18.04.3 amd64 -libasan4 7.4.0-1ubuntu1~18.04.1 amd64 +libasan4 7.5.0-3ubuntu1~18.04 amd64 -libatomic1 8.3.0-6ubuntu1~18.04.1 amd64 +libatomic1 8.4.0-1ubuntu1~18.04 amd64 -libbind9-160 1:9.11.3+dfsg-1ubuntu1.9 amd64 +libbind9-160 1:9.11.3+dfsg-1ubuntu1.11 amd64 -libblkid1 2.31.1-0.4ubuntu3.4 amd64 +libblkid1 2.31.1-0.4ubuntu3.6 amd64 -libbsd0 0.8.7-1 amd64 +libbsd0 0.8.7-1ubuntu0.1 amd64 -libcc1-0 8.3.0-6ubuntu1~18.04.1 amd64 +libcc1-0 8.4.0-1ubuntu1~18.04 amd64 -libcharon-standard-plugins 5.6.2-1ubuntu2.4 amd64 -libcilkrts5 7.4.0-1ubuntu1~18.04.1 amd64 -libcom-err2 1.44.1-1ubuntu1.2 amd64 +libcharon-standard-plugins 5.6.2-1ubuntu2.5 amd64 +libcilkrts5 7.5.0-3ubuntu1~18.04 amd64 +libcom-err2 1.44.1-1ubuntu1.3 amd64 -libdevmapper1.02.1 2:1.02.145-4.1ubuntu3.18.04.1 amd64 +libdevmapper1.02.1 2:1.02.145-4.1ubuntu3.18.04.2 amd64 -libdns-export1100 1:9.11.3+dfsg-1ubuntu1.9 amd64 -libdns1100 1:9.11.3+dfsg-1ubuntu1.9 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 +libdns-export1100 1:9.11.3+dfsg-1ubuntu1.11 amd64 +libdns1100 1:9.11.3+dfsg-1ubuntu1.11 amd64 +libdrm-amdgpu1 2.4.99-1ubuntu1~18.04.2 amd64 +libdrm-common 2.4.99-1ubuntu1~18.04.2 all +libdrm-intel1 2.4.99-1ubuntu1~18.04.2 amd64 +libdrm-nouveau2 2.4.99-1ubuntu1~18.04.2 amd64 +libdrm-radeon1 2.4.99-1ubuntu1~18.04.2 amd64 +libdrm2 2.4.99-1ubuntu1~18.04.2 amd64 -libext2fs2 1.44.1-1ubuntu1.2 amd64 +libext2fs2 1.44.1-1ubuntu1.3 amd64 -libfdisk1 2.31.1-0.4ubuntu3.4 amd64 +libfdisk1 2.31.1-0.4ubuntu3.6 amd64 -libgcc-7-dev 7.4.0-1ubuntu1~18.04.1 amd64 -libgcc1 1:8.3.0-6ubuntu1~18.04.1 amd64 -libgcrypt20 1.8.1-4ubuntu1.1 amd64 -libgd3 2.2.5-4ubuntu0.3 amd64 +libgcc-7-dev 7.5.0-3ubuntu1~18.04 amd64 +libgcc1 1:8.4.0-1ubuntu1~18.04 amd64 +libgcrypt20 1.8.1-4ubuntu1.2 amd64 +libgd3 2.2.5-4ubuntu0.4 amd64 -libgl1-mesa-glx 19.0.8-0ubuntu0~18.04.2 amd64 -libglapi-mesa 19.0.8-0ubuntu0~18.04.2 amd64 -libglib2.0-0 2.56.4-0ubuntu0.18.04.4 amd64 -libglib2.0-data 2.56.4-0ubuntu0.18.04.4 all +libgl1-mesa-glx 19.2.8-0ubuntu0~18.04.3 amd64 +libglapi-mesa 19.2.8-0ubuntu0~18.04.3 amd64 +libglib2.0-0 2.56.4-0ubuntu0.18.04.6 amd64 +libglib2.0-data 2.56.4-0ubuntu0.18.04.6 all -libglx-mesa0 19.0.8-0ubuntu0~18.04.2 amd64 +libglx-mesa0 19.2.8-0ubuntu0~18.04.3 amd64 -libgnutls30 3.5.18-1ubuntu1.1 amd64 -libgomp1 8.3.0-6ubuntu1~18.04.1 amd64 +libgnutls30 3.5.18-1ubuntu1.3 amd64 +libgomp1 8.4.0-1ubuntu1~18.04 amd64 -libicu60 60.2-3ubuntu3 amd64 +libicu60 60.2-3ubuntu3.1 amd64 -libidn2-0 2.0.4-1.1build2 amd64 +libidn2-0 2.0.4-1.1ubuntu0.2 amd64 -libirs160 1:9.11.3+dfsg-1ubuntu1.9 amd64 -libisc-export169 1:9.11.3+dfsg-1ubuntu1.9 amd64 -libisc169 1:9.11.3+dfsg-1ubuntu1.9 amd64 -libisccc160 1:9.11.3+dfsg-1ubuntu1.9 amd64 -libisccfg160 1:9.11.3+dfsg-1ubuntu1.9 amd64 +libirs160 1:9.11.3+dfsg-1ubuntu1.11 amd64 +libisc-export169 1:9.11.3+dfsg-1ubuntu1.11 amd64 +libisc169 1:9.11.3+dfsg-1ubuntu1.11 amd64 +libisccc160 1:9.11.3+dfsg-1ubuntu1.11 amd64 +libisccfg160 1:9.11.3+dfsg-1ubuntu1.11 amd64 -libitm1 8.3.0-6ubuntu1~18.04.1 amd64 +libitm1 8.4.0-1ubuntu1~18.04 amd64 -libjpeg-turbo8 1.5.2-0ubuntu5.18.04.1 amd64 +libjpeg-turbo8 1.5.2-0ubuntu5.18.04.3 amd64 -libllvm8 1:8-3~ubuntu18.04.1 amd64 +libllvm8 1:8-3~ubuntu18.04.2 amd64 -liblsan0 8.3.0-6ubuntu1~18.04.1 amd64 +liblsan0 8.4.0-1ubuntu1~18.04 amd64 -liblwres160 1:9.11.3+dfsg-1ubuntu1.9 amd64 +liblwres160 1:9.11.3+dfsg-1ubuntu1.11 amd64 -libmagic-mgc 1:5.32-2ubuntu0.2 amd64 -libmagic1 1:5.32-2ubuntu0.2 amd64 +libmagic-mgc 1:5.32-2ubuntu0.3 amd64 +libmagic1 1:5.32-2ubuntu0.3 amd64 -libmount1 2.31.1-0.4ubuntu3.4 amd64 +libmount1 2.31.1-0.4ubuntu3.6 amd64 -libmpx2 8.3.0-6ubuntu1~18.04.1 amd64 -libmysqlclient20 5.7.27-0ubuntu0.18.04.1 amd64 +libmpx2 8.4.0-1ubuntu1~18.04 amd64 +libmysqlclient20 5.7.29-0ubuntu0.18.04.1 amd64 -libnss-systemd 237-3ubuntu10.31 amd64 +libnss-systemd 237-3ubuntu10.39 amd64 -libpam-systemd 237-3ubuntu10.31 amd64 +libpam-systemd 237-3ubuntu10.39 amd64 -libpcap0.8 1.8.1-6ubuntu1 amd64 +libpcap0.8 1.8.1-6ubuntu1.18.04.1 amd64 -libpython2.7 2.7.15-4ubuntu4~18.04.2 amd64 -libpython2.7-minimal 2.7.15-4ubuntu4~18.04.2 amd64 -libpython2.7-stdlib 2.7.15-4ubuntu4~18.04.2 amd64 +libpython2.7 2.7.17-1~18.04 amd64 +libpython2.7-minimal 2.7.17-1~18.04 amd64 +libpython2.7-stdlib 2.7.17-1~18.04 amd64 -libpython3.6 3.6.8-1~18.04.3 amd64 -libpython3.6-minimal 3.6.8-1~18.04.3 amd64 -libpython3.6-stdlib 3.6.8-1~18.04.3 amd64 -libquadmath0 8.3.0-6ubuntu1~18.04.1 amd64 +libpython3.6 3.6.9-1~18.04 amd64 +libpython3.6-minimal 3.6.9-1~18.04 amd64 +libpython3.6-stdlib 3.6.9-1~18.04 amd64 +libquadmath0 8.4.0-1ubuntu1~18.04 amd64 -libsasl2-2 2.1.27~101-g0780600+dfsg-3ubuntu2 amd64 -libsasl2-modules 2.1.27~101-g0780600+dfsg-3ubuntu2 amd64 -libsasl2-modules-db 2.1.27~101-g0780600+dfsg-3ubuntu2 amd64 +libsasl2-2 2.1.27~101-g0780600+dfsg-3ubuntu2.1 amd64 +libsasl2-modules 2.1.27~101-g0780600+dfsg-3ubuntu2.1 amd64 +libsasl2-modules-db 2.1.27~101-g0780600+dfsg-3ubuntu2.1 amd64 -libsmartcols1 2.31.1-0.4ubuntu3.4 amd64 +libsmartcols1 2.31.1-0.4ubuntu3.6 amd64 -libsqlite3-0 3.22.0-1ubuntu0.1 amd64 -libss2 1.44.1-1ubuntu1.2 amd64 +libsqlite3-0 3.22.0-1ubuntu0.3 amd64 +libss2 1.44.1-1ubuntu1.3 amd64 -libstdc++6 8.3.0-6ubuntu1~18.04.1 amd64 -libstrongswan 5.6.2-1ubuntu2.4 amd64 -libstrongswan-standard-plugins 5.6.2-1ubuntu2.4 amd64 +libstdc++6 8.4.0-1ubuntu1~18.04 amd64 +libstrongswan 5.6.2-1ubuntu2.5 amd64 +libstrongswan-standard-plugins 5.6.2-1ubuntu2.5 amd64 -libsystemd0 237-3ubuntu10.31 amd64 +libsystemd0 237-3ubuntu10.39 amd64 -libtiff5 4.0.9-5ubuntu0.2 amd64 +libtiff5 4.0.9-5ubuntu0.3 amd64 -libtsan0 8.3.0-6ubuntu1~18.04.1 amd64 -libubsan0 7.4.0-1ubuntu1~18.04.1 amd64 -libudev1 237-3ubuntu10.31 amd64 +libtsan0 8.4.0-1ubuntu1~18.04 amd64 +libubsan0 7.5.0-3ubuntu1~18.04 amd64 +libudev1 237-3ubuntu10.39 amd64 -libuuid1 2.31.1-0.4ubuntu3.4 amd64 +libuuid1 2.31.1-0.4ubuntu3.6 amd64 -libxml2 2.9.4+dfsg1-6.1ubuntu1.2 amd64 +libxml2 2.9.4+dfsg1-6.1ubuntu1.3 amd64 -libxslt1.1 1.1.29-5ubuntu0.1 amd64 +libxslt1.1 1.1.29-5ubuntu0.2 amd64 -linux-base 4.5ubuntu1 all -linux-firmware 1.173.9 all +linux-base 4.5ubuntu1.1 all +linux-firmware 1.173.17 all -linux-libc-dev 4.15.0-65.74 amd64 +linux-libc-dev 4.15.0-96.97 amd64 -mount 2.31.1-0.4ubuntu3.4 amd64 +mount 2.31.1-0.4ubuntu3.6 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-client-5.7 5.7.29-0ubuntu0.18.04.1 amd64 +mysql-client-core-5.7 5.7.29-0ubuntu0.18.04.1 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 +mysql-server 5.7.29-0ubuntu0.18.04.1 all +mysql-server-5.7 5.7.29-0ubuntu0.18.04.1 amd64 +mysql-server-core-5.7 5.7.29-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 +php7.2 7.2.24-0ubuntu0.18.04.3 all +php7.2-bz2 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-cli 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-common 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-curl 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-gd 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-intl 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-json 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-mbstring 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-mysql 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-opcache 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-readline 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-xml 7.2.24-0ubuntu0.18.04.3 amd64 +php7.2-zip 7.2.24-0ubuntu0.18.04.3 amd64 -python-apt-common 1.6.4 all +python-apt-common 1.6.5ubuntu0.2 all -python2.7 2.7.15-4ubuntu4~18.04.2 amd64 -python2.7-minimal 2.7.15-4ubuntu4~18.04.2 amd64 +python2.7 2.7.17-1~18.04 amd64 +python2.7-minimal 2.7.17-1~18.04 amd64 -python3-apt 1.6.4 amd64 +python3-apt 1.6.5ubuntu0.2 amd64 -python3-distupgrade 1:18.04.34 all +python3-distupgrade 1:18.04.37 all -python3-gdbm 3.6.8-1~18.04 amd64 +python3-gdbm 3.6.9-1~18.04 amd64 -python3-lib2to3 3.6.8-1~18.04 all +python3-lib2to3 3.6.9-1~18.04 all -python3.6 3.6.8-1~18.04.3 amd64 -python3.6-minimal 3.6.8-1~18.04.3 amd64 +python3.6 3.6.9-1~18.04 amd64 +python3.6-minimal 3.6.9-1~18.04 amd64 -rsync 3.1.2-2.1ubuntu1 amd64 +rsync 3.1.2-2.1ubuntu1.1 amd64 -sa-compile 3.4.2-0ubuntu0.18.04.1 all +sa-compile 3.4.2-0ubuntu0.18.04.4 all -spamassassin 3.4.2-0ubuntu0.18.04.1 all -spamc 3.4.2-0ubuntu0.18.04.1 amd64 +spamassassin 3.4.2-0ubuntu0.18.04.4 all +spamc 3.4.2-0ubuntu0.18.04.4 amd64 -strongswan 5.6.2-1ubuntu2.4 all -strongswan-charon 5.6.2-1ubuntu2.4 amd64 -strongswan-libcharon 5.6.2-1ubuntu2.4 amd64 -strongswan-starter 5.6.2-1ubuntu2.4 amd64 -sudo 1.8.21p2-3ubuntu1 amd64 -systemd 237-3ubuntu10.31 amd64 -systemd-sysv 237-3ubuntu10.31 amd64 +strongswan 5.6.2-1ubuntu2.5 all +strongswan-charon 5.6.2-1ubuntu2.5 amd64 +strongswan-libcharon 5.6.2-1ubuntu2.5 amd64 +strongswan-starter 5.6.2-1ubuntu2.5 amd64 +sudo 1.8.21p2-3ubuntu1.2 amd64 +systemd 237-3ubuntu10.39 amd64 +systemd-sysv 237-3ubuntu10.39 amd64 -tcpdump 4.9.2-3 amd64 +tcpdump 4.9.3-0ubuntu0.18.04.1 amd64 -ubuntu-minimal 1.417.3 amd64 -ubuntu-release-upgrader-core 1:18.04.34 all -ubuntu-standard 1.417.3 amd64 +ubuntu-minimal 1.417.4 amd64 +ubuntu-release-upgrader-core 1:18.04.37 all +ubuntu-standard 1.417.4 amd64 -udev 237-3ubuntu10.31 amd64 +udev 237-3ubuntu10.39 amd64 -util-linux 2.31.1-0.4ubuntu3.4 amd64 -uuid-runtime 2.31.1-0.4ubuntu3.4 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 +util-linux 2.31.1-0.4ubuntu3.6 amd64 +uuid-runtime 2.31.1-0.4ubuntu3.6 amd64 +vim 2:8.0.1453-1ubuntu1.3 amd64 +vim-common 2:8.0.1453-1ubuntu1.3 all +vim-runtime 2:8.0.1453-1ubuntu1.3 all +vim-tiny 2:8.0.1453-1ubuntu1.3 amd64 -webmin 1.930 all +webmin 1.941 all -xxd 2:8.0.1453-1ubuntu1.1 amd64 +xxd 2:8.0.1453-1ubuntu1.3 amd64 --- apparmor.d/usr.sbin.mysqld | 9 ++++ dhcp/dhclient-enter-hooks.d/resolved | 13 ++++- issue | 2 +- issue.net | 2 +- lsb-release | 2 +- php/7.2/cli/php.ini | 5 -- update-motd.d/50-motd-news | 18 +++++-- webmin/acl/config | 2 +- webmin/adsl-client/config | 8 +-- webmin/apache/config | 34 ++++++------ webmin/apache/httpd-info | 4 +- webmin/at/config | 2 +- webmin/backup-config/config | 2 +- webmin/bacula-backup/config | 14 ++--- webmin/bandwidth/config | 2 +- webmin/bind8/config | 70 ++++++++++++------------ webmin/cluster-passwd/config | 4 +- webmin/cluster-useradmin/config | 12 ++--- webmin/cluster-usermin/config | 2 +- webmin/config | 42 +++++++-------- webmin/cpan/config | 6 +-- webmin/cron/config | 38 ++++++------- webmin/custom/config | 4 +- webmin/dhcpd/config | 18 +++---- webmin/dovecot/config | 4 +- webmin/exim/config | 10 ++-- webmin/exports/config | 2 +- webmin/fail2ban/config | 4 +- webmin/fetchmail/config | 6 +-- webmin/filter/config | 8 +-- webmin/firewall/config | 6 +-- webmin/firewall6/config | 4 +- webmin/fsdump/config | 10 ++-- webmin/grub/config | 2 +- webmin/heartbeat/config | 20 +++---- webmin/htaccess-htpasswd/config | 10 ++-- webmin/idmapd/config | 2 +- webmin/inetd/config | 22 ++++---- webmin/init/config | 24 ++++----- webmin/ipfilter/config | 10 ++-- webmin/ipfw/config | 6 +-- webmin/ipsec/config | 8 +-- webmin/iscsi-client/config | 4 +- webmin/iscsi-server/config | 8 +-- webmin/iscsi-target/config | 8 +-- webmin/iscsi-tgtd/config | 4 +- webmin/jabber/config | 6 +-- webmin/ldap-client/config | 2 +- webmin/ldap-server/config | 10 ++-- webmin/ldap-useradmin/config | 32 +++++------ webmin/logrotate/config | 4 +- webmin/lpadmin/config | 24 ++++----- webmin/lvm/config | 2 +- webmin/mailboxes/config | 80 ++++++++++++++-------------- webmin/man/config | 10 ++-- webmin/miniserv.conf | 2 +- webmin/mon/config | 8 +-- webmin/mount/config | 12 +++-- webmin/mysql/config | 30 +++++------ webmin/mysql/version | 2 +- webmin/net/config | 2 +- webmin/nis/config | 2 +- webmin/openslp/config | 6 +-- webmin/pam/config | 4 +- webmin/pap/config | 8 +-- webmin/passwd/config | 2 +- webmin/postfix/config | 39 +++++++------- webmin/postgresql/config | 34 ++++++------ webmin/ppp-client/config | 4 +- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 12 ++--- webmin/proc/config | 6 +-- webmin/procmail/config | 2 +- webmin/proftpd/config | 10 ++-- webmin/qmailadmin/config | 16 +++--- webmin/quota/config | 36 ++++++------- webmin/samba/config | 24 ++++----- webmin/sarg/config | 4 +- webmin/sendmail/config | 46 ++++++++-------- webmin/servers/config | 12 ++--- webmin/shell/config | 2 +- webmin/shorewall/config | 4 +- webmin/shorewall6/config | 6 +-- webmin/smart-status/config | 4 +- webmin/software/config | 2 +- webmin/spam/config | 12 ++--- webmin/squid/config | 28 +++++----- webmin/sshd/config | 14 ++--- webmin/status/config | 16 +++--- webmin/syslog-ng/config | 6 +-- webmin/syslog/config | 28 +++++----- webmin/system-status/config | 2 +- webmin/tcpwrappers/config | 2 +- webmin/telnet/config | 4 +- webmin/time/config | 2 +- webmin/updown/config | 4 +- webmin/useradmin/config | 58 ++++++++++---------- webmin/usermin/config | 6 +-- webmin/version | 2 +- webmin/webalizer/config | 4 +- webmin/webmin/config | 15 +++--- webmin/wuftpd/config | 8 +-- webmin/xinetd/config | 4 +- 103 files changed, 629 insertions(+), 598 deletions(-) diff --git a/apparmor.d/usr.sbin.mysqld b/apparmor.d/usr.sbin.mysqld index 2619e7d39..f9c91bbcc 100644 --- a/apparmor.d/usr.sbin.mysqld +++ b/apparmor.d/usr.sbin.mysqld @@ -10,9 +10,13 @@ #include # Allow system resource access + /proc/*/status r, /sys/devices/system/cpu/ r, + /sys/devices/system/node/ r, + /sys/devices/system/node/** r, capability sys_resource, capability dac_override, + capability dac_read_search, capability setuid, capability setgid, @@ -33,6 +37,9 @@ /run/mysqld/mysqld.sock rw, /run/mysqld/mysqld.sock.lock rw, +# Allow systemd notify messages + /{,var/}run/systemd/notify w, + # Allow execution of server binary /usr/sbin/mysqld mr, /usr/sbin/mysqld-debug mr, @@ -63,6 +70,8 @@ /var/log/mysql/ r, /var/log/mysql/** rw, +# Allow read access to OpenSSL config + /etc/ssl/openssl.cnf r, # Site-specific additions and overrides. See local/README for details. #include } diff --git a/dhcp/dhclient-enter-hooks.d/resolved b/dhcp/dhclient-enter-hooks.d/resolved index b504f5b82..ebbb31fb5 100755 --- a/dhcp/dhclient-enter-hooks.d/resolved +++ b/dhcp/dhclient-enter-hooks.d/resolved @@ -28,6 +28,9 @@ if [ -x /lib/systemd/systemd-resolved ] ; then fi statedir="/run/systemd/resolved.conf.d" mkdir -p $statedir + + oldstate="$(mktemp)" + md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf > $oldstate 2> /dev/null if [ -n "$new_domain_name_servers" ] ; then cat <$statedir/isc-dhcp-v4-$interface.conf [Resolve] @@ -50,7 +53,15 @@ Domains=$new_dhcp6_domain_search EOF fi fi - systemctl try-reload-or-restart systemd-resolved.service + + newstate="$(mktemp)" + md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf > $newstate 2> /dev/null + if ! cmp $oldstate $newstate; then + systemctl try-reload-or-restart systemd-resolved.service + fi + + rm $oldstate + rm $newstate } ;; diff --git a/issue b/issue index 5c068353e..9a57861ce 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Ubuntu 18.04.3 LTS \n \l +Ubuntu 18.04.4 LTS \n \l diff --git a/issue.net b/issue.net index 28d9296c2..392957e7a 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Ubuntu 18.04.3 LTS +Ubuntu 18.04.4 LTS diff --git a/lsb-release b/lsb-release index fec85e423..a1aca571a 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.3 LTS" +DISTRIB_DESCRIPTION="Ubuntu 18.04.4 LTS" diff --git a/php/7.2/cli/php.ini b/php/7.2/cli/php.ini index b1dbc94a2..fe7826226 100644 --- a/php/7.2/cli/php.ini +++ b/php/7.2/cli/php.ini @@ -153,11 +153,6 @@ ; Development Value: Off ; Production Value: Off -; track_errors -; Default Value: Off -; Development Value: On -; Production Value: Off - ; variables_order ; Default Value: "EGPCS" ; Development Value: "GPCS" diff --git a/update-motd.d/50-motd-news b/update-motd.d/50-motd-news index e031cdf1f..08d7f0dc2 100755 --- a/update-motd.d/50-motd-news +++ b/update-motd.d/50-motd-news @@ -67,7 +67,8 @@ fi # Generate our temp files, clean up when done NEWS=$(mktemp) || exit 1 ERR=$(mktemp) || exit 1 -trap "rm -f $NEWS $ERR" HUP INT QUIT ILL TRAP KILL BUS TERM +CLOUD=$(mktemp) || exit 1 +trap "rm -f $NEWS $ERR $CLOUD" HUP INT QUIT ILL TRAP KILL BUS TERM # Construct a user agent, similar to Firefox/Chrome/Safari/IE to # ensure a proper, tailored, accurate message of the day @@ -84,13 +85,24 @@ codename="$DISTRIB_CODENAME" platform="$(uname -o)/$(uname -r)/$(uname -m)" arch="$(uname -m)" cpu="$(grep -m1 "^model name" /proc/cpuinfo | sed -e "s/.*: //" -e "s:\s\+:/:g")" +cloud_id="unknown" +if [ -x /usr/bin/cloud-id ]; then + /usr/bin/cloud-id > "$CLOUD" 2>/dev/null + if [ $? -eq 0 ]; then + # sanitize it a bit, just in case + cloud_id=$(cut -c -40 "${CLOUD}" | tr -c -d '[:alnum:]') + if [ -z "${cloud_id}" ]; then + cloud_id="unknown" + fi + fi +fi # Some messages may only be pertinent before or after some amount of uptime read up idle < /proc/uptime uptime="uptime/$up/$idle" # Piece together the user agent -USER_AGENT="curl/$curl_ver $lsb $platform $cpu $uptime" +USER_AGENT="curl/$curl_ver $lsb $platform $cpu $uptime cloud_id/$cloud_id" # Loop over any configured URLs for u in $URLS; do @@ -119,5 +131,5 @@ for u in $URLS; do : > "$CACHE" fi done -rm -f "$NEWS" "$ERR" +rm -f "$NEWS" "$ERR" "$CLOUD" exit 0 diff --git a/webmin/acl/config b/webmin/acl/config index ee9b4c16b..9c0a53994 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ display=1 -ssleay=/usr/bin/openssl order=0 +ssleay=/usr/bin/openssl diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index 605008979..35ecd105a 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ +pppoe_conf=/etc/ppp/pppoe.conf +conf_style=0 pppoe_cmd=pppoe +pap_file=/etc/ppp/pap-secrets +start_cmd=adsl-start status_cmd=adsl-status stop_cmd=adsl-stop -conf_style=0 -pppoe_conf=/etc/ppp/pppoe.conf -start_cmd=adsl-start -pap_file=/etc/ppp/pap-secrets diff --git a/webmin/apache/config b/webmin/apache/config index cd3cde790..126cec138 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -test_apachectl=1 -test_always=0 +apachectl_path=/usr/sbin/apache2ctl +show_order=0 allow_virtualmin=0 -httpd_conf=/etc/apache2/apache2.conf -mime_types=/etc/apache2/mime.types -max_servers=100 -srm_conf=/etc/apache2/srm.conf httpd_path=/usr/sbin/apache2 -link_dir=/etc/apache2/sites-enabled +start_cmd=/etc/init.d/apache2 start show_list=0 -httpd_dir=/etc/apache2 defines_file=/etc/apache2/envvars -auto_mods=1 -test_manual=0 -show_names=0 -start_cmd=/etc/init.d/apache2 start -show_order=0 -access_conf=/etc/apache2/access.conf +test_config=1 +test_always=0 virt_file=/etc/apache2/sites-available +test_manual=0 +httpd_dir=/etc/apache2 +httpd_conf=/etc/apache2/apache2.conf defines_name=APACHE_ARGUMENTS -test_config=1 -stop_cmd=/etc/init.d/apache2 stop -apachectl_path=/usr/sbin/apache2ctl +srm_conf=/etc/apache2/srm.conf apply_cmd=/usr/sbin/apache2ctl graceful +stop_cmd=/etc/init.d/apache2 stop +show_names=0 +mime_types=/etc/apache2/mime.types +auto_mods=1 +test_apachectl=1 +link_dir=/etc/apache2/sites-enabled +access_conf=/etc/apache2/access.conf +max_servers=100 diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index 632666a23..80406de72 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,4 +1,4 @@ -time=1563300885 +time=1566420201 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd -version=2.429 +version=2.441 diff --git a/webmin/at/config b/webmin/at/config index abf2f6455..6f83c111c 100644 --- a/webmin/at/config +++ b/webmin/at/config @@ -1,2 +1,2 @@ -at_dir=/var/spool/cron/atjobs at_style=linux +at_dir=/var/spool/cron/atjobs diff --git a/webmin/backup-config/config b/webmin/backup-config/config index c13b50ad6..7f0472b86 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -webmin_subs=0 apply=1 date_subs=0 +webmin_subs=0 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index 19a63d752..dbc46b717 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -pass= -bls=bls -db=bacula -driver=Pg -wait=1 apply=1 showdirs=0 -init_start=0 -user=bacula btape=btape bacula_dir=/etc/bacula +db=bacula +wait=1 +init_start=0 +pass= +driver=Pg +bls=bls +user=bacula bextract=bextract diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config index da72c415d..db38d7751 100644 --- a/webmin/bandwidth/config +++ b/webmin/bandwidth/config @@ -1,2 +1,2 @@ -bandwidth_log=/var/log/bandwidth firewall_system=firewall +bandwidth_log=/var/log/bandwidth diff --git a/webmin/bind8/config b/webmin/bind8/config index cc8a44e88..25800a285 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,45 +1,45 @@ -rev_must=0 -show_list=0 ipv6_mode=1 -keygen=dnssec-keygen -spf_record=0 -rndc_cmd=rndc -updserial_on=1 -whois_cmd=whois +show_list=0 +short_names=0 +zones_file=/etc/bind/named.conf.local +support_aaaa=1 +allow_comments=0 +by_view=0 +forwardzonefilename_format=ZONE.hosts +signzone=dnssec-signzone +slave_dir=/var/lib/bind +master_dir=/var/lib/bind +updserial_man=1 +rndcconf_cmd=rndc-confgen checkzone=named-checkzone -ndc_cmd=ndc +relative_paths=0 checkconf=named-checkconf -allow_comments=0 -zones_file=/etc/bind/named.conf.local -master_ttl=1 allow_wild=1 -soa_style=0 -updserial_man=1 -allow_long=0 -force_random=0 -rndc_conf=/etc/bind/rndc.conf +rev_must=0 +allow_underscore=1 rev_def=0 -soa_start=0 -relative_paths=0 +force_random=0 other_slaves=1 -named_conf=/etc/bind/named.conf +pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid +soa_style=0 no_pid_chroot=0 -max_zones=50 -by_view=0 -support_aaaa=1 -allow_underscore=1 -largezones=0 -rndcconf_cmd=rndc-confgen -records_order=0 -confirm_zone=1 +soa_start=0 +rndc_cmd=rndc +spf_record=0 +allow_long=0 +whois_cmd=whois +named_conf=/etc/bind/named.conf +rndc_conf=/etc/bind/rndc.conf updserial_def=0 -short_names=0 -no_chroot=0 -confirm_rec=0 -pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid -forwardzonefilename_format=ZONE.hosts -slave_dir=/var/lib/bind -signzone=dnssec-signzone -master_dir=/var/lib/bind named_path=/usr/sbin/named +largezones=0 +max_zones=50 reversezonefilename_format=ZONE.rev +keygen=dnssec-keygen +confirm_zone=1 +master_ttl=1 +confirm_rec=0 +records_order=0 +no_chroot=0 +ndc_cmd=ndc +updserial_on=1 diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 04110de95..02cf5b24f 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ -max_users=200 -input_type=0 sort_mode=0 +input_type=0 +max_users=200 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index 287846959..ec10edc0b 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -conf_allow_refresh=1 -conf_host_links=1 -table_mode=0 -conf_allow_sync=1 -conf_add_group=1 conf_find_group=1 +conf_add_user=1 conf_find_user=1 +conf_allow_refresh=1 sort_mode=0 -conf_add_user=1 +table_mode=0 +conf_host_links=1 +conf_add_group=1 +conf_allow_sync=1 diff --git a/webmin/cluster-usermin/config b/webmin/cluster-usermin/config index fd788cb1e..470eaee86 100644 --- a/webmin/cluster-usermin/config +++ b/webmin/cluster-usermin/config @@ -1,2 +1,2 @@ -table_mode=0 sort_mode=0 +table_mode=0 diff --git a/webmin/config b/webmin/config index b3bd4d191..f8e268896 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -real_os_version=18.04.1 +product=webmin +theme=authentic-theme +ld_env=LD_LIBRARY_PATH +showhost=0 lang_root=de.UTF-8 passwd_uindex=0 -product=webmin -showlogin=0 -webprefix= -passwd_cindex=2 -tempdelete_days=7 +by_view=0 +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +real_os_version=18.04.1 +passwd_file=/etc/shadow os_version=9.0 +passwd_cindex=2 sysinfo=0 -ld_env=LD_LIBRARY_PATH -by_view=0 -log=1 +md5pass=1 help_height= -passwd_mindex=4 -hostnamemode=0 -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +log=1 +showlogin=0 help_width= real_os_type=Ubuntu Linux -lang=en.UTF-8 -dateformat=dd/mon/yyyy os_type=debian-linux -theme=authentic-theme -showhost=0 -md5pass=1 -referers_none=1 -passwd_file=/etc/shadow -feedback_to= +dateformat=dd/mon/yyyy +lang=en.UTF-8 +webprefix= passwd_pindex=1 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +referers_none=1 +hostnamemode=0 hostnamedisplay= +feedback_to= +passwd_mindex=4 +tempdelete_days=7 nofeedbackcc=0 diff --git a/webmin/cpan/config b/webmin/cpan/config index 9f8e720af..379a2fc80 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -cpan=http://www.cpan.org/authors/id -packages=http://www.cpan.org/modules/02packages.details.txt.gz -incpackages=1 save_partial=0 incyum=1 +incpackages=1 +packages=http://www.cpan.org/modules/02packages.details.txt.gz refresh_days=30 +cpan=http://www.cpan.org/authors/id diff --git a/webmin/cron/config b/webmin/cron/config index da8002f96..0ae309681 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ -cron_deny_file=/var/spool/cron/deny -vixie_cron=1 -cron_delete_command=crontab -u USER -r -hourly_only=0 +max_jobs=100 +cron_allow_file=/var/spool/cron/allow +cron_dir=/var/spool/cron/crontabs match_user=1 -run_parts=run-parts show_run=0 -show_comment=0 -cron_deny_all=2 -cron_user_get_command=crontab -l -cron_edit_command=crontab -u USER -e +cronfiles_dir=/etc/cron.d max_len=80 -show_next=0 +cron_edit_command=crontab -u USER -e +cron_deny_all=2 +kill_subs=0 show_time=0 -max_jobs=100 -cron_user_edit_command=crontab -e -cron_input=1 -cronfiles_dir=/etc/cron.d -match_mode=0 +cron_user_delete_command=crontab -r +vixie_cron=1 system_crontab=/etc/crontab -cron_allow_file=/var/spool/cron/allow +run_parts=run-parts +match_mode=0 +show_next=0 +cron_deny_file=/var/spool/cron/deny +cron_input=1 +show_comment=0 +cron_delete_command=crontab -u USER -r +hourly_only=0 +cron_user_edit_command=crontab -e +cron_user_get_command=crontab -l cron_get_command=crontab -u USER -l -cron_dir=/var/spool/cron/crontabs -kill_subs=0 -cron_user_delete_command=crontab -r diff --git a/webmin/custom/config b/webmin/custom/config index 1a8539208..6d0b22ef3 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -params_cmd=0 display_mode=0 -params_file=0 +params_cmd=0 columns=2 +params_file=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index 6355c2b1a..6661b6a64 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,16 +1,16 @@ +pid_file=/var/run/dhcpd.pid +lease_tz=0 +restart_cmd=service isc-dhcp-server restart +dhcpd_conf=/etc/dhcp/dhcpd.conf +lease_sort=0 lease_file=/var/lib/dhcp/dhcpd.leases interfaces_type=debian -group_name=0 -dhcpd_conf=/etc/dhcp/dhcpd.conf stop_cmd=service isc-dhcp-server stop -pid_file=/var/run/dhcpd.pid -start_cmd=service isc-dhcp-server start -lease_sort=0 +dhcpd_path=/usr/sbin/dhcpd +group_name=0 +dhcpd_nocols=5 show_ip=0 display_max=100 desc_name=0 -restart_cmd=service isc-dhcp-server restart -dhcpd_path=/usr/sbin/dhcpd -dhcpd_nocols=5 show_mac=0 -lease_tz=0 +start_cmd=service isc-dhcp-server start diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 139214874..bc17fdee6 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ -init_script=dovecot -pid_file=/var/run/dovecot/master.pid dovecot=/usr/sbin/dovecot +init_script=dovecot dovecot_config=/etc/dovecot/dovecot.conf +pid_file=/var/run/dovecot/master.pid diff --git a/webmin/exim/config b/webmin/exim/config index 858db69fb..f4f97f8d4 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_dir=/etc/exim4 -exim_virt_dir=/etc/exim4/aliases -mail_system=1 -exim_aliasfileext= +exim_mail_file=Maildir exim_addrfile=/etc/exim4/email-addresses exim_dbmfile=/etc/exim4/local_domains -exim_mail_file=Maildir exim_dbmext=.dbm +mail_system=1 +exim_dir=/etc/exim4 +exim_virt_dir=/etc/exim4/aliases +exim_aliasfileext= diff --git a/webmin/exports/config b/webmin/exports/config index d23f7b7df..7d1a41d0a 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi -exports_file=/etc/exports apply_cmd=exportfs -r +exports_file=/etc/exports diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index 4851099d2..73862c6ef 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ -init_script=fail2ban server_cmd=/usr/bin/fail2ban-server -config_dir=/etc/fail2ban client_cmd=/usr/bin/fail2ban-client +config_dir=/etc/fail2ban +init_script=fail2ban diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 5998414b4..fd29d2563 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ -daemon_user=root -config_file= -max_users=400 fetchmail_path=fetchmail pid_file=/var/run/fetchmail.pid +max_users=400 view_mode=0 +config_file= +daemon_user=root diff --git a/webmin/filter/config b/webmin/filter/config index 5bfe1ca4f..b9a76acb0 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ -warn_procmail=1 reply_force=0 -forward_procmail=0 -virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl -alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases virtualmin_config=/etc/webmin/virtual-server +alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases +virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl +warn_procmail=1 +forward_procmail=0 diff --git a/webmin/firewall/config b/webmin/firewall/config index 255f687e5..4623fa367 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -force_init=0 direct=0 -view_comment=0 -cluster_mode=1 +force_init=0 comment_mod=0 view_condition=1 +view_comment=0 +cluster_mode=1 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index d641b5002..f15543bd7 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ +view_comment=0 +cluster_mode=1 force_init=0 direct=0 -cluster_mode=1 -view_comment=0 comment_mod=0 view_condition=1 diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 4de167a3e..8f4ac3250 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -date_subs=0 -nonewtape=0 -simple_sched=0 +always_tar=0 webmin_subs=0 -run_mode=0 +simple_sched=0 error_email=0 -always_tar=0 +run_mode=0 +nonewtape=0 +date_subs=0 diff --git a/webmin/grub/config b/webmin/grub/config index f6464eb2a..2bb2e4e49 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ -install=(hd0) grub_path=grub +install=(hd0) menu_file=/boot/grub/menu.lst diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 33576bd81..e992c5bf4 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -req_resource_cmd=/usr/lib/heartbeat/req_resource -authkeys= -ha_dir=/etc/ha.d -apply_cmd=/etc/init.d/heartbeat reload -pid_file=/var/run/heartbeat.pid serials=/dev/ttyS* -stop_cmd=/etc/init.d/heartbeat stop -start_cmd=/etc/init.d/heartbeat start -resource_d= +req_resource_cmd=/usr/lib/heartbeat/req_resource ha_cf= +pid_file=/var/run/heartbeat.pid +ha_dir=/etc/ha.d +heartbeat=/usr/lib/heartbeat/heartbeat +haresources= alt_haresources=/usr/share/doc/packages/heartbeat/haresources alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf -haresources= -heartbeat=/usr/lib/heartbeat/heartbeat +apply_cmd=/etc/init.d/heartbeat reload +start_cmd=/etc/init.d/heartbeat start alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +stop_cmd=/etc/init.d/heartbeat stop +resource_d= +authkeys= diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index 743ab31dd..0192b3d84 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -htgroups=.htgroups -sort=0 -md5=1 -digest=1 sha1=0 -htpasswd=.htpasswd htaccess=.htaccess +htgroups=.htgroups +md5=1 extra_directives= +sort=0 +htpasswd=.htpasswd +digest=1 diff --git a/webmin/idmapd/config b/webmin/idmapd/config index bbb774e0d..f25eeba97 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ +restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi idmapd_conf=/etc/idmapd.conf idmapd_path=/usr/sbin/rpc.idmapd -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 1da638e37..846366166 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -qm_mode=0 -tcpd_path=/usr/sbin/tcpd -rpc_inetd=1 -allow_file=/etc/hosts.allow +rpc_file=/etc/rpc services_file=/etc/services +inetd_conf_file=/etc/inetd.conf +rpc_protocols=tcp udp +restart_command=killall -HUP inetd deny_file=/etc/hosts.deny show_empty=1 -sort_mode=0 -rpc_file=/etc/rpc +ipv6=0 +qm_mode=0 extended_inetd=1 -rpc_protocols=tcp udp -display_max=100 -inetd_conf_file=/etc/inetd.conf +rpc_inetd=1 protocols_file=/etc/protocols -restart_command=killall -HUP inetd -ipv6=0 +display_max=100 +tcpd_path=/usr/sbin/tcpd +allow_file=/etc/hosts.allow +sort_mode=0 diff --git a/webmin/init/config b/webmin/init/config index 1942f4aeb..f3d2889ad 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -order=0 -atboot_product=webmin -init_info=1 -no_chkconfig=0 -expert=0 -init_dir=/etc/init.d -inittab_id=id order_digits=2 -status_check=0 +order=0 +reboot_command=reboot init_base=/etc/ +desc=1 +show_opts=0 sort_mode=0 +boot_levels=2 3 5 +init_dir=/etc/init.d soft_links=1 -show_opts=0 +expert=0 shutdown_command=poweroff -reboot_command=reboot -boot_levels=2 3 5 -desc=1 +no_chkconfig=0 +init_info=1 +inittab_id=id +atboot_product=webmin +status_check=0 diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 814076ea8..ade2c873b 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ +ipf_conf=/etc/ipf/ipf.conf +view_comment=0 view_condition=1 -ipnat=ipnat cluster_nat=1 -ipfstat=ipfstat -view_comment=0 -ipf=ipf +ipnat=ipnat ipnat_conf=/etc/ipf/ipnat.conf -ipf_conf=/etc/ipf/ipf.conf cluster_mode=0 +ipf=ipf +ipfstat=ipfstat diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 90975175e..b6c7797bf 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -version=2 -view_condition=1 ipfw=/sbin/ipfw -view_comment=0 view_counters=0 +view_comment=0 +version=2 cluster_mode=0 +view_condition=1 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 294051fa6..d04b28f0b 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ -policies_dir=/etc/ipsec.d/policies -restart_cmd=/etc/init.d/ipsec restart logfile=/var/log/messages secrets=/etc/ipsec.secrets +restart_cmd=/etc/init.d/ipsec restart +stop_cmd=/etc/init.d/ipsec stop start_cmd=/etc/init.d/ipsec start -file=/etc/ipsec.conf +policies_dir=/etc/ipsec.d/policies ipsec=/usr/sbin/ipsec -stop_cmd=/etc/init.d/ipsec stop +file=/etc/ipsec.conf diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 845b731f5..5b1468b01 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ iscsiadm=iscsiadm -initiator_file=/etc/iscsi/initiatorname.iscsi -iscsiiname=iscsi-iname config_file=/etc/iscsi/iscsid.conf +iscsiiname=iscsi-iname +initiator_file=/etc/iscsi/initiatorname.iscsi ifaces_dir=/var/lib/iscsi/ifaces init_name=open-iscsi diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 90c99023f..a44335b80 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -auths_file=/etc/iscsi/auths -iscsi_server=/usr/sbin/iscsi-target -init_name=netbsd-iscsi targets_file=/etc/iscsi/targets -pid_file=/var/run/iscsi-target.pid opts_file=/etc/sysconfig/netbsd-iscsi +init_name=netbsd-iscsi +auths_file=/etc/iscsi/auths +pid_file=/var/run/iscsi-target.pid +iscsi_server=/usr/sbin/iscsi-target diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index e5fe74070..04fc45a45 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ -pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid -targets_file=/etc/iet/targets.allow -opts_file=/etc/default/iscsitarget initiators_file=/etc/iet/initiators.allow +targets_file=/etc/iet/targets.allow +config_file=/etc/iet/ietd.conf ietadm=ietadm +opts_file=/etc/default/iscsitarget init_name=iscsitarget -config_file=/etc/iet/ietd.conf +pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 618c982d6..faa13c6fa 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ +init_name=tgtd config_file=/etc/tgt/targets.conf tgtadm=tgtadm -tgtd=tgtd tgtadmin=tgt-admin -init_name=tgtd +tgtd=tgtd diff --git a/webmin/jabber/config b/webmin/jabber/config index d86c944ad..74df33818 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -stop_cmd=/etc/init.d/jabberd stop -jabber_dir=/var/lib/jabber jabber_config=/etc/jabber/jabber.xml -start_cmd=/etc/init.d/jabberd start jabber_daemon=/usr/sbin/jabberd +jabber_dir=/var/lib/jabber +stop_cmd=/etc/init.d/jabberd stop +start_cmd=/etc/init.d/jabberd start diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 55d1e7111..d45286770 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ secret=/etc/ldap.secret -init_name=nslcd auth_ldap=/etc/ldap.conf +init_name=nslcd diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index 3ae2d913d..102a8a9da 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ -ldap_user=openldap -browse_max=100 -attr_count=6 -config_file=/etc/ldap/slapd.d schema_dir=/etc/ldap/schema +attr_count=6 init_name=slapd +ldap_user=openldap start_cmd=/etc/init.d/slapd start -stop_cmd=/etc/init.d/slapd stop apply_cmd=/etc/init.d/slapd restart +browse_max=100 slapd=slapd +stop_cmd=/etc/init.d/slapd stop +config_file=/etc/ldap/slapd.d diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 181576087..be99fe1a4 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ imap_class=SuSEeMailObject -given=0 -other_class=inetOrgPerson +mailfmt=0 +auth_ldap=/etc/ldap.conf imap_foldersep=. -samba_gclass=sambaGroup -shells=fixed,ldap,passwd,shells -membox=0 -alias_same=0 -imap_folders=old public sent-mail +person=1 +secmode=0 given_order=0 -multi_fields=0 -gecos=1 md5=0 -person=1 -samba_class=sambaSamAccount +given=0 quota_support=0 +imap_login=cyrus +ldap_tls=0 +alias_same=0 +shells=fixed,ldap,passwd,shells +imap_folders=old public sent-mail +samba_gclass=sambaGroup slappasswd=slappasswd +membox=0 +multi_fields=0 +samba_class=sambaSamAccount imap_def=0 +gecos=1 +other_class=inetOrgPerson samba_def=0 -ldap_tls=0 -auth_ldap=/etc/ldap.conf -mailfmt=0 -imap_login=cyrus -secmode=0 diff --git a/webmin/logrotate/config b/webmin/logrotate/config index d4738546a..b85fb9a25 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -logrotate=logrotate -sort_mode=0 add_file=/etc/logrotate.d logrotate_conf=/etc/logrotate.conf +logrotate=logrotate +sort_mode=0 diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index 9672cbdcd..d3aa39bb9 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ +iface_owner=lp:lp +model_path=/usr/share/foomatic/db /usr/share/ppd +start_cmd=/etc/init.d/cupsys start spool_dir=/var/spool/cups +driver_style=cups +show_jobs=0 sort_mode=0 -iface_perms=755 +gs_fontpath= +print_style=cups +display_mode=0 +smbclient_path=smbclient iface_arg= -model_path=/usr/share/foomatic/db /usr/share/ppd -show_jobs=0 +show_status=0 +iface_perms=755 +stop_cmd=/etc/init.d/cupsys stop gs_lib= -smbclient_path=smbclient -display_mode=0 gs_path=gs -print_style=cups -stop_cmd=/etc/init.d/cupsys stop -driver_style=cups -start_cmd=/etc/init.d/cupsys start -iface_owner=lp:lp -gs_fontpath= -show_status=0 diff --git a/webmin/lvm/config b/webmin/lvm/config index 63b743f61..a5ef0ed4d 100644 --- a/webmin/lvm/config +++ b/webmin/lvm/config @@ -1,2 +1,2 @@ -lvm_conf=/etc/lvm/lvm.conf show_table=0 +lvm_conf=/etc/lvm/lvm.conf diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index 07cd8222d..e529e1011 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -from_virtualmin=1 -view_html=0 -mail_dir=Maildir -date_fmt=dmy -noindex_hostname=0 +open_mode=0 +mail_system=3 +show_body=0 sync_perms=0700 -show_size_below=0 -show_sent=0 -sync_modify=1 +spam_report= no_crlf=0 -show_to=0 -show_count=0 -mail_file=Mailbox +show_delall=0 +no_mailer=0 +no_orig_ip=0 +perpage=20 +from_virtualmin=1 log_read=0 -mail_usermin=mail -arrows=1 column_count=4 +mail_dir=Maildir +spam_buttons=mail html_edit=0 -perpage=20 -sync_create=0 -mail_system=3 -no_orig_ip=0 -link_mode=0 -sort_mode=1 -no_mailer=0 -ignore_users= +show_count=0 +vpopmail_dir=/home/vpopmail wrap_width=80 -show_delall=0 -auto=1 -open_mode=0 -sync_delete=1 -delete_warn=y -top_buttons=2 -check_mod=1 -mail_style=0 +sig_file=* html_quote=0 -vpopmail_dir=/home/vpopmail -fwd_mode=0 +track_read=0 +mail_file=Mailbox +show_to=0 +mail_usermin=mail +auto=1 +arrows=1 +max_records=200 spam_del=0 -spam_buttons=mail +sync_delete=1 +noindex_hostname=0 +show_sent=0 +maildir_deleted=0 show_size=1 -show_mail=0 +date_fmt=dmy +sync_modify=1 +fwd_mode=0 show_unread=0 ignore_users_enabled=0 -sig_file=* -mailbox_user=.usermin/mailbox -show_body=0 -max_records=200 -maildir_deleted=0 -track_read=0 -spam_report= +show_mail=0 +delete_warn=y +link_mode=0 +check_mod=1 +ignore_users= +show_size_below=0 size_mode=1 +sort_mode=1 +sync_create=0 +top_buttons=2 +mail_style=0 +view_html=0 +mailbox_user=.usermin/mailbox diff --git a/webmin/man/config b/webmin/man/config index 882e20967..839486b77 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -list_cmd_sect=man -w SECTION PAGE -man_cmd=man PAGE +man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man +kernel_dir=/usr/src/linux/Documentation search_cmd=man -k PAGE +list_cmd_sect=man -w SECTION PAGE doc_dir=/usr/share/doc man2html_path=man2html -list_cmd=man -w PAGE -man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man +man_cmd=man PAGE man_cmd_sect=man SECTION PAGE -kernel_dir=/usr/src/linux/Documentation +list_cmd=man -w PAGE diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index 94a7a8167..c10ccb7c5 100644 --- a/webmin/miniserv.conf +++ b/webmin/miniserv.conf @@ -47,4 +47,4 @@ error_handler_404=404.cgi error_handler_401=401.cgi root=/usr/share/webmin mimetypes=/usr/share/webmin/mime.types -server=MiniServ/1.930 +server=MiniServ/1.941 diff --git a/webmin/mon/config b/webmin/mon/config index 0b621b587..668a74e0c 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -stop_cmd=/etc/init.d/mon stop -pid_file=/var/run/mon.pid -restart_cmd=/etc/init.d/mon restart start_cmd=/etc/init.d/mon start -mon_cgi=/var/www/cgi-bin/mon.cgi cfbasedir=/etc/mon +mon_cgi=/var/www/cgi-bin/mon.cgi +stop_cmd=/etc/init.d/mon stop monshow=/usr/bin/monshow +pid_file=/var/run/mon.pid +restart_cmd=/etc/init.d/mon restart diff --git a/webmin/mount/config b/webmin/mount/config index c0061e6c3..6969212c5 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,8 +1,10 @@ +show_used=1 +long_fstypes=1 nfs_check=1 -fstab_file=/etc/fstab -autofs_file=/etc/auto.master +auto_file=/etc/am-utils/amd.conf nmblookup_path=nmblookup -long_fstypes=1 +sort_mode=2 +fstab_file=/etc/fstab smbclient_path=smbclient -show_used=1 -auto_file=/etc/am-utils/amd.conf +sysinfo=1 +autofs_file=/etc/auto.master diff --git a/webmin/mysql/config b/webmin/mysql/config index bcc0afe1f..e2543c015 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ perpage=25 +nodbi=0 +mysqladmin=/usr/bin/mysqladmin +blob_mode=0 +max_text=1000 webmin_subs=0 -mysqlimport=/usr/bin/mysqlimport -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -mysqlshow=/usr/bin/mysqlshow -passwd_mode=0 -mysqldump=/usr/bin/mysqldump add_mode=1 +mysqldump=/usr/bin/mysqldump +nopwd=0 +passwd_mode=0 +login=root +stop_cmd=service mysql stop +mysql_data=/var/lib/mysql max_dbs=50 +mysqlshow=/usr/bin/mysqlshow +mysql=/usr/bin/mysql +mysqlimport=/usr/bin/mysqlimport date_subs=0 -mysqladmin=/usr/bin/mysqladmin +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf +mysql_libs=/usr/local/mysql/lib style=0 -mysql_data=/var/lib/mysql -nodbi=0 -max_text=1000 -blob_mode=0 -mysql=/usr/bin/mysql -stop_cmd=service mysql stop start_cmd=service mysql start -nopwd=0 -mysql_libs=/usr/local/mysql/lib access=*: * -login=root diff --git a/webmin/mysql/version b/webmin/mysql/version index 508a0a97e..a3dd50d25 100644 --- a/webmin/mysql/version +++ b/webmin/mysql/version @@ -1 +1 @@ -5.7.27 +5.7.29 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 f0960a861..4fa3f00cf 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ +securenets=/etc/ypserv.securenets client_conf=/etc/yp.conf max_size=100 manual_build=0 nsswitch_conf=/etc/nsswitch.conf -securenets=/etc/ypserv.securenets diff --git a/webmin/openslp/config b/webmin/openslp/config index d659ffb88..45244e969 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd_log=/var/log/slpd.log -slpd_conf=/etc/slp.conf slpd=/usr/sbin/slpd -slpd_pid=/var/run/slpd.pid slpd_reg=/etc/slp.reg +slpd_pid=/var/run/slpd.pid +slpd_conf=/etc/slp.conf +slpd_log=/var/log/slpd.log diff --git a/webmin/pam/config b/webmin/pam/config index b7523fbe0..02a4dd593 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 -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 lib_dirs=/lib/security /lib/*/security +ignore=README diff --git a/webmin/pap/config b/webmin/pap/config index 3f0a388e5..0b482a407 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ +mgetty=mgetty +ppp_options=/etc/ppp/options pppd=pppd +login_config=/etc/mgetty+sendfax/login.config encrypt_pass=0 serials=/dev/ttyS[0-9]* -login_config=/etc/mgetty+sendfax/login.config -mgetty=mgetty -dialin_config=/etc/mgetty+sendfax/dialin.config -ppp_options=/etc/ppp/options pap_file=/etc/ppp/pap-secrets +dialin_config=/etc/mgetty+sendfax/dialin.config diff --git a/webmin/passwd/config b/webmin/passwd/config index 2ab4c6af1..02cf5b24f 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -input_type=0 sort_mode=0 +input_type=0 max_users=200 diff --git a/webmin/postfix/config b/webmin/postfix/config index dcb5dc1c9..f55ebf09a 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,28 +1,29 @@ -postfix_super_command=/usr/sbin/postsuper +postfix_newaliases_command=/usr/bin/newaliases postfix_queue_command=postqueue -delete_warn=1 -mailq_count=0 -top_buttons=1 -postfix_config_command=/usr/sbin/postconf +postcat_cmd=/usr/sbin/postcat +ldap_doms=0 +postfix_control_command=/usr/sbin/postfix +perpage=20 +mailq_dir=/var/spool/postfix +postfix_lookup_table_command=/usr/sbin/postmap +postfix_super_command=/usr/sbin/postsuper fwd_mode=0 -delete_confirm=1 +mailq_count=0 +postfix_config_file=/etc/postfix/main.cf +mailq_cmd=postqueue -p +max_maps=100 postfix_aliases_table_command=/usr/sbin/postalias +delete_warn=1 +columns=2 +show_cmts=0 +wrap_width=80 index_check=1 mailq_sort=0 -ldap_doms=0 -mailq_dir=/var/spool/postfix -postfix_config_file=/etc/postfix/main.cf -postfix_lookup_table_command=/usr/sbin/postmap +prefix_cmts=0 postfix_master=/etc/postfix/master.cf -show_cmts=0 -perpage=20 -postfix_newaliases_command=/usr/bin/newaliases -postcat_cmd=/usr/sbin/postcat +top_buttons=1 +delete_confirm=1 max_records=200 -columns=2 -prefix_cmts=0 -wrap_width=80 sort_mode=0 -postfix_control_command=/usr/sbin/postfix -mailq_cmd=postqueue -p +postfix_config_command=/usr/sbin/postconf check_config=1 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 20298d3a9..ba6d5aa77 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -basedb=template1 -pid_file=/var/run/postmaster.pid -stop_cmd=/etc/init.d/postgresql* stop -start_cmd=/etc/init.d/postgresql* start login=postgres -simple_sched=0 -access=*: * +rstr_cmd=/usr/bin/pg_restore +plib= +stop_cmd=/etc/init.d/postgresql* stop +add_mode=1 +webmin_subs=0 nodbi=0 +pid_file=/var/run/postmaster.pid +perpage=25 +max_text=1000 access_own=0 blob_mode=0 -max_text=1000 -dump_cmd=/usr/bin/pg_dump -hba_conf=/etc/postgresql/*/main/pg_hba.conf -add_mode=1 -date_subs=0 +start_cmd=/etc/init.d/postgresql* start style=0 +simple_sched=0 +sameunix=1 +access=*: * +date_subs=0 +psql=/usr/bin/psql +basedb=template1 +hba_conf=/etc/postgresql/*/main/pg_hba.conf max_dbs=50 -webmin_subs=0 -plib= -rstr_cmd=/usr/bin/pg_restore -perpage=25 +dump_cmd=/usr/bin/pg_dump pass= -psql=/usr/bin/psql -sameunix=1 diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index e0a3e10a8..237c75238 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ -file=/etc/wvdial.conf -wvdialconf=wvdialconf wvdial=wvdial +wvdialconf=wvdialconf +file=/etc/wvdial.conf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 2c6a01656..3ec7d5973 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -pap_file=/etc/ppp/chap-secrets +pptp_options=/etc/ppp/options.pptp peers_dir=/etc/ppp/peers timeout=30 -pptp_options=/etc/ppp/options.pptp pptp=pptp +pap_file=/etc/ppp/chap-secrets diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index fc4a6af9e..dda8cd627 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -log_file=/var/log/messages -start_cmd=/etc/init.d/pptpd start +pid_file=/var/run/pptpd.pid pptp_ppp_options=/etc/ppp/pptpd-options +ppp_options=/etc/ppp/options +log_file=/var/log/messages file=/etc/pptpd.conf -stop_cmd=/etc/init.d/pptpd stop -pptpd=pptpd -pid_file=/var/run/pptpd.pid pap_file=/etc/ppp/chap-secrets -ppp_options=/etc/ppp/options +pptpd=pptpd +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 a48444fa6..b6a5b1d73 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -hide_self=1 ps_style=linux -base_ppid=1 -cut_length=80 +hide_self=1 default_mode=last +cut_length=80 +base_ppid=1 trace_java=0 diff --git a/webmin/procmail/config b/webmin/procmail/config index 5b184fd7c..71541070b 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -procmailrc=/etc/procmailrc includes=0 procmail=procmail +procmailrc=/etc/procmailrc diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 75293d199..8bf323978 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -proftpd_conf=/etc/proftpd/proftpd.conf pid_file=/var/run/proftpd.pid +ftpusers=/etc/ftpusers test_config=1 -stop_cmd=/etc/init.d/proftpd stop -start_cmd=/etc/init.d/proftpd start -test_manual=0 +proftpd_conf=/etc/proftpd/proftpd.conf proftpd_path=/usr/sbin/proftpd -ftpusers=/etc/ftpusers +test_manual=0 test_always=0 +start_cmd=/etc/init.d/proftpd start +stop_cmd=/etc/init.d/proftpd stop diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 88bbc2c1c..1965492b2 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -delete_warn=1 -mailq_count=0 index_min=1000000 mail_system=1 -qmail_dir=/var/qmail -columns=2 -max_records=200 -mail_dir= -perpage=20 mail_dir_qmail=Maildir -fwd_mode=0 +columns=2 mail_file=Mailbox mailq_sort=0 +mailq_count=0 sort_mode=0 +fwd_mode=0 +max_records=200 +perpage=20 +delete_warn=1 +qmail_dir=/var/qmail +mail_dir= diff --git a/webmin/quota/config b/webmin/quota/config index 959680641..de498b793 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ +block_size=1024 +block_mode=1 +pc_show=1 +group_copy_command=edquota -g -p +user_copy_command=edquota -u -p group_quotaoff_command=quotaoff -g -user_repquota_command=repquota -u -v -user_quota_command=quota -v -u -user_quotaoff_command=quotaoff -u group_repquota_command=repquota -g -v -pc_show=1 -block_size=1024 +user_quotaoff_command=quotaoff -u +user_setquota_command=setquota -u +display_max=100 +group_quota_command=quota -v -g +user_edquota_command=edquota -u +user_repquota_command=repquota -u -v +hide_uids=0 +group_quotaon_command=quotaon -g +quotacheck_command=quotacheck -u -g +sort_mode=0 +user_quotaon_command=quotaon -u group_edquota_command=edquota -g -group_setquota_command=setquota -g +user_quota_command=quota -v -u user_grace_command=edquota -u -t group_grace_command=edquota -g -t -group_quotaon_command=quotaon -g -user_quotaon_command=quotaon -u -user_edquota_command=edquota -u -hide_uids=0 -group_quota_command=quota -v -g -user_copy_command=edquota -u -p -user_setquota_command=setquota -u -display_max=100 -block_mode=1 -group_copy_command=edquota -g -p email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the allowed quota. ${USED} of disk space is being used, out of a maximum of ${QUOTA}. +group_setquota_command=setquota -g show_grace=1 -sort_mode=0 -quotacheck_command=quotacheck -u -g diff --git a/webmin/samba/config b/webmin/samba/config index ca1d06467..a62cbe4d3 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -pdbedit=/usr/bin/pdbedit -restart_cmd=service smbd restart ; service nmbd restart -sort_mode=0 -smb_passwd=/etc/samba/smbpasswd -net=/usr/bin/net samba_status_program=/usr/bin/smbstatus -samba_server=/usr/sbin/smbd -dont_convert=-499 -smb_conf=/etc/samba/smb.conf -run_from_inetd=0 samba_password_program=/usr/bin/smbpasswd stop_cmd=service smbd stop ; service nmbd stop +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +smb_conf=/etc/samba/smb.conf +restart_cmd=service smbd restart ; service nmbd restart smbgroupedit=/usr/bin/smbgroupedit -name_server=/usr/sbin/nmbd +pdbedit=/usr/bin/pdbedit +net=/usr/bin/net +run_from_inetd=0 +samba_server=/usr/sbin/smbd +dont_convert=-499 +smb_passwd=/etc/samba/smbpasswd +text_lists=0 start_cmd=service smbd start ; service nmbd start +name_server=/usr/sbin/nmbd swat=/usr/sbin/swat -text_lists=0 -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +sort_mode=0 diff --git a/webmin/sarg/config b/webmin/sarg/config index 75406f229..b9009faeb 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ +sarg_conf=/etc/sarg/sarg.conf +sarg=sarg naked=0 clear=1 -sarg=sarg -sarg_conf=/etc/sarg/sarg.conf diff --git a/webmin/sendmail/config b/webmin/sendmail/config index fc296c0f3..2dee60764 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -mail_dir=/var/spool/mail -mail_type=0 +perpage=20 makemap_path=makemap -top_buttons=1 -index_min=1000000 -delete_warn=1 -mailq_count=0 -mail_style=0 -show_to=0 -mailq_sort=0 -sendmail_command=/usr/lib/sendmail -bd -q1h mailq_show=Date,From,To,Size,Status -delete_confirm=1 -mail_file=mbox +sendmail_mc=/etc/mail/sendmail.mc +mailq_count=0 fwd_mode=0 -show_cmts=0 -perpage=20 +mail_dir=/var/spool/mail +sendmail_path=/usr/lib/sendmail +delete_warn=1 +sendmail_features=/usr/share/sendmail/cf +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +index_min=1000000 +mail_type=0 smrsh_dir=/etc/smrsh -columns=2 -max_records=200 +sendmail_cf=/etc/mail/sendmail.cf order_mail=0 -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -sendmail_mc=/etc/mail/sendmail.mc -track_read=0 -sendmail_path=/usr/lib/sendmail +top_buttons=1 +delete_confirm=1 +max_records=200 sort_mode=0 -prefix_cmts=0 -sendmail_cf=/etc/mail/sendmail.cf -sendmail_features=/usr/share/sendmail/cf +mail_style=0 +mail_file=mbox +sendmail_command=/usr/lib/sendmail -bd -q1h +track_read=0 +columns=2 +show_cmts=0 wrap_width=80 +show_to=0 +prefix_cmts=0 +mailq_sort=0 diff --git a/webmin/servers/config b/webmin/servers/config index 059122be3..c83bb1ba0 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -display_mode=0 -sort_mode=0 resolve=1 show_status=1 -capath=/usr/share/ca-certificates deflink=0 -deffast=2 -scan_time=5 -groups_dir=/etc/cluster/groups max_servers=100 +capath=/usr/share/ca-certificates +groups_dir=/etc/cluster/groups +scan_time=5 show_ip=0 +display_mode=0 +sort_mode=0 +deffast=2 diff --git a/webmin/shell/config b/webmin/shell/config index 044e158ce..4b3e40b52 100644 --- a/webmin/shell/config +++ b/webmin/shell/config @@ -1,3 +1,3 @@ -clear_envs=0 max_output=100000 max_runtime=86400 +clear_envs=0 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index fd9e91dba..4b00d0df0 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 -macros=/usr/share/shorewall config_dir=/etc/shorewall +macros=/usr/share/shorewall shorewall=shorewall +display_zone_descriptions=1 diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index fda327a1c..a8fbc76ed 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std +display_zone_descriptions=1 +macros=/usr/share/shorewall6 shorewall6=shorewall6 config_dir=/etc/shorewall6 -macros=/usr/share/shorewall6 -display_zone_descriptions=1 +actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std diff --git a/webmin/smart-status/config b/webmin/smart-status/config index 9d48dc774..8537d1b9b 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ +mode=1 +smartctl=smartctl ata=0 attribs=1 -smartctl=smartctl -mode=1 diff --git a/webmin/software/config b/webmin/software/config index 9476e6757..037d899f3 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ -apt_mode=0 update_system=apt +apt_mode=0 package_system=debian diff --git a/webmin/spam/config b/webmin/spam/config index 72aa0de5e..00d9a3148 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -sa_learn=sa-learn +spamassassin=spamassassin restart_cmd=/etc/init.d/spamassassin restart procmailrc=/etc/procmailrc -spamassassin=spamassassin -mode=0 -warn_procmail=1 -processes=spamd amavisd procmail_cmd=* -max_awl=200 addto=0 +max_awl=200 call_spam=1 local_cf=/etc/spamassassin/local.cf +sa_learn=sa-learn +mode=0 +warn_procmail=1 +processes=spamd amavisd diff --git a/webmin/squid/config b/webmin/squid/config index ab2c85a76..c5aa62c1a 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -squid_stop=service squid stop -cal_args=-aw -cal_fmt=w -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi -squid_conf=/etc/squid/squid.conf +squidclient=squidclient +squid_start=service squid start +sync_delete=0 +cache_dir=/var/spool/squid sync_create=0 +squid_stop=service squid stop sort_conf=0 -calamaris=calamaris +cal_all=1 +squid_restart=service squid reload +restart_pos=0 cal_max=50000 -squidclient=squidclient -sync_delete=0 -sync_modify=1 crypt_conf=0 log_dir=/var/log/squid squid_path=squid -squid_start=service squid start -squid_restart=service squid reload -cal_all=1 -restart_pos=0 -cache_dir=/var/spool/squid pid_file=/var/run/squid.pid +squid_conf=/etc/squid/squid.conf +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +cal_fmt=w +cal_args=-aw +calamaris=calamaris +sync_modify=1 diff --git a/webmin/sshd/config b/webmin/sshd/config index 18a67b9cd..324029402 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -sync_pass=0 -sync_auth=1 client_config=/etc/ssh/ssh_config -sync_create=0 -keygen_path=/usr/bin/ssh-keygen -sshd_config=/etc/ssh/sshd_config start_cmd=service ssh start stop_cmd=service ssh stop -sshd_path=/usr/sbin/sshd -pid_file=/var/run/sshd.pid sync_gnupg=0 +sshd_config=/etc/ssh/sshd_config +pid_file=/var/run/sshd.pid +sshd_path=/usr/sbin/sshd +keygen_path=/usr/bin/ssh-keygen +sync_create=0 +sync_pass=0 +sync_auth=1 diff --git a/webmin/status/config b/webmin/status/config index c30eef794..f66d812fc 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ +pager_cmd=sms_client +history_purge=30 history_show=50 -subject_mode=0 +snmp_trap=1.3.6.1.4.1.10000.1.1 columns=2 -index_status=1 +sysinfo=0 sysinfo_users=0 -pager_cmd=sms_client -output=0 sched_offset=0 -snmp_version=2 +index_status=1 +output=0 sort_mode=0 -sysinfo=0 -history_purge=30 -snmp_trap=1.3.6.1.4.1.10000.1.1 +snmp_version=2 +subject_mode=0 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index 0a9a3621e..183823e8a 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -lines=20 compressed=1 -start_cmd=/etc/init.d/syslog-ng start pid_file=/var/run/syslog-ng.pid -stop_cmd=/etc/init.d/syslog-ng stop syslogng_conf=/etc/syslog-ng/syslog-ng.conf syslogng_cmd=syslog-ng +stop_cmd=/etc/init.d/syslog-ng stop +start_cmd=/etc/init.d/syslog-ng start +lines=20 diff --git a/webmin/syslog/config b/webmin/syslog/config index 32de9fbaf..b13c46e14 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ +sync=1 pid_file=/var/run/rsyslogd.pid -others=1 -start_cmd=/usr/sbin/service rsyslog start -compressed=1 +restart_cmd=/usr/sbin/service rsyslog restart +tags=0 socket=0 -signal_cmd=/usr/sbin/service rsyslog restart -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -lines=20 -syslog_conf=/etc/rsyslog.conf -m4_path= m4_conf=0 -pipe=1 -sync=1 -syslogd=/usr/sbin/rsyslogd -tags=0 -pri_dir=1 +m4_path= pri_all=1 -restart_cmd=/usr/sbin/service rsyslog restart +facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 +signal_cmd=/usr/sbin/service rsyslog restart +syslogd=/usr/sbin/rsyslogd reverse=0 +pri_dir=1 +compressed=1 +others=1 +syslog_conf=/etc/rsyslog.conf +start_cmd=/usr/sbin/service rsyslog start +lines=20 +pipe=1 diff --git a/webmin/system-status/config b/webmin/system-status/config index c627a9fec..b6a7e4155 100644 --- a/webmin/system-status/config +++ b/webmin/system-status/config @@ -1,2 +1,2 @@ -collect_pkgs=1 collect_interval=5 +collect_pkgs=1 diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config index ddc301405..bfd2d19d4 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ -hosts_allow=/etc/hosts.allow inetd_services=0 +hosts_allow=/etc/hosts.allow hosts_deny=/etc/hosts.deny diff --git a/webmin/telnet/config b/webmin/telnet/config index 2fac6643c..1c52b035f 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ -sizemode=0 proxy=0 -no_test=0 +sizemode=0 detach=0 mode=1 +no_test=0 diff --git a/webmin/time/config b/webmin/time/config index 7e2af7f9f..791173895 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,5 +1,5 @@ lease=5 -seconds=1 timeserver_hardware=1 ntp_only=1 +seconds=1 zone_style=linux diff --git a/webmin/updown/config b/webmin/updown/config index abd9a9718..94e4fae55 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ -ddir=/ -user=root duser=root +ddir=/ dir=/ +user=root diff --git a/webmin/useradmin/config b/webmin/useradmin/config index 33325ad81..92d5d55f3 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -lock_string=* -from_files=0 -gshadow_file=/etc/gshadow -extra_real=0 -gid_mode=1 -passwd_same=0 -alias_check=0 passwd_file=/etc/passwd +md5=1 +home_base=/home +skip_md5=0 sort_mode=0 -base_uid=1000 +alias_check=0 +email_type=0 +display_mode=1 +new_user_group=0 delete_only=0 +home_style=0 +from_files=0 membox=0 -delete_root=0 -new_user_group=0 -base_gid=1000 -passwd_progmode=0 -homedir_perms=0755 -skip_md5=0 -display_max=400 -secmode=0 default_group=users -default_other=1 +user_files=/etc/skel +delete_root=0 +uid_mode=1 random_password=0 -passwd_stars=0 last_show=0 -md5=1 -group_file=/etc/group -display_mode=1 -uid_mode=1 empty_mode=0 -uid_calc=0 -shells=fixed,passwd,shells +gid_mode=1 +passwd_stars=0 +gshadow_file=/etc/gshadow +homedir_perms=0755 passwd_dict=0 -gid_calc=0 +extra_real=0 +secmode=0 +display_max=400 +uid_calc=0 selinux_con=user_u:object_r:user_home_dir_t +group_file=/etc/group +default_other=1 +lock_string=* +gid_calc=0 +passwd_progmode=0 shadow_file=/etc/shadow new_user_gid=0 -home_base=/home -home_style=0 -user_files=/etc/skel -email_type=0 +base_gid=1000 +passwd_same=0 +shells=fixed,passwd,shells +base_uid=1000 diff --git a/webmin/usermin/config b/webmin/usermin/config index 47e002a21..bfeafc2cb 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ uphour=4 +usermin_dir=/etc/usermin updays=1 -update=0 -cron_mode=0 upmissing=0 upshow=1 -usermin_dir=/etc/usermin +update=0 +cron_mode=0 diff --git a/webmin/version b/webmin/version index 1a26c46fd..064a8899d 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.930 +1.941 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index cf43b9406..8cbdb74f9 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ webalizer_conf=/etc/webalizer/webalizer.conf -auto=apache,squid,proftpd,wuftpd -naked=0 webalizer=/usr/bin/webalizer +auto=apache,squid,proftpd,wuftpd alt_conf=/etc/webalizer/webalizer.conf.sample skip_old=0 +naked=0 diff --git a/webmin/webmin/config b/webmin/webmin/config index 24873d8ee..0b4a758be 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,11 +1,12 @@ -upshow=1 -upmissing=0 -upmins=47 cron_mode=0 -updays=1 +upmins=47 +upmissing=0 last_version_number=1.900 -osdn=1 last_version_check=1549050668 -uphour=23 -update=0 warn_days=7 +updays=1 +upshow=1 +update=0 +osdn=1 +uphour=23 +letsencrypt_dns_wait=10 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index 8d537a05c..656682415 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ ftpconversions=/etc/wu-ftpd/ftpconversions -pid_file=/var/run/ftpd.pids-all -log_file=/var/log/xferlog ftpaccess=/etc/wu-ftpd/ftpaccess -ftpgroups=/etc/wu-ftpd/ftpgroups -ftphosts=/etc/wu-ftpd/ftphosts +log_file=/var/log/xferlog ftpd_path=/usr/sbin/wu-ftpd ftpusers=/etc/wu-ftpd/ftpusers +ftpgroups=/etc/wu-ftpd/ftpgroups +pid_file=/var/run/ftpd.pids-all +ftphosts=/etc/wu-ftpd/ftphosts diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 1ded43714..f54a90d98 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -xinetd_conf=/etc/xinetd.conf -lookup_servs=1 start_cmd=/etc/init.d/xinetd start +lookup_servs=1 pid_file=/var/run/xinetd.pid protocols_file=/etc/protocols +xinetd_conf=/etc/xinetd.conf -- 2.43.0