From d3aa2982fbef750703ec36ba8564e505fb15d249 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Wed, 20 Apr 2022 07:02:12 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -alsa-ucm-conf 1.2.2-1ubuntu0.12 all +alsa-ucm-conf 1.2.2-1ubuntu0.13 all -cpp-9 9.4.0-1ubuntu1~20.04 amd64 +cpp-9 9.4.0-1ubuntu1~20.04.1 amd64 -g++-9 9.4.0-1ubuntu1~20.04 amd64 +g++-9 9.4.0-1ubuntu1~20.04.1 amd64 -gcc-9 9.4.0-1ubuntu1~20.04 amd64 -gcc-9-base 9.4.0-1ubuntu1~20.04 amd64 +gcc-9 9.4.0-1ubuntu1~20.04.1 amd64 +gcc-9-base 9.4.0-1ubuntu1~20.04.1 amd64 -git 1:2.25.1-1ubuntu3.2 amd64 -git-man 1:2.25.1-1ubuntu3.2 all +git 1:2.25.1-1ubuntu3.3 amd64 +git-man 1:2.25.1-1ubuntu3.3 all -grub-common 2.04-1ubuntu26.13 amd64 +grub-common 2.04-1ubuntu26.15 amd64 -grub-pc 2.04-1ubuntu26.13 amd64 -grub-pc-bin 2.04-1ubuntu26.13 amd64 -grub2-common 2.04-1ubuntu26.13 amd64 +grub-pc 2.04-1ubuntu26.15 amd64 +grub-pc-bin 2.04-1ubuntu26.15 amd64 +grub2-common 2.04-1ubuntu26.15 amd64 -gzip 1.10-0ubuntu4 amd64 +gzip 1.10-0ubuntu4.1 amd64 -icinga-php-library 0.7.0-1.focal all +icinga-php-library 0.8.0-1.focal all -icinga2 2.13.2-1.focal amd64 -icinga2-bin 2.13.2-1.focal amd64 -icinga2-common 2.13.2-1.focal all -icinga2-doc 2.13.2-1.focal all -icinga2-ido-mysql 2.13.2-1.focal amd64 -icingacli 2.9.6-1.focal all -icingaweb2 2.9.6-1.focal all -icingaweb2-common 2.9.6-1.focal all -icingaweb2-module-doc 2.9.6-1.focal all +icinga2 2.13.3-1.focal amd64 +icinga2-bin 2.13.3-1.focal amd64 +icinga2-common 2.13.3-1.focal all +icinga2-doc 2.13.3-1.focal all +icinga2-ido-mysql 2.13.3-1.focal amd64 +icingacli 2.10.1-1.focal all +icingaweb2 2.10.1-1.focal all +icingaweb2-common 2.10.1-1.focal all +icingaweb2-module-doc 2.10.1-1.focal all -icingaweb2-module-monitoring 2.9.6-1.focal all +icingaweb2-module-monitoring 2.10.1-1.focal all -klibc-utils 2.0.7-1ubuntu5 amd64 +klibc-utils 2.0.7-1ubuntu5.1 amd64 -libasan5 9.4.0-1ubuntu1~20.04 amd64 +libasan5 9.4.0-1ubuntu1~20.04.1 amd64 -libfribidi0 1.0.8-2 amd64 +libfribidi0 1.0.8-2ubuntu0.1 amd64 -libgcc-9-dev 9.4.0-1ubuntu1~20.04 amd64 +libgcc-9-dev 9.4.0-1ubuntu1~20.04.1 amd64 -libklibc 2.0.7-1ubuntu5 amd64 +libklibc 2.0.7-1ubuntu5.1 amd64 -liblzma5 5.2.4-1ubuntu1 amd64 +liblzma5 5.2.4-1ubuntu1.1 amd64 -libnetplan0 0.103-0ubuntu5~20.04.6 amd64 +libnetplan0 0.104-0ubuntu2~20.04.1 amd64 -libnss-systemd 245.4-4ubuntu3.15 amd64 +libnss-systemd 245.4-4ubuntu3.16 amd64 -libpam-systemd 245.4-4ubuntu3.15 amd64 +libpam-systemd 245.4-4ubuntu3.16 amd64 -libpython3.8 3.8.10-0ubuntu1~20.04.2 amd64 -libpython3.8-dev 3.8.10-0ubuntu1~20.04.2 amd64 -libpython3.8-minimal 3.8.10-0ubuntu1~20.04.2 amd64 -libpython3.8-stdlib 3.8.10-0ubuntu1~20.04.2 amd64 +libpython3.8 3.8.10-0ubuntu1~20.04.4 amd64 +libpython3.8-dev 3.8.10-0ubuntu1~20.04.4 amd64 +libpython3.8-minimal 3.8.10-0ubuntu1~20.04.4 amd64 +libpython3.8-stdlib 3.8.10-0ubuntu1~20.04.4 amd64 -libstdc++-9-dev 9.4.0-1ubuntu1~20.04 amd64 +libstdc++-9-dev 9.4.0-1ubuntu1~20.04.1 amd64 -libsystemd0 245.4-4ubuntu3.15 amd64 +libsystemd0 245.4-4ubuntu3.16 amd64 -libudev1 245.4-4ubuntu3.15 amd64 +libudev1 245.4-4ubuntu3.16 amd64 -linux-libc-dev 5.4.0-104.118 amd64 +linux-libc-dev 5.4.0-109.123 amd64 -netplan.io 0.103-0ubuntu5~20.04.6 amd64 +netplan.io 0.104-0ubuntu2~20.04.1 amd64 -php-icinga 2.9.6-1.focal all +php-icinga 2.10.1-1.focal all -python3-distupgrade 1:20.04.37 all +python3-distupgrade 1:20.04.38 all -python3-django 2:2.2.12-1ubuntu0.10 all +python3-django 2:2.2.12-1ubuntu0.11 all -python3-twisted 18.9.0-11ubuntu0.20.04.1 all -python3-twisted-bin 18.9.0-11ubuntu0.20.04.1 amd64 +python3-twisted 18.9.0-11ubuntu0.20.04.2 all +python3-twisted-bin 18.9.0-11ubuntu0.20.04.2 amd64 -python3.8 3.8.10-0ubuntu1~20.04.2 amd64 -python3.8-dev 3.8.10-0ubuntu1~20.04.2 amd64 -python3.8-minimal 3.8.10-0ubuntu1~20.04.2 amd64 +python3.8 3.8.10-0ubuntu1~20.04.4 amd64 +python3.8-dev 3.8.10-0ubuntu1~20.04.4 amd64 +python3.8-minimal 3.8.10-0ubuntu1~20.04.4 amd64 -rsync 3.1.3-8ubuntu0.2 amd64 +rsync 3.1.3-8ubuntu0.3 amd64 -systemd 245.4-4ubuntu3.15 amd64 -systemd-sysv 245.4-4ubuntu3.15 amd64 -systemd-timesyncd 245.4-4ubuntu3.15 amd64 +systemd 245.4-4ubuntu3.16 amd64 +systemd-sysv 245.4-4ubuntu3.16 amd64 +systemd-timesyncd 245.4-4ubuntu3.16 amd64 -tcpdump 4.9.3-4 amd64 +tcpdump 4.9.3-4ubuntu0.1 amd64 -tzdata 2021e-0ubuntu0.20.04 all -ubuntu-advantage-tools 27.6~20.04.1 amd64 +tzdata 2022a-0ubuntu0.20.04 all +ubuntu-advantage-tools 27.7~20.04.1 amd64 -ubuntu-release-upgrader-core 1:20.04.37 all +ubuntu-release-upgrader-core 1:20.04.38 all -udev 245.4-4ubuntu3.15 amd64 +udev 245.4-4ubuntu3.16 amd64 -vim-icinga2 2.13.2-1.focal all +vim-icinga2 2.13.3-1.focal all -webmin 1.990 all +webmin 1.991 all -xz-utils 5.2.4-1ubuntu1 amd64 +xz-utils 5.2.4-1ubuntu1.1 amd64 -zlib1g 1:1.2.11.dfsg-2ubuntu1.2 amd64 -zlib1g-dev 1:1.2.11.dfsg-2ubuntu1.2 amd64 +zlib1g 1:1.2.11.dfsg-2ubuntu1.3 amd64 +zlib1g-dev 1:1.2.11.dfsg-2ubuntu1.3 amd64 --- grub.d/10_linux | 4 +- logrotate.d/ubuntu-advantage-tools | 1 + webmin/acl/config | 2 +- webmin/adsl-client/config | 8 +-- webmin/ajaxterm/config | 2 +- webmin/apache/config | 38 +++++++------- webmin/apache/httpd-info | 6 +-- webmin/backup-config/config | 2 +- webmin/bacula-backup/config | 14 +++--- webmin/bandwidth/config | 2 +- webmin/bind8/config | 72 +++++++++++++-------------- webmin/cluster-passwd/config | 2 +- webmin/cluster-useradmin/config | 10 ++-- webmin/cluster-usermin/config | 2 +- webmin/config | 48 +++++++++--------- webmin/cpan/config | 6 +-- webmin/cron/config | 38 +++++++------- webmin/custom/config | 4 +- webmin/dhcpd/config | 24 ++++----- webmin/dovecot/config | 4 +- webmin/exim/config | 10 ++-- webmin/exports/config | 4 +- webmin/fail2ban/config | 2 +- webmin/fetchmail/config | 4 +- webmin/filter/config | 6 +-- webmin/firewall/config | 4 +- webmin/firewall6/config | 6 +-- webmin/fsdump/config | 8 +-- webmin/heartbeat/config | 20 ++++---- webmin/htaccess-htpasswd/config | 8 +-- webmin/inetd/config | 20 ++++---- webmin/init/config | 22 ++++---- webmin/ipfilter/config | 12 ++--- webmin/ipfw/config | 4 +- webmin/ipsec/config | 10 ++-- webmin/iscsi-client/config | 6 +-- webmin/iscsi-server/config | 8 +-- webmin/iscsi-target/config | 8 +-- webmin/iscsi-tgtd/config | 2 +- webmin/jabber/config | 6 +-- webmin/ldap-client/config | 2 +- webmin/ldap-server/config | 14 +++--- 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 | 10 ++-- webmin/mount/config | 12 ++--- webmin/mysql/config | 34 ++++++------- webmin/net/config | 2 +- webmin/nis/config | 6 +-- webmin/openslp/config | 6 +-- webmin/package-updates/config | 2 +- webmin/pam/config | 2 +- webmin/pap/config | 8 +-- webmin/passwd/config | 2 +- webmin/postfix/config | 40 +++++++-------- webmin/postgresql/config | 34 ++++++------- webmin/ppp-client/config | 4 +- webmin/pptp-client/config | 6 +-- webmin/pptp-server/config | 8 +-- webmin/proc/config | 6 +-- webmin/procmail/config | 4 +- webmin/proftpd/config | 10 ++-- webmin/qmailadmin/config | 18 +++---- webmin/quota/config | 32 ++++++------ webmin/raid/config | 2 +- webmin/samba/config | 22 ++++---- webmin/sarg/config | 4 +- webmin/sendmail/config | 44 ++++++++-------- webmin/servers/config | 12 ++--- webmin/shell/config | 2 +- webmin/shorewall/config | 4 +- webmin/shorewall6/config | 2 +- webmin/smart-status/config | 2 +- webmin/software/config | 2 +- webmin/spam/config | 16 +++--- webmin/squid/config | 28 +++++------ webmin/sshd/config | 12 ++--- webmin/status/config | 18 +++---- webmin/syslog-ng/config | 8 +-- webmin/syslog/config | 22 ++++---- webmin/system-status/config | 2 +- webmin/tcpwrappers/config | 2 +- webmin/telnet/config | 4 +- webmin/time/config | 6 +-- webmin/updown/config | 2 +- webmin/useradmin/config | 64 ++++++++++++------------ webmin/usermin/config | 6 +-- webmin/version | 2 +- webmin/webalizer/config | 8 +-- webmin/webmin/config | 16 +++--- webmin/wuftpd/config | 4 +- webmin/xinetd/config | 4 +- 97 files changed, 599 insertions(+), 596 deletions(-) diff --git a/grub.d/10_linux b/grub.d/10_linux index a91bb2de3..1b9f091e1 100755 --- a/grub.d/10_linux +++ b/grub.d/10_linux @@ -378,7 +378,9 @@ else cat << EOF if [ "\${recordfail}" != 1 ]; then if [ -e \${prefix}/gfxblacklist.txt ]; then - if hwmatch \${prefix}/gfxblacklist.txt 3; then + if [ \${grub_platform} != pc ]; then + set linux_gfx_mode=keep + elif hwmatch \${prefix}/gfxblacklist.txt 3; then if [ \${match} = 0 ]; then set linux_gfx_mode=keep else diff --git a/logrotate.d/ubuntu-advantage-tools b/logrotate.d/ubuntu-advantage-tools index 76e6b47c8..7c6485729 100644 --- a/logrotate.d/ubuntu-advantage-tools +++ b/logrotate.d/ubuntu-advantage-tools @@ -2,6 +2,7 @@ # of /var/log/ubuntu-advantage*.log files. /var/log/ubuntu-advantage*.log { su root root + create 0644 root root rotate 6 monthly compress diff --git a/webmin/acl/config b/webmin/acl/config index 017dd0405..c572bfa88 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ -order=0 ssleay=/usr/bin/openssl +order=0 display=1 diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index f0bfa82c7..bb60ddd39 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -status_cmd=adsl-status -conf_style=0 -pppoe_cmd=pppoe +stop_cmd=adsl-stop pap_file=/etc/ppp/pap-secrets +status_cmd=adsl-status pppoe_conf=/etc/ppp/pppoe.conf -stop_cmd=adsl-stop start_cmd=adsl-start +pppoe_cmd=pppoe +conf_style=0 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 27731ed0a..46b9bc777 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,25 +1,25 @@ -srm_conf=/etc/apache2/srm.conf -defines_name=APACHE_ARGUMENTS -allow_virtualmin=0 -show_list=0 -show_order=0 +auto_mods=1 +max_servers=100 +test_manual=0 mime_types=/etc/apache2/mime.types -httpd_dir=/etc/apache2 apachectl_path=/usr/sbin/apache2ctl -link_dir=/etc/apache2/sites-enabled -test_manual=0 -max_servers=100 -test_always=0 -defines_file=/etc/apache2/envvars -auto_mods=1 -virt_file=/etc/apache2/sites-available +show_names=0 +access_conf=/etc/apache2/access.conf +httpd_conf=/etc/apache2/apache2.conf test_config=1 -test_apachectl=1 start_cmd=/etc/init.d/apache2 start -stop_cmd=/etc/init.d/apache2 stop -format_config=1 +defines_file=/etc/apache2/envvars +link_dir=/etc/apache2/sites-enabled httpd_path=/usr/sbin/apache2 +stop_cmd=/etc/init.d/apache2 stop +httpd_dir=/etc/apache2 +test_always=0 apply_cmd=/usr/sbin/apache2ctl graceful -show_names=0 -httpd_conf=/etc/apache2/apache2.conf -access_conf=/etc/apache2/access.conf +allow_virtualmin=0 +srm_conf=/etc/apache2/srm.conf +virt_file=/etc/apache2/sites-available +format_config=1 +defines_name=APACHE_ARGUMENTS +show_list=0 +test_apachectl=1 +show_order=0 diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index d634766b6..7c635574c 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,5 +1,5 @@ -time=1640722692 +time=1647270094 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd -version=2.452 -fullversion=2.4.52 +version=2.453 +fullversion=2.4.53 diff --git a/webmin/backup-config/config b/webmin/backup-config/config index 7f0472b86..5d1c57e87 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -apply=1 date_subs=0 webmin_subs=0 +apply=1 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index 97a72caf5..ba603046b 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -user=bacula +pass= db=bacula +wait=1 +driver=Pg +apply=1 showdirs=0 -init_start=0 bextract=bextract -bacula_dir=/etc/bacula btape=btape -driver=Pg -wait=1 -apply=1 +init_start=0 +user=bacula bls=bls -pass= +bacula_dir=/etc/bacula diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config index db38d7751..da72c415d 100644 --- a/webmin/bandwidth/config +++ b/webmin/bandwidth/config @@ -1,2 +1,2 @@ -firewall_system=firewall bandwidth_log=/var/log/bandwidth +firewall_system=firewall diff --git a/webmin/bind8/config b/webmin/bind8/config index 1bad88914..ba7b684ea 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,46 +1,46 @@ soa_start=0 -rev_must=0 -no_chroot=0 -dnssec_info=1 -relative_paths=0 -spf_record=0 -allow_wild=1 +no_pid_chroot=0 +rndcconf_cmd=rndc-confgen +rev_def=0 +reversezonefilename_format=ZONE.rev +max_zones=50 master_ttl=1 -keygen=dnssec-keygen -soa_style=0 -show_list=0 -signzone=dnssec-signzone -named_conf=/etc/bind/named.conf other_slaves=1 -allow_long=0 -checkzone=named-checkzone +largezones=0 named_path=/usr/sbin/named -pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid -rndcconf_cmd=rndc-confgen -force_random=0 -updserial_man=1 -no_pid_chroot=0 -checkconf=named-checkconf +by_view=0 support_aaaa=1 -ndc_cmd=ndc -forwardzonefilename_format=ZONE.hosts slave_dir=/var/lib/bind -master_dir=/var/lib/bind -whois_cmd=whois -records_order=0 -rndc_cmd=rndc -zones_file=/etc/bind/named.conf.local -confirm_zone=1 -largezones=0 +signzone=dnssec-signzone updserial_on=1 -rev_def=0 -short_names=0 -allow_underscore=1 rndc_conf=/etc/bind/rndc.conf +show_list=0 +forwardzonefilename_format=ZONE.hosts +no_chroot=0 +allow_comments=0 +records_order=0 +whois_cmd=whois updserial_def=0 -max_zones=50 -confirm_rec=0 -by_view=0 +named_conf=/etc/bind/named.conf ipv6_mode=1 -reversezonefilename_format=ZONE.rev -allow_comments=0 +checkzone=named-checkzone +soa_style=0 +updserial_man=1 +dnssec_info=1 +keygen=dnssec-keygen +pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid +checkconf=named-checkconf +confirm_rec=0 +allow_wild=1 +allow_underscore=1 +force_random=0 +allow_long=0 +spf_record=0 +rev_must=0 +short_names=0 +rndc_cmd=rndc +master_dir=/var/lib/bind +ndc_cmd=ndc +zones_file=/etc/bind/named.conf.local +relative_paths=0 +confirm_zone=1 diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 04110de95..2ab4c6af1 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ -max_users=200 input_type=0 sort_mode=0 +max_users=200 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index cf49df156..721680af9 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -conf_host_links=1 -sort_mode=0 -conf_allow_sync=1 conf_find_user=1 -conf_add_group=1 table_mode=0 -conf_find_group=1 +sort_mode=0 conf_add_user=1 +conf_add_group=1 +conf_allow_sync=1 conf_allow_refresh=1 +conf_find_group=1 +conf_host_links=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 dc0b81626..69df8debb 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -feedback_to= -hostnamemode=0 +md5pass=1 dateformat=dd/mon/yyyy +showlogin=0 +hostnamemode=0 passwd_uindex=0 -lang_root=de.UTF-8 -real_os_type=Ubuntu Linux -os_version=9.0 -real_os_version=18.04.1 -theme=authentic-theme -passwd_cindex=2 -sysinfo=0 -showhost=0 -md5pass=1 -log=1 -nofeedbackcc=0 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +referers_none=1 +help_width= +product=webmin help_height= -ld_env=LD_LIBRARY_PATH +lang=en.UTF-8 +passwd_file=/etc/shadow +os_version=9.0 +passwd_pindex=1 +feedback_to= tempdelete_days=7 +log=1 +webprefix= +showhost=0 +real_os_type=Ubuntu Linux +passwd_mindex=4 +theme=authentic-theme +real_os_version=18.04.1 +lang_root=de.UTF-8 hostnamedisplay= +ld_env=LD_LIBRARY_PATH +passwd_cindex=2 find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -passwd_file=/etc/shadow -help_width= -product=webmin os_type=debian-linux +nofeedbackcc=0 +sysinfo=0 by_view=0 -referers_none=1 -passwd_mindex=4 -showlogin=0 -lang=en.UTF-8 -webprefix= -passwd_pindex=1 diff --git a/webmin/cpan/config b/webmin/cpan/config index 1de972610..988ef28b5 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ packages=http://www.cpan.org/modules/02packages.details.txt.gz -save_partial=0 +cpan=http://www.cpan.org/authors/id incyum=1 -refresh_days=30 +save_partial=0 incpackages=1 -cpan=http://www.cpan.org/authors/id +refresh_days=30 diff --git a/webmin/cron/config b/webmin/cron/config index e0aed1f34..0cd2bc204 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,26 +1,26 @@ -run_parts=run-parts +hourly_only=0 +cron_user_delete_command=crontab -r +max_jobs=100 +cron_delete_command=crontab -u USER -r kill_subs=0 -show_comment=0 +match_user=1 +cron_edit_command=crontab -u USER -e +system_crontab=/etc/crontab cron_allow_file=/var/spool/cron/allow -max_jobs=100 -show_run=0 +cron_deny_all=2 +cronfiles_dir=/etc/cron.d cron_deny_file=/var/spool/cron/deny -show_next=0 +init_name=cron match_mode=0 +cron_dir=/var/spool/cron/crontabs cron_user_get_command=crontab -l -cron_input=1 -cron_user_edit_command=crontab -e -system_crontab=/etc/crontab -max_len=80 -vixie_cron=1 -hourly_only=0 +show_next=0 +show_run=0 +run_parts=run-parts cron_get_command=crontab -u USER -l +vixie_cron=1 +cron_input=1 show_time=0 -cron_user_delete_command=crontab -r -cron_delete_command=crontab -u USER -r -cronfiles_dir=/etc/cron.d -init_name=cron -cron_edit_command=crontab -u USER -e -match_user=1 -cron_deny_all=2 -cron_dir=/var/spool/cron/crontabs +show_comment=0 +max_len=80 +cron_user_edit_command=crontab -e diff --git a/webmin/custom/config b/webmin/custom/config index 6d0b22ef3..6c90eac06 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -display_mode=0 params_cmd=0 -columns=2 params_file=0 +display_mode=0 +columns=2 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index a77e86644..d04d02cc7 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,17 +1,17 @@ lease_file=/var/lib/dhcp/dhcpd.leases -pid_file=/var/run/dhcpd.pid -display_max=100 -dhcpd_nocols=5 -dhcpd_path=/usr/sbin/dhcpd -desc_name=0 -stop_cmd=service isc-dhcp-server stop +lease_tz=0 +group_name=0 restart_cmd=service isc-dhcp-server restart lease_vendor=0 -lease_tz=0 -lease_sort=0 +stop_cmd=service isc-dhcp-server stop interfaces_type=debian -start_cmd=service isc-dhcp-server start -group_name=0 -show_mac=0 -dhcpd_conf=/etc/dhcp/dhcpd.conf show_ip=0 +dhcpd_conf=/etc/dhcp/dhcpd.conf +show_mac=0 +display_max=100 +dhcpd_path=/usr/sbin/dhcpd +lease_sort=0 +dhcpd_nocols=5 +desc_name=0 +start_cmd=service isc-dhcp-server start +pid_file=/var/run/dhcpd.pid diff --git a/webmin/dovecot/config b/webmin/dovecot/config index b60a955db..c9ec1754c 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 pid_file=/var/run/dovecot/master.pid -dovecot_config=/etc/dovecot/dovecot.conf +dovecot=/usr/sbin/dovecot diff --git a/webmin/exim/config b/webmin/exim/config index f681a47ba..be8e38671 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_dbmfile=/etc/exim4/local_domains -exim_virt_dir=/etc/exim4/aliases -exim_addrfile=/etc/exim4/email-addresses -exim_aliasfileext= -mail_system=1 exim_dir=/etc/exim4 exim_mail_file=Maildir +exim_addrfile=/etc/exim4/email-addresses +mail_system=1 +exim_aliasfileext= +exim_virt_dir=/etc/exim4/aliases +exim_dbmfile=/etc/exim4/local_domains exim_dbmext=.dbm diff --git a/webmin/exports/config b/webmin/exports/config index 7d1a41d0a..8f8b567ee 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 -apply_cmd=exportfs -r exports_file=/etc/exports +apply_cmd=exportfs -r +restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index 424dbf2b0..d058f9824 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ -config_dir=/etc/fail2ban server_cmd=/usr/bin/fail2ban-server +config_dir=/etc/fail2ban init_script=fail2ban client_cmd=/usr/bin/fail2ban-client diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 7a8e617ae..ea72bf561 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ daemon_user=root -pid_file=/var/run/fetchmail.pid -view_mode=0 max_users=400 config_file= fetchmail_path=fetchmail +view_mode=0 +pid_file=/var/run/fetchmail.pid diff --git a/webmin/filter/config b/webmin/filter/config index d482e8df8..458717139 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ +alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases warn_procmail=1 -reply_force=0 virtualmin_config=/etc/webmin/virtual-server -forward_procmail=0 +reply_force=0 virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl -alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases +forward_procmail=0 diff --git a/webmin/firewall/config b/webmin/firewall/config index b214fc356..b7d38d52e 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -comment_mod=0 view_condition=1 +cluster_mode=1 direct=0 +comment_mod=0 view_comment=0 force_init=0 -cluster_mode=1 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 3e4cffef7..27a37b449 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -cluster_mode=1 -comment_mod=0 view_condition=1 direct=0 -force_init=0 +cluster_mode=1 view_comment=0 +force_init=0 +comment_mod=0 diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 31478c480..0293f7bb5 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -error_email=0 nonewtape=0 -run_mode=0 -webmin_subs=0 date_subs=0 -always_tar=0 +error_email=0 +webmin_subs=0 simple_sched=0 +always_tar=0 +run_mode=0 diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index c7a4f5c42..ea4034815 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -pid_file=/var/run/heartbeat.pid +stop_cmd=/etc/init.d/heartbeat stop +heartbeat=/usr/lib/heartbeat/heartbeat +haresources= +apply_cmd=/etc/init.d/heartbeat reload alt_haresources=/usr/share/doc/packages/heartbeat/haresources -authkeys= +resource_d= alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +req_resource_cmd=/usr/lib/heartbeat/req_resource +ha_cf= +pid_file=/var/run/heartbeat.pid +authkeys= start_cmd=/etc/init.d/heartbeat start -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys serials=/dev/ttyS* -ha_cf= -req_resource_cmd=/usr/lib/heartbeat/req_resource -stop_cmd=/etc/init.d/heartbeat stop -haresources= +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys ha_dir=/etc/ha.d -apply_cmd=/etc/init.d/heartbeat reload -resource_d= -heartbeat=/usr/lib/heartbeat/heartbeat diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index 13f87c523..e9216a188 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -htaccess=.htaccess htgroups=.htgroups -sort=0 +extra_directives= +htaccess=.htaccess sha1=0 +md5=1 htpasswd=.htpasswd digest=1 -extra_directives= -md5=1 +sort=0 diff --git a/webmin/inetd/config b/webmin/inetd/config index 251b17e2a..5c0ffe022 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -restart_command=killall -HUP inetd +qm_mode=0 sort_mode=0 -show_empty=1 +restart_command=killall -HUP inetd protocols_file=/etc/protocols -inetd_conf_file=/etc/inetd.conf -services_file=/etc/services -qm_mode=0 +deny_file=/etc/hosts.deny +rpc_inetd=1 extended_inetd=1 -tcpd_path=/usr/sbin/tcpd ipv6=0 -allow_file=/etc/hosts.allow +tcpd_path=/usr/sbin/tcpd rpc_file=/etc/rpc -rpc_protocols=tcp udp +services_file=/etc/services +inetd_conf_file=/etc/inetd.conf +allow_file=/etc/hosts.allow display_max=100 -deny_file=/etc/hosts.deny -rpc_inetd=1 +rpc_protocols=tcp udp +show_empty=1 diff --git a/webmin/init/config b/webmin/init/config index e0096e226..f2dab9192 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -init_base=/etc/ -soft_links=1 -order=0 reboot_command=reboot +desc=1 order_digits=2 -shutdown_command=poweroff -show_opts=0 +boot_levels=2 3 5 +init_info=1 init_dir=/etc/init.d +inittab_id=id +soft_links=1 +shutdown_command=poweroff +sort_mode=0 +init_base=/etc/ +atboot_product=webmin status_check=0 +order=0 no_chkconfig=0 -atboot_product=webmin -init_info=1 -boot_levels=2 3 5 expert=0 -desc=1 -sort_mode=0 -inittab_id=id +show_opts=0 diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 2965e1880..11066b9a5 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ -cluster_mode=0 -view_condition=1 -view_comment=0 ipf=ipf +view_condition=1 +ipf_conf=/etc/ipf/ipf.conf ipfstat=ipfstat -ipnat=ipnat -ipnat_conf=/etc/ipf/ipnat.conf cluster_nat=1 -ipf_conf=/etc/ipf/ipf.conf +cluster_mode=0 +ipnat_conf=/etc/ipf/ipnat.conf +ipnat=ipnat +view_comment=0 diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 00aefb026..9a86268c9 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -view_condition=1 +view_counters=0 version=2 view_comment=0 ipfw=/sbin/ipfw +view_condition=1 cluster_mode=0 -view_counters=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 1f40f4dbd..cbeaf6602 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ -secrets=/etc/ipsec.secrets +file=/etc/ipsec.conf +policies_dir=/etc/ipsec.d/policies +ipsec=/usr/sbin/ipsec start_cmd=/etc/init.d/ipsec start -restart_cmd=/etc/init.d/ipsec restart logfile=/var/log/messages -policies_dir=/etc/ipsec.d/policies -file=/etc/ipsec.conf +secrets=/etc/ipsec.secrets stop_cmd=/etc/init.d/ipsec stop -ipsec=/usr/sbin/ipsec +restart_cmd=/etc/init.d/ipsec restart diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index c7a596c52..5a5abf81e 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -iscsiiname=iscsi-iname +init_name=open-iscsi config_file=/etc/iscsi/iscsid.conf iscsiadm=iscsiadm -init_name=open-iscsi -ifaces_dir=/var/lib/iscsi/ifaces +iscsiiname=iscsi-iname initiator_file=/etc/iscsi/initiatorname.iscsi +ifaces_dir=/var/lib/iscsi/ifaces diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 69529c902..6d78d09aa 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -init_name=netbsd-iscsi -pid_file=/var/run/iscsi-target.pid targets_file=/etc/iscsi/targets -opts_file=/etc/sysconfig/netbsd-iscsi -auths_file=/etc/iscsi/auths iscsi_server=/usr/sbin/iscsi-target +auths_file=/etc/iscsi/auths +opts_file=/etc/sysconfig/netbsd-iscsi +pid_file=/var/run/iscsi-target.pid +init_name=netbsd-iscsi diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 33374e138..4b46ef9ef 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ +opts_file=/etc/default/iscsitarget +init_name=iscsitarget pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid -config_file=/etc/iet/ietd.conf -ietadm=ietadm targets_file=/etc/iet/targets.allow initiators_file=/etc/iet/initiators.allow -opts_file=/etc/default/iscsitarget -init_name=iscsitarget +ietadm=ietadm +config_file=/etc/iet/ietd.conf diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 5b4b40ab1..853c8fac2 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ tgtadmin=tgt-admin +tgtadm=tgtadm tgtd=tgtd init_name=tgtd config_file=/etc/tgt/targets.conf -tgtadm=tgtadm diff --git a/webmin/jabber/config b/webmin/jabber/config index a6f9943dd..58993f937 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -jabber_daemon=/usr/sbin/jabberd +start_cmd=/etc/init.d/jabberd start +jabber_dir=/var/lib/jabber stop_cmd=/etc/init.d/jabberd stop +jabber_daemon=/usr/sbin/jabberd jabber_config=/etc/jabber/jabber.xml -jabber_dir=/var/lib/jabber -start_cmd=/etc/init.d/jabberd start diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 55d1e7111..4460f14f7 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ +auth_ldap=/etc/ldap.conf secret=/etc/ldap.secret init_name=nslcd -auth_ldap=/etc/ldap.conf diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index b208794cc..5074b616c 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ -apply_cmd=/etc/init.d/slapd restart -slapd=slapd -init_name=slapd -browse_max=100 -ldap_user=openldap -start_cmd=/etc/init.d/slapd start schema_dir=/etc/ldap/schema +start_cmd=/etc/init.d/slapd start +init_name=slapd attr_count=6 -stop_cmd=/etc/init.d/slapd stop config_file=/etc/ldap/slapd.d +apply_cmd=/etc/init.d/slapd restart +ldap_user=openldap +stop_cmd=/etc/init.d/slapd stop +browse_max=100 +slapd=slapd diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index df5715aac..1859f5bac 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -auth_ldap=/etc/ldap.conf ldap_tls=0 -secmode=0 -gecos=1 -imap_login=cyrus -given=0 -given_order=0 -other_class=inetOrgPerson +person=1 samba_class=sambaSamAccount -mailfmt=0 -md5=0 -samba_def=0 +gecos=1 membox=0 +auth_ldap=/etc/ldap.conf +given=0 +shells=fixed,ldap,passwd,shells imap_foldersep=. -imap_class=SuSEeMailObject imap_folders=old public sent-mail -imap_def=0 +given_order=0 multi_fields=0 -shells=fixed,ldap,passwd,shells -person=1 -samba_gclass=sambaGroup +md5=0 +imap_login=cyrus slappasswd=slappasswd -quota_support=0 +imap_class=SuSEeMailObject +mailfmt=0 +samba_gclass=sambaGroup +samba_def=0 +imap_def=0 +other_class=inetOrgPerson alias_same=0 +quota_support=0 +secmode=0 diff --git a/webmin/logrotate/config b/webmin/logrotate/config index ece63a4d1..901f855de 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -sort_mode=0 +logrotate=logrotate add_file=/etc/logrotate.d +sort_mode=0 logrotate_conf=/etc/logrotate.conf -logrotate=logrotate diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index 87f87c1dd..b279fd33a 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -driver_style=cups -iface_owner=lp:lp -gs_fontpath= -smbclient_path=smbclient +sort_mode=0 show_status=0 -spool_dir=/var/spool/cups -iface_perms=755 -stop_cmd=/etc/init.d/cupsys stop +display_mode=0 gs_lib= -model_path=/usr/share/foomatic/db /usr/share/ppd +iface_arg= start_cmd=/etc/init.d/cupsys start +show_jobs=0 +driver_style=cups +spool_dir=/var/spool/cups +model_path=/usr/share/foomatic/db /usr/share/ppd +stop_cmd=/etc/init.d/cupsys stop +iface_owner=lp:lp +iface_perms=755 +gs_fontpath= print_style=cups +smbclient_path=smbclient gs_path=gs -display_mode=0 -sort_mode=0 -iface_arg= -show_jobs=0 diff --git a/webmin/lvm/config b/webmin/lvm/config index a5ef0ed4d..63b743f61 100644 --- a/webmin/lvm/config +++ b/webmin/lvm/config @@ -1,2 +1,2 @@ -show_table=0 lvm_conf=/etc/lvm/lvm.conf +show_table=0 diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index 338b28ab3..c414194c3 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -mail_style=0 -mail_file=Mailbox -sync_delete=1 -wrap_width=80 +date_fmt=dmy +view_html=0 +auto=1 spam_del=0 +vpopmail_dir=/home/vpopmail +maildir_deleted=0 +mail_usermin=mail +delete_warn=y +no_crlf=0 ignore_users= +mail_system=3 +arrows=1 +sync_modify=1 html_quote=0 +noindex_hostname=0 +show_body=0 show_sent=0 +sync_perms=0700 ignore_users_enabled=0 +max_records=200 +mail_dir=Maildir +log_read=0 +no_mailer=0 +spam_report= +mailbox_user=.usermin/mailbox +wrap_width=80 +column_count=4 +mail_file=Mailbox +sig_file=* +show_count=0 +sort_mode=1 +no_orig_ip=0 +from_virtualmin=1 +top_buttons=2 +sync_create=0 +html_edit=0 show_size=1 -show_size_below=0 +show_to=0 link_mode=0 -show_delall=0 +show_size_below=0 +open_mode=0 +spam_buttons=mail show_unread=0 -date_fmt=dmy -mail_usermin=mail -html_edit=0 -mail_system=3 -sig_file=* -sort_mode=1 fwd_mode=0 -sync_perms=0700 -view_html=0 -vpopmail_dir=/home/vpopmail -show_body=0 -spam_report= -arrows=1 -delete_warn=y -no_crlf=0 -show_count=0 -top_buttons=2 +check_mod=1 +sync_delete=1 +mail_style=0 +show_delall=0 +perpage=20 track_read=0 -mailbox_user=.usermin/mailbox -open_mode=0 -mail_dir=Maildir -log_read=0 -from_virtualmin=1 show_mail=0 -sync_create=0 -check_mod=1 -sync_modify=1 -spam_buttons=mail -noindex_hostname=0 -auto=1 -show_to=0 size_mode=1 -max_records=200 -no_mailer=0 -no_orig_ip=0 -maildir_deleted=0 -column_count=4 -perpage=20 diff --git a/webmin/man/config b/webmin/man/config index 125ab9995..2f6dd539e 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -list_cmd=man -w PAGE -man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man -kernel_dir=/usr/src/linux/Documentation man_cmd_sect=man SECTION PAGE -man_cmd=man PAGE +list_cmd_sect=man -w SECTION PAGE doc_dir=/usr/share/doc +man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man search_cmd=man -k PAGE -list_cmd_sect=man -w SECTION PAGE +man_cmd=man PAGE +kernel_dir=/usr/src/linux/Documentation man2html_path=man2html +list_cmd=man -w PAGE diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index f6f55935d..41ba5646c 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.990 +server=MiniServ/1.991 diff --git a/webmin/mon/config b/webmin/mon/config index 6a1b0e5f1..a44d82fdc 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -monshow=/usr/bin/monshow -stop_cmd=/etc/init.d/mon stop +start_cmd=/etc/init.d/mon start pid_file=/var/run/mon.pid -restart_cmd=/etc/init.d/mon restart -mon_cgi=/var/www/cgi-bin/mon.cgi cfbasedir=/etc/mon -start_cmd=/etc/init.d/mon start +mon_cgi=/var/www/cgi-bin/mon.cgi +restart_cmd=/etc/init.d/mon restart +stop_cmd=/etc/init.d/mon stop +monshow=/usr/bin/monshow diff --git a/webmin/mount/config b/webmin/mount/config index 7c6c2575f..efcc7a3ce 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ sysinfo=1 -long_fstypes=1 -fstab_file=/etc/fstab -nfs_check=1 -show_used=1 -autofs_file=/etc/auto.master -auto_file=/etc/am-utils/amd.conf nmblookup_path=nmblookup +auto_file=/etc/am-utils/amd.conf sort_mode=2 +autofs_file=/etc/auto.master +long_fstypes=1 smbclient_path=smbclient +show_used=1 +nfs_check=1 +fstab_file=/etc/fstab diff --git a/webmin/mysql/config b/webmin/mysql/config index 48868a8ba..4b80c4c4d 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -nodbi=0 mysql_libs=/usr/local/mysql/lib -mysql_data=/var/lib/mysql -passwd_mode=0 -mysqldump=/usr/bin/mysqldump +max_text=1000 +blob_mode=0 mysqlshow=/usr/bin/mysqlshow -mysqladmin=/usr/bin/mysqladmin -date_subs=0 -access=*: * -mysql=/usr/bin/mysql -mysqlimport=/usr/bin/mysqlimport +add_mode=1 +max_dbs=50 login=root +access=*: * +mysql_data=/var/lib/mysql perpage=25 -style=0 -max_dbs=50 -webmin_subs=0 -blob_mode=0 -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -max_text=1000 -start_cmd=service mysql start -add_mode=1 +nodbi=0 nopwd=0 +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf stop_cmd=service mysql stop +start_cmd=service mysql start +style=0 +mysqladmin=/usr/bin/mysqladmin +mysqlimport=/usr/bin/mysqlimport +webmin_subs=0 +mysql=/usr/bin/mysql +mysqldump=/usr/bin/mysqldump +date_subs=0 +passwd_mode=0 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 223a4e680..efe9f2a66 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ -max_size=100 client_conf=/etc/yp.conf -nsswitch_conf=/etc/nsswitch.conf -manual_build=0 securenets=/etc/ypserv.securenets +manual_build=0 +nsswitch_conf=/etc/nsswitch.conf +max_size=100 diff --git a/webmin/openslp/config b/webmin/openslp/config index a7a4992c5..3a8c287ac 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd_reg=/etc/slp.reg -slpd_pid=/var/run/slpd.pid +slpd=/usr/sbin/slpd slpd_conf=/etc/slp.conf slpd_log=/var/log/slpd.log -slpd=/usr/sbin/slpd +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 02a4dd593..695267622 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ -pam_dir=/etc/pam.d mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so lib_dirs=/lib/security /lib/*/security ignore=README +pam_dir=/etc/pam.d diff --git a/webmin/pap/config b/webmin/pap/config index f61aa554b..f5aacd02f 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -login_config=/etc/mgetty+sendfax/login.config +dialin_config=/etc/mgetty+sendfax/dialin.config +mgetty=mgetty serials=/dev/ttyS[0-9]* -pap_file=/etc/ppp/pap-secrets ppp_options=/etc/ppp/options +pap_file=/etc/ppp/pap-secrets encrypt_pass=0 pppd=pppd -dialin_config=/etc/mgetty+sendfax/dialin.config -mgetty=mgetty +login_config=/etc/mgetty+sendfax/login.config 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 b056f232a..177706936 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ +top_buttons=1 +postfix_aliases_table_command=/usr/sbin/postalias +sort_mode=0 +postfix_control_command=/usr/sbin/postfix mailq_cmd=postqueue -p +show_cmts=0 +columns=2 delete_confirm=1 -postfix_control_command=/usr/sbin/postfix -postfix_aliases_table_command=/usr/sbin/postalias -wrap_width=80 -postfix_config_file=/etc/postfix/main.cf -top_buttons=1 +prefix_cmts=0 delete_warn=1 -max_maps=100 +postfix_queue_command=postqueue +mailq_dir=/var/spool/postfix postcat_cmd=/usr/sbin/postcat -columns=2 +mailq_sort=0 ldap_doms=0 -prefix_cmts=0 -mailq_count=0 -postfix_queue_command=postqueue postfix_newaliases_command=/usr/bin/newaliases -postfix_super_command=/usr/sbin/postsuper -postfix_lookup_table_command=/usr/sbin/postmap -mailq_sort=0 -check_config=1 postfix_master=/etc/postfix/master.cf -index_check=1 -perpage=20 -show_cmts=0 +check_config=1 +max_records=200 +mailq_count=0 +postfix_lookup_table_command=/usr/sbin/postmap fwd_mode=0 +max_maps=100 +index_check=1 postfix_config_command=/usr/sbin/postconf -max_records=200 -mailq_dir=/var/spool/postfix -sort_mode=0 +postfix_config_file=/etc/postfix/main.cf +perpage=20 +wrap_width=80 +postfix_super_command=/usr/sbin/postsuper diff --git a/webmin/postgresql/config b/webmin/postgresql/config index b140ca9d9..45b09b205 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -start_cmd=/etc/init.d/postgresql* start -dump_cmd=/usr/bin/pg_dump -max_text=1000 -access=*: * -stop_cmd=/etc/init.d/postgresql* stop -perpage=25 -login=postgres -add_mode=1 -psql=/usr/bin/psql plib= pass= -rstr_cmd=/usr/bin/pg_restore -basedb=template1 +webmin_subs=0 date_subs=0 -blob_mode=0 -sameunix=1 hba_conf=/etc/postgresql/*/main/pg_hba.conf -pid_file=/var/run/postmaster.pid -webmin_subs=0 -simple_sched=0 -nodbi=0 +rstr_cmd=/usr/bin/pg_restore access_own=0 style=0 +pid_file=/var/run/postmaster.pid +start_cmd=/etc/init.d/postgresql* start +sameunix=1 +perpage=25 +simple_sched=0 +access=*: * +dump_cmd=/usr/bin/pg_dump +login=postgres +add_mode=1 max_dbs=50 +stop_cmd=/etc/init.d/postgresql* stop +nodbi=0 +basedb=template1 +blob_mode=0 +psql=/usr/bin/psql +max_text=1000 diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 237c75238..e0a3e10a8 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ -wvdial=wvdial -wvdialconf=wvdialconf file=/etc/wvdial.conf +wvdialconf=wvdialconf +wvdial=wvdial diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 121394bae..6d651873c 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -peers_dir=/etc/ppp/peers -pap_file=/etc/ppp/chap-secrets -timeout=30 pptp_options=/etc/ppp/options.pptp pptp=pptp +peers_dir=/etc/ppp/peers +timeout=30 +pap_file=/etc/ppp/chap-secrets diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index bad5821e0..eb47ed31e 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ +pap_file=/etc/ppp/chap-secrets stop_cmd=/etc/init.d/pptpd stop -pptp_ppp_options=/etc/ppp/pptpd-options -file=/etc/pptpd.conf ppp_options=/etc/ppp/options pid_file=/var/run/pptpd.pid -pap_file=/etc/ppp/chap-secrets log_file=/var/log/messages -start_cmd=/etc/init.d/pptpd start pptpd=pptpd +start_cmd=/etc/init.d/pptpd start +pptp_ppp_options=/etc/ppp/pptpd-options +file=/etc/pptpd.conf diff --git a/webmin/proc/config b/webmin/proc/config index cf0fe003c..463d06931 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ +ps_style=linux +base_ppid=1 +hide_self=1 cut_length=80 default_mode=last trace_java=0 -base_ppid=1 -ps_style=linux -hide_self=1 diff --git a/webmin/procmail/config b/webmin/procmail/config index d5df94749..9b36ccfbe 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -includes=0 -procmailrc=/etc/procmailrc procmail=procmail +procmailrc=/etc/procmailrc +includes=0 diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 98287bf92..b010bddf2 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -test_always=0 -proftpd_path=/usr/sbin/proftpd -test_manual=0 -proftpd_conf=/etc/proftpd/proftpd.conf test_config=1 +pid_file=/var/run/proftpd.pid ftpusers=/etc/ftpusers start_cmd=/etc/init.d/proftpd start -pid_file=/var/run/proftpd.pid +proftpd_conf=/etc/proftpd/proftpd.conf +test_manual=0 stop_cmd=/etc/init.d/proftpd stop +test_always=0 +proftpd_path=/usr/sbin/proftpd diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 66a8d3129..504511434 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -sort_mode=0 -qmail_dir=/var/qmail -mail_dir_qmail=Maildir -max_records=200 mailq_count=0 +mail_dir= +max_records=200 +sort_mode=0 fwd_mode=0 -columns=2 perpage=20 -mail_file=Mailbox index_min=1000000 -delete_warn=1 -mail_dir= -mailq_sort=0 +qmail_dir=/var/qmail mail_system=1 +columns=2 +mail_file=Mailbox +mailq_sort=0 +delete_warn=1 +mail_dir_qmail=Maildir diff --git a/webmin/quota/config b/webmin/quota/config index 7350d2381..c29262cb2 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -user_repquota_command=repquota -u -v +user_edquota_command=edquota -u +user_grace_command=edquota -u -t +block_mode=1 quotacheck_command=quotacheck -u -g -hide_uids=0 -sort_mode=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}. -user_quota_command=quota -v -u -block_size=1024 user_setquota_command=setquota -u -user_edquota_command=edquota -u -display_max=100 +user_quota_command=quota -v -u user_copy_command=edquota -u -p -group_quota_command=quota -v -g -user_grace_command=edquota -u -t -group_grace_command=edquota -g -t -block_mode=1 -group_edquota_command=edquota -g group_copy_command=edquota -g -p -group_setquota_command=setquota -g show_grace=1 group_repquota_command=repquota -g -v -user_quotaoff_command=quotaoff -u -user_quotaon_command=quotaon -u +group_grace_command=edquota -g -t group_quotaoff_command=quotaoff -g +user_quotaon_command=quotaon -u +user_repquota_command=repquota -u -v +group_quotaon_command=quotaon -g +block_size=1024 +hide_uids=0 +group_edquota_command=edquota -g +sort_mode=0 +user_quotaoff_command=quotaoff -u +group_setquota_command=setquota -g +display_max=100 pc_show=1 +group_quota_command=quota -v -g diff --git a/webmin/raid/config b/webmin/raid/config index 8ffe6d468..4bd2da90e 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ -mdadm=/etc/mdadm/mdadm.conf mdstat=/proc/mdstat raidtab=/etc/raidtab +mdadm=/etc/mdadm/mdadm.conf diff --git a/webmin/samba/config b/webmin/samba/config index 3e4466e0d..9672ac8b1 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -text_lists=0 -start_cmd=service smbd start ; service nmbd start list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' -samba_status_program=/usr/bin/smbstatus -dont_convert=-499 -smbgroupedit=/usr/bin/smbgroupedit -restart_cmd=service smbd restart ; service nmbd restart -stop_cmd=service smbd stop ; service nmbd stop -name_server=/usr/sbin/nmbd pdbedit=/usr/bin/pdbedit sort_mode=0 -samba_password_program=/usr/bin/smbpasswd +dont_convert=-499 +start_cmd=service smbd start ; service nmbd start run_from_inetd=0 +samba_server=/usr/sbin/smbd +swat=/usr/sbin/swat +stop_cmd=service smbd stop ; service nmbd stop net=/usr/bin/net +name_server=/usr/sbin/nmbd +restart_cmd=service smbd restart ; service nmbd restart +smbgroupedit=/usr/bin/smbgroupedit +samba_password_program=/usr/bin/smbpasswd smb_conf=/etc/samba/smb.conf +text_lists=0 +samba_status_program=/usr/bin/smbstatus smb_passwd=/etc/samba/smbpasswd -samba_server=/usr/sbin/smbd -swat=/usr/sbin/swat diff --git a/webmin/sarg/config b/webmin/sarg/config index 125c56c89..b9009faeb 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -sarg=sarg -clear=1 sarg_conf=/etc/sarg/sarg.conf +sarg=sarg naked=0 +clear=1 diff --git a/webmin/sendmail/config b/webmin/sendmail/config index dd37a9e9b..3e9904b2a 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -mailq_sort=0 -sendmail_mc=/etc/mail/sendmail.mc -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -sendmail_path=/usr/lib/sendmail -sendmail_command=/usr/lib/sendmail -bd -q1h +sendmail_cf=/etc/mail/sendmail.cf perpage=20 +track_read=0 +mail_file=mbox +wrap_width=80 +mail_style=0 +mailq_show=Date,From,To,Size,Status +max_records=200 +mailq_count=0 +mail_dir=/var/spool/mail +sendmail_pid=/var/run/sendmail/mta/sendmail.pid makemap_path=makemap -show_cmts=0 -show_to=0 fwd_mode=0 -max_records=200 -sort_mode=0 sendmail_features=/usr/share/sendmail/cf -mail_dir=/var/spool/mail +index_min=1000000 +prefix_cmts=0 +columns=2 delete_confirm=1 -wrap_width=80 -track_read=0 -top_buttons=1 -sendmail_cf=/etc/mail/sendmail.cf +mailq_sort=0 delete_warn=1 -index_min=1000000 -smrsh_dir=/etc/smrsh -mail_style=0 -mail_file=mbox +show_to=0 +sendmail_path=/usr/lib/sendmail +sort_mode=0 +sendmail_command=/usr/lib/sendmail -bd -q1h order_mail=0 -columns=2 -prefix_cmts=0 -mailq_show=Date,From,To,Size,Status -mailq_count=0 +sendmail_mc=/etc/mail/sendmail.mc +top_buttons=1 +show_cmts=0 +smrsh_dir=/etc/smrsh mail_type=0 diff --git a/webmin/servers/config b/webmin/servers/config index 96f841dfb..700dee00a 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -capath=/usr/share/ca-certificates deffast=2 -resolve=1 -deflink=0 -scan_time=5 -groups_dir=/etc/cluster/groups show_ip=0 -display_mode=0 +deflink=0 max_servers=100 sort_mode=0 +resolve=1 show_status=1 +scan_time=5 +capath=/usr/share/ca-certificates +display_mode=0 +groups_dir=/etc/cluster/groups 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 8c0f118b2..58652372a 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ +display_zone_descriptions=1 macros=/usr/share/shorewall -shorewall=shorewall actions=/etc/shorewall/actions /usr/share/shorewall/actions.std config_dir=/etc/shorewall -display_zone_descriptions=1 +shorewall=shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index 9a948f662..ad86c0d80 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ +actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std macros=/usr/share/shorewall6 display_zone_descriptions=1 -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std shorewall6=shorewall6 config_dir=/etc/shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index 8d9d9bb97..e5c58db0a 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ +mode=1 smartctl=smartctl attribs=1 -mode=1 ata=0 diff --git a/webmin/software/config b/webmin/software/config index abefc9ae1..9476e6757 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 diff --git a/webmin/spam/config b/webmin/spam/config index a275ccca7..0c7fe6068 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -procmail_cmd=* -sa_learn=sa-learn -procmailrc=/etc/procmailrc -restart_cmd=/etc/init.d/spamassassin restart -max_awl=200 -local_cf=/etc/spamassassin/local.cf warn_procmail=1 -spamassassin=spamassassin -call_spam=1 addto=0 processes=spamd amavisd mode=0 +sa_learn=sa-learn +call_spam=1 +procmailrc=/etc/procmailrc +restart_cmd=/etc/init.d/spamassassin restart +spamassassin=spamassassin +local_cf=/etc/spamassassin/local.cf +max_awl=200 +procmail_cmd=* diff --git a/webmin/squid/config b/webmin/squid/config index 8156ddb78..6ed5227d1 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ +pid_file=/var/run/squid.pid +crypt_conf=0 +log_dir=/var/log/squid squid_stop=service squid stop -squid_path=squid -cal_all=1 -calamaris=calamaris sync_create=0 +squidclient=squidclient +sync_delete=0 +cal_fmt=w sort_conf=0 -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi -pid_file=/var/run/squid.pid -squid_conf=/etc/squid/squid.conf -cal_max=50000 restart_pos=0 +squid_path=squid +cal_all=1 +cal_max=50000 +calamaris=calamaris +squid_start=service squid start cal_args=-aw -sync_modify=1 -sync_delete=0 +squid_conf=/etc/squid/squid.conf cache_dir=/var/spool/squid -squidclient=squidclient +sync_modify=1 squid_restart=service squid reload -cal_fmt=w -log_dir=/var/log/squid -crypt_conf=0 -squid_start=service squid start +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi diff --git a/webmin/sshd/config b/webmin/sshd/config index e4f82e418..71f80075d 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -stop_cmd=service ssh stop pid_file=/var/run/sshd.pid +sync_auth=1 +start_cmd=service ssh start sync_gnupg=0 +sync_create=0 +sync_pass=0 sshd_path=/usr/sbin/sshd -start_cmd=service ssh start -sync_auth=1 -keygen_path=/usr/bin/ssh-keygen client_config=/etc/ssh/ssh_config +keygen_path=/usr/bin/ssh-keygen sshd_config=/etc/ssh/sshd_config -sync_create=0 -sync_pass=0 +stop_cmd=service ssh stop diff --git a/webmin/status/config b/webmin/status/config index d66d1d828..f24b9da15 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,14 +1,14 @@ -snmp_trap=1.3.6.1.4.1.10000.1.1 -history_purge=30 +pager_cmd=sms_client +columns=2 snmp_version=2 -index_status=1 +history_show=50 sched_offset=0 -sort_mode=0 +history_purge=30 +snmp_trap=1.3.6.1.4.1.10000.1.1 +output=0 sysinfo_users=0 -pinger=linux -pager_cmd=sms_client -columns=2 +index_status=1 sysinfo=0 subject_mode=0 -history_show=50 -output=0 +sort_mode=0 +pinger=linux diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index e7d78e6c5..b65ada8b4 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ +lines=20 +syslogng_conf=/etc/syslog-ng/syslog-ng.conf +start_cmd=/etc/init.d/syslog-ng start pid_file=/var/run/syslog-ng.pid +syslogng_cmd=syslog-ng compressed=1 stop_cmd=/etc/init.d/syslog-ng stop -syslogng_cmd=syslog-ng -syslogng_conf=/etc/syslog-ng/syslog-ng.conf -start_cmd=/etc/init.d/syslog-ng start -lines=20 diff --git a/webmin/syslog/config b/webmin/syslog/config index 36eb1720f..ea1ad6447 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -pri_dir=1 -start_cmd=/usr/sbin/service rsyslog start -others=1 +syslog_conf=/etc/rsyslog.conf signal_cmd=/usr/sbin/service rsyslog restart -restart_cmd=/usr/sbin/service rsyslog restart +syslogd=/usr/sbin/rsyslogd +pri_dir=1 tags=0 -socket=0 -pipe=1 +m4_conf=0 +others=1 reverse=0 +start_cmd=/usr/sbin/service rsyslog start +pid_file=/var/run/rsyslogd.pid pri_all=1 +restart_cmd=/usr/sbin/service rsyslog restart +socket=0 compressed=1 -pid_file=/var/run/rsyslogd.pid lines=20 -syslog_conf=/etc/rsyslog.conf +sync=1 +pipe=1 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -syslogd=/usr/sbin/rsyslogd -m4_conf=0 m4_path= -sync=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 161d92a01..10eceba4d 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ -hosts_allow=/etc/hosts.allow hosts_deny=/etc/hosts.deny +hosts_allow=/etc/hosts.allow inetd_services=0 diff --git a/webmin/telnet/config b/webmin/telnet/config index 1c000fc6a..173f347e7 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ -detach=0 mode=1 -sizemode=0 +detach=0 proxy=0 +sizemode=0 no_test=0 diff --git a/webmin/time/config b/webmin/time/config index 3cdb79a0e..840cc4d44 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ -seconds=1 +lease=5 timeserver_hardware=1 timeserver=0.pool.ntp.org -zone_style=linux -lease=5 +seconds=1 ntp_only=1 +zone_style=linux diff --git a/webmin/updown/config b/webmin/updown/config index 7342994c1..1c7534ae3 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ -ddir=/ dir=/ duser=root user=root +ddir=/ diff --git a/webmin/useradmin/config b/webmin/useradmin/config index 77cd52d79..81de8beb6 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -extra_real=0 -homedir_perms=0755 -empty_mode=0 -md5=1 -passwd_stars=0 -alias_check=0 +shadow_file=/etc/shadow +passwd_progmode=0 +gid_calc=0 +uid_calc=0 +email_type=0 +home_base=/home +delete_root=0 skip_md5=0 -user_files=/etc/skel display_mode=1 -membox=0 +sort_mode=0 +random_password=0 last_show=0 -gid_calc=0 -delete_only=0 -lock_string=* -passwd_progmode=0 -from_files=0 -passwd_dict=0 -base_uid=1000 -gshadow_file=/etc/gshadow +display_max=400 +group_file=/etc/group +shells=fixed,passwd,shells +uid_mode=1 +gid_mode=1 base_gid=1000 -secmode=0 -shadow_file=/etc/shadow -uid_calc=0 -delete_root=0 default_other=1 +passwd_stars=0 +gshadow_file=/etc/gshadow +membox=0 +extra_real=0 +home_style=0 +user_files=/etc/skel passwd_file=/etc/passwd -gid_mode=1 -group_file=/etc/group +lock_string=* +from_files=0 new_user_group=0 -sort_mode=0 -passwd_same=0 -home_base=/home +new_user_gid=0 +md5=1 selinux_con=user_u:object_r:user_home_dir_t -home_style=0 +passwd_dict=0 default_group=users -email_type=0 -new_user_gid=0 -display_max=400 -uid_mode=1 -shells=fixed,passwd,shells -random_password=0 +base_uid=1000 +passwd_same=0 +delete_only=0 +secmode=0 +homedir_perms=0755 +empty_mode=0 +alias_check=0 diff --git a/webmin/usermin/config b/webmin/usermin/config index 24b615c42..d8cbac19c 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ +updays=1 cron_mode=0 upshow=1 -upmissing=0 usermin_dir=/etc/usermin -update=0 -updays=1 uphour=4 +upmissing=0 +update=0 diff --git a/webmin/version b/webmin/version index 827f7cd67..09b638fc2 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.990 +1.991 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index 0a9e11e78..dcf70c62c 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -webalizer_conf=/etc/webalizer/webalizer.conf -alt_conf=/etc/webalizer/webalizer.conf.sample -webalizer=/usr/bin/webalizer +auto=apache,squid,proftpd,wuftpd naked=0 skip_old=0 -auto=apache,squid,proftpd,wuftpd +webalizer_conf=/etc/webalizer/webalizer.conf +webalizer=/usr/bin/webalizer +alt_conf=/etc/webalizer/webalizer.conf.sample diff --git a/webmin/webmin/config b/webmin/webmin/config index 0ef0141a4..71fe5cabd 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ -upshow=1 -cron_mode=0 -last_version_check=1549050668 -warn_days=7 -upmissing=0 +letsencrypt_dns_wait=10 updays=1 last_version_number=1.900 +uphour=23 +update=0 +upmissing=0 +last_version_check=1549050668 +cron_mode=0 +upshow=1 +warn_days=7 upmins=47 osdn=1 -update=0 -uphour=23 -letsencrypt_dns_wait=10 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index aba4f69e8..bc16cbc23 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ ftpd_path=/usr/sbin/wu-ftpd ftpusers=/etc/wu-ftpd/ftpusers 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 +pid_file=/var/run/ftpd.pids-all +ftpaccess=/etc/wu-ftpd/ftpaccess ftphosts=/etc/wu-ftpd/ftphosts diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 96216e74c..709f2b49e 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ pid_file=/var/run/xinetd.pid -start_cmd=/etc/init.d/xinetd start -lookup_servs=1 xinetd_conf=/etc/xinetd.conf +lookup_servs=1 +start_cmd=/etc/init.d/xinetd start protocols_file=/etc/protocols -- 2.43.0