From 13122d39186184536a086042f518a667c1726254 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Fri, 4 Mar 2022 06:54:11 +0100 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -base-files 11ubuntu5.4 amd64 +base-files 11ubuntu5.5 amd64 -expat 2.2.9-1build1 amd64 +expat 2.2.9-1ubuntu0.2 amd64 -libapache2-mod-php7.4 7.4.3-4ubuntu2.8 amd64 +libapache2-mod-php7.4 7.4.3-4ubuntu2.10 amd64 -libc-bin 2.31-0ubuntu9.3 amd64 -libc-dev-bin 2.31-0ubuntu9.3 amd64 -libc6 2.31-0ubuntu9.3 amd64 -libc6-dev 2.31-0ubuntu9.3 amd64 +libc-bin 2.31-0ubuntu9.7 amd64 +libc-dev-bin 2.31-0ubuntu9.7 amd64 +libc6 2.31-0ubuntu9.7 amd64 +libc6-dev 2.31-0ubuntu9.7 amd64 -libexpat1 2.2.9-1build1 amd64 -libexpat1-dev 2.2.9-1build1 amd64 +libexpat1 2.2.9-1ubuntu0.2 amd64 +libexpat1-dev 2.2.9-1ubuntu0.2 amd64 -libpolkit-gobject-1-0 0.105-26ubuntu1.2 amd64 +libpolkit-gobject-1-0 0.105-26ubuntu1.3 amd64 -libsasl2-2 2.1.27+dfsg-2 amd64 -libsasl2-modules 2.1.27+dfsg-2 amd64 -libsasl2-modules-db 2.1.27+dfsg-2 amd64 +libsasl2-2 2.1.27+dfsg-2ubuntu0.1 amd64 +libsasl2-modules 2.1.27+dfsg-2ubuntu0.1 amd64 +libsasl2-modules-db 2.1.27+dfsg-2ubuntu0.1 amd64 -linux-firmware 1.187.26 all +linux-firmware 1.187.27 all -linux-libc-dev 5.4.0-99.112 amd64 +linux-libc-dev 5.4.0-100.113 amd64 -locales 2.31-0ubuntu9.3 all +locales 2.31-0ubuntu9.7 all -php7.4 7.4.3-4ubuntu2.8 all -php7.4-bcmath 7.4.3-4ubuntu2.8 amd64 -php7.4-bz2 7.4.3-4ubuntu2.8 amd64 -php7.4-cli 7.4.3-4ubuntu2.8 amd64 -php7.4-common 7.4.3-4ubuntu2.8 amd64 -php7.4-curl 7.4.3-4ubuntu2.8 amd64 -php7.4-gd 7.4.3-4ubuntu2.8 amd64 -php7.4-gmp 7.4.3-4ubuntu2.8 amd64 -php7.4-intl 7.4.3-4ubuntu2.8 amd64 -php7.4-json 7.4.3-4ubuntu2.8 amd64 -php7.4-ldap 7.4.3-4ubuntu2.8 amd64 -php7.4-mbstring 7.4.3-4ubuntu2.8 amd64 -php7.4-mysql 7.4.3-4ubuntu2.8 amd64 -php7.4-opcache 7.4.3-4ubuntu2.8 amd64 -php7.4-phpdbg 7.4.3-4ubuntu2.8 amd64 -php7.4-readline 7.4.3-4ubuntu2.8 amd64 -php7.4-soap 7.4.3-4ubuntu2.8 amd64 -php7.4-xml 7.4.3-4ubuntu2.8 amd64 -php7.4-zip 7.4.3-4ubuntu2.8 amd64 +php7.4 7.4.3-4ubuntu2.10 all +php7.4-bcmath 7.4.3-4ubuntu2.10 amd64 +php7.4-bz2 7.4.3-4ubuntu2.10 amd64 +php7.4-cli 7.4.3-4ubuntu2.10 amd64 +php7.4-common 7.4.3-4ubuntu2.10 amd64 +php7.4-curl 7.4.3-4ubuntu2.10 amd64 +php7.4-gd 7.4.3-4ubuntu2.10 amd64 +php7.4-gmp 7.4.3-4ubuntu2.10 amd64 +php7.4-intl 7.4.3-4ubuntu2.10 amd64 +php7.4-json 7.4.3-4ubuntu2.10 amd64 +php7.4-ldap 7.4.3-4ubuntu2.10 amd64 +php7.4-mbstring 7.4.3-4ubuntu2.10 amd64 +php7.4-mysql 7.4.3-4ubuntu2.10 amd64 +php7.4-opcache 7.4.3-4ubuntu2.10 amd64 +php7.4-phpdbg 7.4.3-4ubuntu2.10 amd64 +php7.4-readline 7.4.3-4ubuntu2.10 amd64 +php7.4-soap 7.4.3-4ubuntu2.10 amd64 +php7.4-xml 7.4.3-4ubuntu2.10 amd64 +php7.4-zip 7.4.3-4ubuntu2.10 amd64 -webmin 1.984 all +webmin 1.990 all --- issue | 2 +- issue.net | 2 +- lsb-release | 2 +- webmin/acl/config | 4 +- webmin/adsl-client/config | 8 ++-- webmin/ajaxterm/config | 2 +- webmin/apache/config | 38 ++++++++-------- webmin/apache/httpd-info | 2 +- webmin/backup-config/config | 4 +- webmin/bacula-backup/config | 16 +++---- webmin/bandwidth/config | 2 +- webmin/bind8/config | 68 ++++++++++++++-------------- webmin/cluster-passwd/config | 2 +- webmin/cluster-useradmin/config | 10 ++--- webmin/cluster-webmin/config | 2 +- webmin/config | 48 ++++++++++---------- webmin/cpan/config | 4 +- webmin/cron/config | 37 ++++++++-------- webmin/custom/config | 4 +- webmin/dhcpd/config | 18 ++++---- webmin/dovecot/config | 2 +- webmin/exim/config | 10 ++--- webmin/exports/config | 2 +- webmin/fail2ban/config | 4 +- webmin/fetchmail/config | 8 ++-- webmin/filter/config | 6 +-- webmin/firewall/config | 6 +-- webmin/firewall6/config | 6 +-- webmin/fsdump/config | 6 +-- webmin/grub/config | 2 +- webmin/heartbeat/config | 16 +++---- webmin/htaccess-htpasswd/config | 10 ++--- webmin/idmapd/config | 2 +- webmin/inetd/config | 20 ++++----- webmin/init/config | 24 +++++----- webmin/ipfilter/config | 10 ++--- webmin/ipfw/config | 6 +-- webmin/ipsec/config | 8 ++-- webmin/iscsi-client/config | 6 +-- webmin/iscsi-server/config | 4 +- webmin/iscsi-target/config | 8 ++-- webmin/iscsi-tgtd/config | 4 +- webmin/jabber/config | 2 +- webmin/ldap-client/config | 4 +- webmin/ldap-server/config | 12 ++--- webmin/ldap-useradmin/config | 34 +++++++------- webmin/logrotate/config | 4 +- webmin/lpadmin/config | 22 +++++----- webmin/lvm/config | 2 +- webmin/mailboxes/config | 78 ++++++++++++++++----------------- webmin/man/config | 10 ++--- webmin/miniserv.conf | 2 +- webmin/mon/config | 10 ++--- webmin/mount/config | 12 ++--- webmin/mysql/config | 32 +++++++------- webmin/mysql/version | 2 +- webmin/nis/config | 4 +- webmin/openslp/config | 6 +-- webmin/pam/config | 2 +- webmin/pap/config | 10 ++--- webmin/passwd/config | 2 +- webmin/postfix/config | 42 +++++++++--------- webmin/postgresql/config | 34 +++++++------- webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 10 ++--- webmin/proc/config | 6 +-- webmin/procmail/config | 4 +- webmin/proftpd/config | 10 ++--- webmin/qmailadmin/config | 20 ++++----- webmin/quota/config | 34 +++++++------- webmin/raid/config | 2 +- webmin/samba/config | 22 +++++----- webmin/sarg/config | 4 +- webmin/sendmail/config | 44 +++++++++---------- webmin/servers/config | 12 ++--- webmin/shorewall/config | 4 +- webmin/shorewall6/config | 6 +-- webmin/smart-status/config | 2 +- webmin/software/config | 2 +- webmin/spam/config | 16 +++---- webmin/squid/config | 26 +++++------ webmin/sshd/config | 12 ++--- webmin/status/config | 18 ++++---- webmin/syslog-ng/config | 8 ++-- webmin/syslog/config | 24 +++++----- webmin/system-status/config | 2 +- webmin/tcpwrappers/config | 2 +- webmin/telnet/config | 4 +- webmin/time/config | 4 +- webmin/updown/config | 2 +- webmin/useradmin/config | 64 +++++++++++++-------------- webmin/usermin/config | 6 +-- webmin/version | 2 +- webmin/vgetty/config | 2 +- webmin/webalizer/config | 6 +-- webmin/webmin/config | 14 +++--- webmin/wuftpd/config | 10 ++--- webmin/xinetd/config | 6 +-- 99 files changed, 594 insertions(+), 593 deletions(-) diff --git a/issue b/issue index 356d87ff0..2105b5476 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Ubuntu 20.04.3 LTS \n \l +Ubuntu 20.04.4 LTS \n \l diff --git a/issue.net b/issue.net index 55bc29ea0..a3bf1994a 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Ubuntu 20.04.3 LTS +Ubuntu 20.04.4 LTS diff --git a/lsb-release b/lsb-release index 53e846156..d68631be3 100644 --- a/lsb-release +++ b/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=Ubuntu DISTRIB_RELEASE=20.04 DISTRIB_CODENAME=focal -DISTRIB_DESCRIPTION="Ubuntu 20.04.3 LTS" +DISTRIB_DESCRIPTION="Ubuntu 20.04.4 LTS" diff --git a/webmin/acl/config b/webmin/acl/config index ee9b4c16b..017dd0405 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 +display=1 diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index c79328941..f0bfa82c7 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -stop_cmd=adsl-stop -pppoe_conf=/etc/ppp/pppoe.conf status_cmd=adsl-status -pppoe_cmd=pppoe conf_style=0 -start_cmd=adsl-start +pppoe_cmd=pppoe pap_file=/etc/ppp/pap-secrets +pppoe_conf=/etc/ppp/pppoe.conf +stop_cmd=adsl-stop +start_cmd=adsl-start diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config index a31edabcb..003ebb11c 100644 --- a/webmin/ajaxterm/config +++ b/webmin/ajaxterm/config @@ -1,2 +1,2 @@ -autologin=0 timeout=120 +autologin=0 diff --git a/webmin/apache/config b/webmin/apache/config index fca0b07f9..27731ed0a 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,25 +1,25 @@ -test_config=1 -apply_cmd=/usr/sbin/apache2ctl graceful -virt_file=/etc/apache2/sites-available -access_conf=/etc/apache2/access.conf -show_names=0 -test_manual=0 -apachectl_path=/usr/sbin/apache2ctl -show_order=0 -start_cmd=/etc/init.d/apache2 start +srm_conf=/etc/apache2/srm.conf defines_name=APACHE_ARGUMENTS +allow_virtualmin=0 +show_list=0 +show_order=0 +mime_types=/etc/apache2/mime.types httpd_dir=/etc/apache2 -httpd_conf=/etc/apache2/apache2.conf +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 -httpd_path=/usr/sbin/apache2 -srm_conf=/etc/apache2/srm.conf +virt_file=/etc/apache2/sites-available +test_config=1 test_apachectl=1 -format_config=1 -max_servers=100 -link_dir=/etc/apache2/sites-enabled -mime_types=/etc/apache2/mime.types -show_list=0 +start_cmd=/etc/init.d/apache2 start stop_cmd=/etc/init.d/apache2 stop -defines_file=/etc/apache2/envvars -allow_virtualmin=0 +format_config=1 +httpd_path=/usr/sbin/apache2 +apply_cmd=/usr/sbin/apache2ctl graceful +show_names=0 +httpd_conf=/etc/apache2/apache2.conf +access_conf=/etc/apache2/access.conf diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index 2ccb9915e..d634766b6 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,4 +1,4 @@ -time=1640034432 +time=1640722692 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd version=2.452 diff --git a/webmin/backup-config/config b/webmin/backup-config/config index c6694b382..7f0472b86 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -webmin_subs=0 -date_subs=0 apply=1 +date_subs=0 +webmin_subs=0 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index c43e5f238..97a72caf5 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -wait=1 +user=bacula db=bacula -driver=Pg showdirs=0 -bls=bls -user=bacula -pass= -btape=btape -apply=1 init_start=0 -bacula_dir=/etc/bacula bextract=bextract +bacula_dir=/etc/bacula +btape=btape +driver=Pg +wait=1 +apply=1 +bls=bls +pass= 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 3c8ce1438..1bad88914 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,46 +1,46 @@ -named_path=/usr/sbin/named +soa_start=0 +rev_must=0 +no_chroot=0 +dnssec_info=1 relative_paths=0 -signzone=dnssec-signzone -max_zones=50 spf_record=0 -confirm_rec=0 -no_pid_chroot=0 -no_chroot=0 allow_wild=1 -soa_start=0 -allow_comments=0 -allow_long=0 -updserial_on=1 -records_order=0 -ipv6_mode=1 -master_dir=/var/lib/bind +master_ttl=1 +keygen=dnssec-keygen +soa_style=0 show_list=0 -rev_def=0 +signzone=dnssec-signzone named_conf=/etc/bind/named.conf -rndc_conf=/etc/bind/rndc.conf -dnssec_info=1 +other_slaves=1 +allow_long=0 +checkzone=named-checkzone +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 -checkzone=named-checkzone -whois_cmd=whois -soa_style=0 -slave_dir=/var/lib/bind +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 -support_aaaa=1 largezones=0 -keygen=dnssec-keygen -ndc_cmd=ndc -updserial_def=0 -master_ttl=1 -reversezonefilename_format=ZONE.rev +updserial_on=1 +rev_def=0 +short_names=0 allow_underscore=1 -updserial_man=1 -rndcconf_cmd=rndc-confgen -rndc_cmd=rndc -other_slaves=1 +rndc_conf=/etc/bind/rndc.conf +updserial_def=0 +max_zones=50 +confirm_rec=0 by_view=0 -short_names=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 -zones_file=/etc/bind/named.conf.local -rev_must=0 +ipv6_mode=1 +reversezonefilename_format=ZONE.rev +allow_comments=0 diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 2ab4c6af1..04110de95 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 ee07e6c4e..cf49df156 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -table_mode=0 -conf_add_user=1 -sort_mode=0 conf_host_links=1 +sort_mode=0 +conf_allow_sync=1 conf_find_user=1 -conf_find_group=1 conf_add_group=1 +table_mode=0 +conf_find_group=1 +conf_add_user=1 conf_allow_refresh=1 -conf_allow_sync=1 diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config index fd788cb1e..470eaee86 100644 --- a/webmin/cluster-webmin/config +++ b/webmin/cluster-webmin/config @@ -1,2 +1,2 @@ -table_mode=0 sort_mode=0 +table_mode=0 diff --git a/webmin/config b/webmin/config index cbed1d7d5..dc0b81626 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -tempdelete_days=7 -md5pass=1 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +feedback_to= +hostnamemode=0 +dateformat=dd/mon/yyyy passwd_uindex=0 -passwd_pindex=1 -log=1 -by_view=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 -feedback_to= -os_type=debian-linux +md5pass=1 +log=1 +nofeedbackcc=0 +help_height= +ld_env=LD_LIBRARY_PATH +tempdelete_days=7 +hostnamedisplay= find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' passwd_file=/etc/shadow -passwd_mindex=4 -product=webmin -webprefix= -hostnamedisplay= -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -sysinfo=0 -real_os_type=Ubuntu Linux help_width= +product=webmin +os_type=debian-linux +by_view=0 referers_none=1 -help_height= -lang=en.UTF-8 -real_os_version=18.04.1 +passwd_mindex=4 showlogin=0 -passwd_cindex=2 -lang_root=de.UTF-8 -hostnamemode=0 -theme=authentic-theme -dateformat=dd/mon/yyyy -nofeedbackcc=0 -ld_env=LD_LIBRARY_PATH +lang=en.UTF-8 +webprefix= +passwd_pindex=1 diff --git a/webmin/cpan/config b/webmin/cpan/config index 3441d61c5..1de972610 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -save_partial=0 packages=http://www.cpan.org/modules/02packages.details.txt.gz -refresh_days=30 +save_partial=0 incyum=1 +refresh_days=30 incpackages=1 cpan=http://www.cpan.org/authors/id diff --git a/webmin/cron/config b/webmin/cron/config index 11b9918a9..e0aed1f34 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,26 @@ -match_user=1 -vixie_cron=1 +run_parts=run-parts +kill_subs=0 show_comment=0 cron_allow_file=/var/spool/cron/allow -show_next=0 -cron_dir=/var/spool/cron/crontabs -cron_deny_all=2 -cron_user_get_command=crontab -l -show_time=0 -max_len=80 +max_jobs=100 show_run=0 -match_mode=0 cron_deny_file=/var/spool/cron/deny -cron_user_delete_command=crontab -r -cron_edit_command=crontab -u USER -e -cron_get_command=crontab -u USER -l -system_crontab=/etc/crontab +show_next=0 +match_mode=0 +cron_user_get_command=crontab -l cron_input=1 -hourly_only=0 -cronfiles_dir=/etc/cron.d -run_parts=run-parts cron_user_edit_command=crontab -e -max_jobs=100 -kill_subs=0 +system_crontab=/etc/crontab +max_len=80 +vixie_cron=1 +hourly_only=0 +cron_get_command=crontab -u USER -l +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 diff --git a/webmin/custom/config b/webmin/custom/config index 14aa50381..6d0b22ef3 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ display_mode=0 -params_file=0 -columns=2 params_cmd=0 +columns=2 +params_file=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index 93f3e23af..a77e86644 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 restart_cmd=service isc-dhcp-server restart +lease_vendor=0 lease_tz=0 +lease_sort=0 +interfaces_type=debian start_cmd=service isc-dhcp-server start -lease_vendor=0 group_name=0 -display_max=100 -stop_cmd=service isc-dhcp-server stop -show_ip=0 show_mac=0 -dhcpd_nocols=5 -lease_file=/var/lib/dhcp/dhcpd.leases -interfaces_type=debian -lease_sort=0 dhcpd_conf=/etc/dhcp/dhcpd.conf -desc_name=0 +show_ip=0 diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 658fb103e..b60a955db 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 diff --git a/webmin/exim/config b/webmin/exim/config index f463fcb12..f681a47ba 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_dbmext=.dbm +exim_dbmfile=/etc/exim4/local_domains +exim_virt_dir=/etc/exim4/aliases +exim_addrfile=/etc/exim4/email-addresses exim_aliasfileext= mail_system=1 -exim_addrfile=/etc/exim4/email-addresses -exim_dbmfile=/etc/exim4/local_domains -exim_mail_file=Maildir exim_dir=/etc/exim4 -exim_virt_dir=/etc/exim4/aliases +exim_mail_file=Maildir +exim_dbmext=.dbm diff --git a/webmin/exports/config b/webmin/exports/config index b8864bec5..7d1a41d0a 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ -exports_file=/etc/exports restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi apply_cmd=exportfs -r +exports_file=/etc/exports diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index 4851099d2..424dbf2b0 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 +server_cmd=/usr/bin/fail2ban-server +init_script=fail2ban client_cmd=/usr/bin/fail2ban-client diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 6f9c4bfbb..7a8e617ae 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ -fetchmail_path=fetchmail -max_users=400 daemon_user=root -config_file= -view_mode=0 pid_file=/var/run/fetchmail.pid +view_mode=0 +max_users=400 +config_file= +fetchmail_path=fetchmail diff --git a/webmin/filter/config b/webmin/filter/config index 5ce0e142b..d482e8df8 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 virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl -reply_force=0 -warn_procmail=1 +alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases diff --git a/webmin/firewall/config b/webmin/firewall/config index 3e434be28..b214fc356 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ +comment_mod=0 +view_condition=1 +direct=0 view_comment=0 force_init=0 cluster_mode=1 -direct=0 -view_condition=1 -comment_mod=0 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 9ebb1f19e..3e4cffef7 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -view_condition=1 -comment_mod=0 -force_init=0 cluster_mode=1 +comment_mod=0 +view_condition=1 direct=0 +force_init=0 view_comment=0 diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 5bc5d63f9..31478c480 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ +error_email=0 nonewtape=0 +run_mode=0 webmin_subs=0 -simple_sched=0 date_subs=0 always_tar=0 -run_mode=0 -error_email=0 +simple_sched=0 diff --git a/webmin/grub/config b/webmin/grub/config index f6464eb2a..98bdc19a6 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ -install=(hd0) grub_path=grub menu_file=/boot/grub/menu.lst +install=(hd0) diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index d81ccd6da..c7a4f5c42 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ pid_file=/var/run/heartbeat.pid +alt_haresources=/usr/share/doc/packages/heartbeat/haresources +authkeys= +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +start_cmd=/etc/init.d/heartbeat start alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +serials=/dev/ttyS* ha_cf= -start_cmd=/etc/init.d/heartbeat start -authkeys= +req_resource_cmd=/usr/lib/heartbeat/req_resource stop_cmd=/etc/init.d/heartbeat stop -apply_cmd=/etc/init.d/heartbeat reload haresources= -serials=/dev/ttyS* ha_dir=/etc/ha.d -heartbeat=/usr/lib/heartbeat/heartbeat +apply_cmd=/etc/init.d/heartbeat reload resource_d= -req_resource_cmd=/usr/lib/heartbeat/req_resource -alt_haresources=/usr/share/doc/packages/heartbeat/haresources -alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +heartbeat=/usr/lib/heartbeat/heartbeat diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index 531374e52..13f87c523 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -sha1=0 -digest=1 htaccess=.htaccess -htpasswd=.htpasswd -md5=1 -extra_directives= htgroups=.htgroups sort=0 +sha1=0 +htpasswd=.htpasswd +digest=1 +extra_directives= +md5=1 diff --git a/webmin/idmapd/config b/webmin/idmapd/config index f25eeba97..12c48476c 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi -idmapd_conf=/etc/idmapd.conf idmapd_path=/usr/sbin/rpc.idmapd +idmapd_conf=/etc/idmapd.conf diff --git a/webmin/inetd/config b/webmin/inetd/config index 16ca21730..251b17e2a 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -ipv6=0 -tcpd_path=/usr/sbin/tcpd restart_command=killall -HUP inetd sort_mode=0 -allow_file=/etc/hosts.allow -rpc_protocols=tcp udp -deny_file=/etc/hosts.deny -extended_inetd=1 show_empty=1 -rpc_file=/etc/rpc -display_max=100 protocols_file=/etc/protocols -qm_mode=0 +inetd_conf_file=/etc/inetd.conf services_file=/etc/services +qm_mode=0 +extended_inetd=1 +tcpd_path=/usr/sbin/tcpd +ipv6=0 +allow_file=/etc/hosts.allow +rpc_file=/etc/rpc +rpc_protocols=tcp udp +display_max=100 +deny_file=/etc/hosts.deny rpc_inetd=1 -inetd_conf_file=/etc/inetd.conf diff --git a/webmin/init/config b/webmin/init/config index e8736a7c6..e0096e226 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -expert=0 -init_dir=/etc/init.d -sort_mode=0 -desc=1 init_base=/etc/ -no_chkconfig=0 -order_digits=2 -inittab_id=id -order=0 -boot_levels=2 3 5 -atboot_product=webmin soft_links=1 -status_check=0 -show_opts=0 +order=0 reboot_command=reboot +order_digits=2 shutdown_command=poweroff +show_opts=0 +init_dir=/etc/init.d +status_check=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 diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 02d1031fc..2965e1880 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ +cluster_mode=0 +view_condition=1 view_comment=0 ipf=ipf -ipnat=ipnat -cluster_mode=0 -ipf_conf=/etc/ipf/ipf.conf ipfstat=ipfstat -view_condition=1 -cluster_nat=1 +ipnat=ipnat ipnat_conf=/etc/ipf/ipnat.conf +cluster_nat=1 +ipf_conf=/etc/ipf/ipf.conf diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 4841206a9..00aefb026 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -cluster_mode=0 -ipfw=/sbin/ipfw -version=2 view_condition=1 +version=2 view_comment=0 +ipfw=/sbin/ipfw +cluster_mode=0 view_counters=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index ce745b4fb..1f40f4dbd 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ +secrets=/etc/ipsec.secrets start_cmd=/etc/init.d/ipsec start restart_cmd=/etc/init.d/ipsec restart -stop_cmd=/etc/init.d/ipsec stop -policies_dir=/etc/ipsec.d/policies logfile=/var/log/messages -secrets=/etc/ipsec.secrets -ipsec=/usr/sbin/ipsec +policies_dir=/etc/ipsec.d/policies file=/etc/ipsec.conf +stop_cmd=/etc/init.d/ipsec stop +ipsec=/usr/sbin/ipsec diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 375b2bead..c7a596c52 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -init_name=open-iscsi +iscsiiname=iscsi-iname config_file=/etc/iscsi/iscsid.conf -initiator_file=/etc/iscsi/initiatorname.iscsi iscsiadm=iscsiadm +init_name=open-iscsi ifaces_dir=/var/lib/iscsi/ifaces -iscsiiname=iscsi-iname +initiator_file=/etc/iscsi/initiatorname.iscsi diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 994a11583..69529c902 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 -auths_file=/etc/iscsi/auths targets_file=/etc/iscsi/targets -iscsi_server=/usr/sbin/iscsi-target opts_file=/etc/sysconfig/netbsd-iscsi +auths_file=/etc/iscsi/auths +iscsi_server=/usr/sbin/iscsi-target diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index b4e6988e1..33374e138 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 +config_file=/etc/iet/ietd.conf ietadm=ietadm +targets_file=/etc/iet/targets.allow initiators_file=/etc/iet/initiators.allow -init_name=iscsitarget opts_file=/etc/default/iscsitarget -config_file=/etc/iet/ietd.conf -targets_file=/etc/iet/targets.allow -pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid +init_name=iscsitarget diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 474e6caff..5b4b40ab1 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ -tgtadm=tgtadm +tgtadmin=tgt-admin tgtd=tgtd init_name=tgtd -tgtadmin=tgt-admin config_file=/etc/tgt/targets.conf +tgtadm=tgtadm diff --git a/webmin/jabber/config b/webmin/jabber/config index b2225d4a6..a6f9943dd 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -jabber_dir=/var/lib/jabber jabber_daemon=/usr/sbin/jabberd stop_cmd=/etc/init.d/jabberd stop 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 4587ce571..55d1e7111 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -auth_ldap=/etc/ldap.conf -init_name=nslcd secret=/etc/ldap.secret +init_name=nslcd +auth_ldap=/etc/ldap.conf diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index 488a741ae..b208794cc 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ -slapd=slapd -attr_count=6 -config_file=/etc/ldap/slapd.d apply_cmd=/etc/init.d/slapd restart -start_cmd=/etc/init.d/slapd start -ldap_user=openldap -schema_dir=/etc/ldap/schema +slapd=slapd init_name=slapd browse_max=100 +ldap_user=openldap +start_cmd=/etc/init.d/slapd start +schema_dir=/etc/ldap/schema +attr_count=6 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 3e11332fd..df5715aac 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -md5=0 -imap_class=SuSEeMailObject -other_class=inetOrgPerson -mailfmt=0 -imap_folders=old public sent-mail -samba_class=sambaSamAccount -membox=0 -samba_gclass=sambaGroup -samba_def=0 -given_order=0 -quota_support=0 -multi_fields=0 auth_ldap=/etc/ldap.conf ldap_tls=0 secmode=0 -imap_def=0 +gecos=1 +imap_login=cyrus +given=0 +given_order=0 +other_class=inetOrgPerson +samba_class=sambaSamAccount +mailfmt=0 +md5=0 +samba_def=0 +membox=0 imap_foldersep=. +imap_class=SuSEeMailObject +imap_folders=old public sent-mail +imap_def=0 +multi_fields=0 +shells=fixed,ldap,passwd,shells person=1 -gecos=1 +samba_gclass=sambaGroup slappasswd=slappasswd +quota_support=0 alias_same=0 -given=0 -imap_login=cyrus -shells=fixed,ldap,passwd,shells diff --git a/webmin/logrotate/config b/webmin/logrotate/config index d0c77369e..ece63a4d1 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 -sort_mode=0 +logrotate=logrotate diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index b13ee42ef..87f87c1dd 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -iface_owner=lp:lp -display_mode=0 driver_style=cups -start_cmd=/etc/init.d/cupsys start -iface_perms=755 -print_style=cups -model_path=/usr/share/foomatic/db /usr/share/ppd -spool_dir=/var/spool/cups +iface_owner=lp:lp +gs_fontpath= +smbclient_path=smbclient show_status=0 +spool_dir=/var/spool/cups +iface_perms=755 stop_cmd=/etc/init.d/cupsys stop gs_lib= -sort_mode=0 +model_path=/usr/share/foomatic/db /usr/share/ppd +start_cmd=/etc/init.d/cupsys start +print_style=cups gs_path=gs -show_jobs=0 -smbclient_path=smbclient +display_mode=0 +sort_mode=0 iface_arg= -gs_fontpath= +show_jobs=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 e5aff8372..338b28ab3 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -no_mailer=0 -size_mode=1 +mail_style=0 +mail_file=Mailbox sync_delete=1 wrap_width=80 -auto=1 -show_to=0 -sync_create=0 -maildir_deleted=0 -vpopmail_dir=/home/vpopmail -sort_mode=1 +spam_del=0 +ignore_users= +html_quote=0 +show_sent=0 +ignore_users_enabled=0 show_size=1 +show_size_below=0 +link_mode=0 +show_delall=0 +show_unread=0 +date_fmt=dmy mail_usermin=mail -spam_report= -open_mode=0 +html_edit=0 +mail_system=3 +sig_file=* +sort_mode=1 fwd_mode=0 -link_mode=0 -no_crlf=0 -spam_buttons=mail -sync_modify=1 -from_virtualmin=1 -column_count=4 +sync_perms=0700 view_html=0 +vpopmail_dir=/home/vpopmail +show_body=0 +spam_report= +arrows=1 delete_warn=y -max_records=200 -sig_file=* -show_mail=0 +no_crlf=0 show_count=0 -perpage=20 -mail_system=3 -ignore_users= -mail_style=0 -show_delall=0 -show_body=0 -show_size_below=0 +top_buttons=2 track_read=0 -noindex_hostname=0 -sync_perms=0700 mailbox_user=.usermin/mailbox -spam_del=0 +open_mode=0 mail_dir=Maildir -arrows=1 -html_quote=0 -top_buttons=2 -show_unread=0 -check_mod=1 -date_fmt=dmy -show_sent=0 log_read=0 -ignore_users_enabled=0 -html_edit=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 -mail_file=Mailbox +maildir_deleted=0 +column_count=4 +perpage=20 diff --git a/webmin/man/config b/webmin/man/config index 403a13735..125ab9995 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -kernel_dir=/usr/src/linux/Documentation -search_cmd=man -k PAGE +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 +doc_dir=/usr/share/doc +search_cmd=man -k PAGE list_cmd_sect=man -w SECTION PAGE -list_cmd=man -w PAGE -man_cmd_sect=man SECTION PAGE man2html_path=man2html -doc_dir=/usr/share/doc diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index ac433f6ce..f6f55935d 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.984 +server=MiniServ/1.990 diff --git a/webmin/mon/config b/webmin/mon/config index 2f31c62ff..6a1b0e5f1 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -cfbasedir=/etc/mon -stop_cmd=/etc/init.d/mon stop -start_cmd=/etc/init.d/mon start monshow=/usr/bin/monshow -mon_cgi=/var/www/cgi-bin/mon.cgi -restart_cmd=/etc/init.d/mon restart +stop_cmd=/etc/init.d/mon stop 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 diff --git a/webmin/mount/config b/webmin/mount/config index c5882427a..7c6c2575f 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -show_used=1 -smbclient_path=smbclient +sysinfo=1 +long_fstypes=1 +fstab_file=/etc/fstab nfs_check=1 -auto_file=/etc/am-utils/amd.conf +show_used=1 autofs_file=/etc/auto.master -fstab_file=/etc/fstab +auto_file=/etc/am-utils/amd.conf nmblookup_path=nmblookup sort_mode=2 -sysinfo=1 -long_fstypes=1 +smbclient_path=smbclient diff --git a/webmin/mysql/config b/webmin/mysql/config index 20de73ccb..48868a8ba 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -stop_cmd=service mysql stop +nodbi=0 +mysql_libs=/usr/local/mysql/lib +mysql_data=/var/lib/mysql passwd_mode=0 -login=root +mysqldump=/usr/bin/mysqldump mysqlshow=/usr/bin/mysqlshow -max_dbs=50 mysqladmin=/usr/bin/mysqladmin -start_cmd=service mysql start -add_mode=1 +date_subs=0 access=*: * -webmin_subs=0 +mysql=/usr/bin/mysql +mysqlimport=/usr/bin/mysqlimport +login=root perpage=25 -mysqldump=/usr/bin/mysqldump -max_text=1000 -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -blob_mode=0 -mysql_data=/var/lib/mysql style=0 -nodbi=0 -mysqlimport=/usr/bin/mysqlimport +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 nopwd=0 -date_subs=0 -mysql_libs=/usr/local/mysql/lib -mysql=/usr/bin/mysql +stop_cmd=service mysql stop diff --git a/webmin/mysql/version b/webmin/mysql/version index 7f1529f4e..4e69dc549 100644 --- a/webmin/mysql/version +++ b/webmin/mysql/version @@ -1 +1 @@ -8.0.27-0ubuntu0 +8.0.28-0ubuntu0 diff --git a/webmin/nis/config b/webmin/nis/config index 2e30d8d54..223a4e680 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ -nsswitch_conf=/etc/nsswitch.conf +max_size=100 client_conf=/etc/yp.conf +nsswitch_conf=/etc/nsswitch.conf manual_build=0 securenets=/etc/ypserv.securenets -max_size=100 diff --git a/webmin/openslp/config b/webmin/openslp/config index d84833406..a7a4992c5 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd=/usr/sbin/slpd slpd_reg=/etc/slp.reg -slpd_log=/var/log/slpd.log -slpd_conf=/etc/slp.conf slpd_pid=/var/run/slpd.pid +slpd_conf=/etc/slp.conf +slpd_log=/var/log/slpd.log +slpd=/usr/sbin/slpd diff --git a/webmin/pam/config b/webmin/pam/config index 29aeffd39..02a4dd593 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ pam_dir=/etc/pam.d -lib_dirs=/lib/security /lib/*/security 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 342ddbc88..f61aa554b 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -pppd=pppd -dialin_config=/etc/mgetty+sendfax/dialin.config -ppp_options=/etc/ppp/options -pap_file=/etc/ppp/pap-secrets +login_config=/etc/mgetty+sendfax/login.config serials=/dev/ttyS[0-9]* +pap_file=/etc/ppp/pap-secrets +ppp_options=/etc/ppp/options 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 04110de95..294c79b71 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ max_users=200 -input_type=0 sort_mode=0 +input_type=0 diff --git a/webmin/postfix/config b/webmin/postfix/config index e483e4d33..b056f232a 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ -prefix_cmts=0 +mailq_cmd=postqueue -p +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 +delete_warn=1 +max_maps=100 +postcat_cmd=/usr/sbin/postcat +columns=2 ldap_doms=0 -postfix_lookup_table_command=/usr/sbin/postmap -check_config=1 +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 -postfix_config_file=/etc/postfix/main.cf show_cmts=0 +fwd_mode=0 postfix_config_command=/usr/sbin/postconf -postfix_newaliases_command=/usr/bin/newaliases max_records=200 -postfix_aliases_table_command=/usr/sbin/postalias -delete_warn=1 -max_maps=100 -sort_mode=0 mailq_dir=/var/spool/postfix -wrap_width=80 -postfix_master=/etc/postfix/master.cf -postfix_control_command=/usr/sbin/postfix -mailq_sort=0 -top_buttons=1 -mailq_cmd=postqueue -p -postfix_queue_command=postqueue -columns=2 -index_check=1 -fwd_mode=0 -delete_confirm=1 -postcat_cmd=/usr/sbin/postcat +sort_mode=0 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 4a5e16001..b140ca9d9 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -style=0 -pass= -nodbi=0 +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= -simple_sched=0 +pass= +rstr_cmd=/usr/bin/pg_restore +basedb=template1 date_subs=0 blob_mode=0 -access_own=0 -basedb=template1 -start_cmd=/etc/init.d/postgresql* start -pid_file=/var/run/postmaster.pid -add_mode=1 sameunix=1 -access=*: * hba_conf=/etc/postgresql/*/main/pg_hba.conf +pid_file=/var/run/postmaster.pid webmin_subs=0 -perpage=25 -max_text=1000 -dump_cmd=/usr/bin/pg_dump -rstr_cmd=/usr/bin/pg_restore -stop_cmd=/etc/init.d/postgresql* stop -psql=/usr/bin/psql -login=postgres +simple_sched=0 +nodbi=0 +access_own=0 +style=0 max_dbs=50 diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 7af13e89f..237c75238 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ -file=/etc/wvdial.conf wvdial=wvdial wvdialconf=wvdialconf +file=/etc/wvdial.conf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index d16208a8f..121394bae 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 -pap_file=/etc/ppp/chap-secrets -peers_dir=/etc/ppp/peers pptp=pptp diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index f74f8d3dd..bad5821e0 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -ppp_options=/etc/ppp/options -file=/etc/pptpd.conf stop_cmd=/etc/init.d/pptpd stop pptp_ppp_options=/etc/ppp/pptpd-options -pap_file=/etc/ppp/chap-secrets -pptpd=pptpd +file=/etc/pptpd.conf +ppp_options=/etc/ppp/options pid_file=/var/run/pptpd.pid -start_cmd=/etc/init.d/pptpd start +pap_file=/etc/ppp/chap-secrets log_file=/var/log/messages +start_cmd=/etc/init.d/pptpd start +pptpd=pptpd diff --git a/webmin/proc/config b/webmin/proc/config index 741d6e45c..cf0fe003c 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ +cut_length=80 +default_mode=last trace_java=0 base_ppid=1 -hide_self=1 ps_style=linux -cut_length=80 -default_mode=last +hide_self=1 diff --git a/webmin/procmail/config b/webmin/procmail/config index 9b36ccfbe..d5df94749 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -procmail=procmail -procmailrc=/etc/procmailrc includes=0 +procmailrc=/etc/procmailrc +procmail=procmail diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 975589cca..98287bf92 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -test_manual=0 +test_always=0 proftpd_path=/usr/sbin/proftpd -stop_cmd=/etc/init.d/proftpd stop +test_manual=0 proftpd_conf=/etc/proftpd/proftpd.conf -pid_file=/var/run/proftpd.pid +test_config=1 ftpusers=/etc/ftpusers start_cmd=/etc/init.d/proftpd start -test_config=1 -test_always=0 +pid_file=/var/run/proftpd.pid +stop_cmd=/etc/init.d/proftpd stop diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index b9e4c8a3a..66a8d3129 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 +fwd_mode=0 +columns=2 perpage=20 +mail_file=Mailbox +index_min=1000000 +delete_warn=1 mail_dir= mailq_sort=0 mail_system=1 -mailq_count=0 -max_records=200 -delete_warn=1 -index_min=1000000 -mail_file=Mailbox -columns=2 -mail_dir_qmail=Maildir -fwd_mode=0 -sort_mode=0 -qmail_dir=/var/qmail diff --git a/webmin/quota/config b/webmin/quota/config index cbf3f9d30..7350d2381 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -group_setquota_command=setquota -g -user_copy_command=edquota -u -p +user_repquota_command=repquota -u -v +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 -user_grace_command=edquota -u -t display_max=100 -group_edquota_command=edquota -g -quotacheck_command=quotacheck -u -g -user_quotaoff_command=quotaoff -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 -sort_mode=0 -pc_show=1 -group_quotaon_command=quotaon -g group_repquota_command=repquota -g -v +user_quotaoff_command=quotaoff -u user_quotaon_command=quotaon -u -block_size=1024 -hide_uids=0 -group_copy_command=edquota -g -p -user_quota_command=quota -v -u -user_setquota_command=setquota -u -block_mode=1 -group_grace_command=edquota -g -t -user_repquota_command=repquota -u -v group_quotaoff_command=quotaoff -g +pc_show=1 diff --git a/webmin/raid/config b/webmin/raid/config index c4849915b..8ffe6d468 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ -mdstat=/proc/mdstat mdadm=/etc/mdadm/mdadm.conf +mdstat=/proc/mdstat raidtab=/etc/raidtab diff --git a/webmin/samba/config b/webmin/samba/config index e8c223e2c..3e4466e0d 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 -swat=/usr/sbin/swat -net=/usr/bin/net -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' -smb_conf=/etc/samba/smb.conf pdbedit=/usr/bin/pdbedit -samba_server=/usr/sbin/smbd +sort_mode=0 samba_password_program=/usr/bin/smbpasswd run_from_inetd=0 -start_cmd=service smbd start ; service nmbd start -restart_cmd=service smbd restart ; service nmbd restart +net=/usr/bin/net +smb_conf=/etc/samba/smb.conf smb_passwd=/etc/samba/smbpasswd -smbgroupedit=/usr/bin/smbgroupedit -dont_convert=-499 -sort_mode=0 -text_lists=0 +samba_server=/usr/sbin/smbd +swat=/usr/sbin/swat diff --git a/webmin/sarg/config b/webmin/sarg/config index 2afcf8310..125c56c89 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -sarg_conf=/etc/sarg/sarg.conf -naked=0 sarg=sarg clear=1 +sarg_conf=/etc/sarg/sarg.conf +naked=0 diff --git a/webmin/sendmail/config b/webmin/sendmail/config index 02babbe60..dd37a9e9b 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -mail_file=mbox -show_cmts=0 -mail_type=0 -max_records=200 -delete_warn=1 -index_min=1000000 +mailq_sort=0 +sendmail_mc=/etc/mail/sendmail.mc +sendmail_pid=/var/run/sendmail/mta/sendmail.pid sendmail_path=/usr/lib/sendmail -mailq_count=0 -sendmail_cf=/etc/mail/sendmail.cf +sendmail_command=/usr/lib/sendmail -bd -q1h perpage=20 -prefix_cmts=0 makemap_path=makemap -columns=2 -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -delete_confirm=1 +show_cmts=0 +show_to=0 fwd_mode=0 -sendmail_mc=/etc/mail/sendmail.mc -smrsh_dir=/etc/smrsh -top_buttons=1 -order_mail=0 -mailq_sort=0 +max_records=200 +sort_mode=0 sendmail_features=/usr/share/sendmail/cf -mailq_show=Date,From,To,Size,Status mail_dir=/var/spool/mail +delete_confirm=1 wrap_width=80 -mail_style=0 -sort_mode=0 track_read=0 -sendmail_command=/usr/lib/sendmail -bd -q1h -show_to=0 +top_buttons=1 +sendmail_cf=/etc/mail/sendmail.cf +delete_warn=1 +index_min=1000000 +smrsh_dir=/etc/smrsh +mail_style=0 +mail_file=mbox +order_mail=0 +columns=2 +prefix_cmts=0 +mailq_show=Date,From,To,Size,Status +mailq_count=0 +mail_type=0 diff --git a/webmin/servers/config b/webmin/servers/config index 4287c1e68..96f841dfb 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -sort_mode=0 -deffast=2 -show_ip=0 capath=/usr/share/ca-certificates -max_servers=100 -deflink=0 +deffast=2 resolve=1 +deflink=0 +scan_time=5 groups_dir=/etc/cluster/groups +show_ip=0 display_mode=0 +max_servers=100 +sort_mode=0 show_status=1 -scan_time=5 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 5980d830f..8c0f118b2 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ +macros=/usr/share/shorewall +shorewall=shorewall actions=/etc/shorewall/actions /usr/share/shorewall/actions.std config_dir=/etc/shorewall -macros=/usr/share/shorewall display_zone_descriptions=1 -shorewall=shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index 43cc6dea3..9a948f662 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ -shorewall6=shorewall6 -display_zone_descriptions=1 macros=/usr/share/shorewall6 -config_dir=/etc/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 364a682bf..8d9d9bb97 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ -ata=0 smartctl=smartctl attribs=1 mode=1 +ata=0 diff --git a/webmin/software/config b/webmin/software/config index 037d899f3..abefc9ae1 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ -update_system=apt apt_mode=0 package_system=debian +update_system=apt diff --git a/webmin/spam/config b/webmin/spam/config index d8edf5d39..a275ccca7 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -warn_procmail=1 -spamassassin=spamassassin procmail_cmd=* -procmailrc=/etc/procmailrc sa_learn=sa-learn -mode=0 -call_spam=1 -local_cf=/etc/spamassassin/local.cf +procmailrc=/etc/procmailrc +restart_cmd=/etc/init.d/spamassassin restart max_awl=200 -processes=spamd amavisd +local_cf=/etc/spamassassin/local.cf +warn_procmail=1 +spamassassin=spamassassin +call_spam=1 addto=0 -restart_cmd=/etc/init.d/spamassassin restart +processes=spamd amavisd +mode=0 diff --git a/webmin/squid/config b/webmin/squid/config index f1d8e85e2..8156ddb78 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -cache_dir=/var/spool/squid -cal_args=-aw +squid_stop=service squid stop squid_path=squid -pid_file=/var/run/squid.pid +cal_all=1 calamaris=calamaris +sync_create=0 +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 -squid_restart=service squid reload -squid_start=service squid start restart_pos=0 -cal_all=1 -cal_fmt=w +cal_args=-aw +sync_modify=1 sync_delete=0 +cache_dir=/var/spool/squid squidclient=squidclient -sync_modify=1 -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi -squid_stop=service squid stop +squid_restart=service squid reload +cal_fmt=w log_dir=/var/log/squid -sync_create=0 crypt_conf=0 -sort_conf=0 -squid_conf=/etc/squid/squid.conf +squid_start=service squid start diff --git a/webmin/sshd/config b/webmin/sshd/config index a0a125f2c..e4f82e418 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ stop_cmd=service ssh stop -sshd_config=/etc/ssh/sshd_config -sync_pass=0 +pid_file=/var/run/sshd.pid sync_gnupg=0 -sync_auth=1 +sshd_path=/usr/sbin/sshd start_cmd=service ssh start -client_config=/etc/ssh/ssh_config -pid_file=/var/run/sshd.pid +sync_auth=1 keygen_path=/usr/bin/ssh-keygen -sshd_path=/usr/sbin/sshd +client_config=/etc/ssh/ssh_config +sshd_config=/etc/ssh/sshd_config sync_create=0 +sync_pass=0 diff --git a/webmin/status/config b/webmin/status/config index ad7d1d3e3..d66d1d828 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,14 +1,14 @@ -pinger=linux -sched_offset=0 -columns=2 -sysinfo_users=0 +snmp_trap=1.3.6.1.4.1.10000.1.1 history_purge=30 -index_status=1 snmp_version=2 -sysinfo=0 -history_show=50 +index_status=1 +sched_offset=0 sort_mode=0 -output=0 +sysinfo_users=0 +pinger=linux pager_cmd=sms_client +columns=2 +sysinfo=0 subject_mode=0 -snmp_trap=1.3.6.1.4.1.10000.1.1 +history_show=50 +output=0 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index b92f41137..e7d78e6c5 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -compressed=1 -start_cmd=/etc/init.d/syslog-ng start -syslogng_cmd=syslog-ng pid_file=/var/run/syslog-ng.pid +compressed=1 stop_cmd=/etc/init.d/syslog-ng stop -lines=20 +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 7ec7ca6cb..36eb1720f 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 +signal_cmd=/usr/sbin/service rsyslog restart +restart_cmd=/usr/sbin/service rsyslog restart +tags=0 +socket=0 +pipe=1 reverse=0 -start_cmd=/usr/sbin/service rsyslog start +pri_all=1 compressed=1 -m4_path= -restart_cmd=/usr/sbin/service rsyslog restart pid_file=/var/run/rsyslogd.pid -pipe=1 +lines=20 +syslog_conf=/etc/rsyslog.conf +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 -signal_cmd=/usr/sbin/service rsyslog restart -pri_all=1 -socket=0 m4_conf=0 -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -pri_dir=1 -lines=20 +m4_path= sync=1 -tags=0 -syslog_conf=/etc/rsyslog.conf diff --git a/webmin/system-status/config b/webmin/system-status/config index b6a7e4155..c627a9fec 100644 --- a/webmin/system-status/config +++ b/webmin/system-status/config @@ -1,2 +1,2 @@ -collect_interval=5 collect_pkgs=1 +collect_interval=5 diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config index bfd2d19d4..161d92a01 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ -inetd_services=0 hosts_allow=/etc/hosts.allow hosts_deny=/etc/hosts.deny +inetd_services=0 diff --git a/webmin/telnet/config b/webmin/telnet/config index 634438b50..1c000fc6a 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ +detach=0 mode=1 -proxy=0 sizemode=0 -detach=0 +proxy=0 no_test=0 diff --git a/webmin/time/config b/webmin/time/config index 858452b37..3cdb79a0e 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 -timeserver_hardware=1 +lease=5 ntp_only=1 diff --git a/webmin/updown/config b/webmin/updown/config index aba856c09..7342994c1 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ ddir=/ -duser=root dir=/ +duser=root user=root diff --git a/webmin/useradmin/config b/webmin/useradmin/config index e2a36f7ba..77cd52d79 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -uid_calc=0 -secmode=0 -random_password=0 -shadow_file=/etc/shadow +extra_real=0 +homedir_perms=0755 +empty_mode=0 +md5=1 +passwd_stars=0 +alias_check=0 skip_md5=0 -email_type=0 -uid_mode=1 -selinux_con=user_u:object_r:user_home_dir_t user_files=/etc/skel -extra_real=0 -passwd_dict=0 -shells=fixed,passwd,shells -base_uid=1000 -new_user_gid=0 +display_mode=1 +membox=0 last_show=0 -delete_root=0 -group_file=/etc/group -display_max=400 +gid_calc=0 +delete_only=0 +lock_string=* +passwd_progmode=0 from_files=0 -base_gid=1000 -display_mode=1 +passwd_dict=0 +base_uid=1000 gshadow_file=/etc/gshadow -passwd_same=0 -md5=1 -home_base=/home -alias_check=0 -empty_mode=0 -default_group=users -delete_only=0 +base_gid=1000 +secmode=0 +shadow_file=/etc/shadow +uid_calc=0 +delete_root=0 default_other=1 -passwd_progmode=0 +passwd_file=/etc/passwd gid_mode=1 -membox=0 +group_file=/etc/group +new_user_group=0 sort_mode=0 +passwd_same=0 +home_base=/home +selinux_con=user_u:object_r:user_home_dir_t home_style=0 -new_user_group=0 -passwd_stars=0 -lock_string=* -homedir_perms=0755 -gid_calc=0 -passwd_file=/etc/passwd +default_group=users +email_type=0 +new_user_gid=0 +display_max=400 +uid_mode=1 +shells=fixed,passwd,shells +random_password=0 diff --git a/webmin/usermin/config b/webmin/usermin/config index a4b4d7968..24b615c42 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -usermin_dir=/etc/usermin -upshow=1 cron_mode=0 +upshow=1 upmissing=0 -uphour=4 +usermin_dir=/etc/usermin update=0 updays=1 +uphour=4 diff --git a/webmin/version b/webmin/version index 3d21771ae..827f7cd67 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.984 +1.990 diff --git a/webmin/vgetty/config b/webmin/vgetty/config index bb4eec4d2..00f79ad34 100644 --- a/webmin/vgetty/config +++ b/webmin/vgetty/config @@ -1,2 +1,2 @@ -vgetty_cmd=vgetty vgetty_config=/etc/mgetty+sendfax/voice.conf +vgetty_cmd=vgetty diff --git a/webmin/webalizer/config b/webmin/webalizer/config index 023508f00..0a9e11e78 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -webalizer=/usr/bin/webalizer webalizer_conf=/etc/webalizer/webalizer.conf alt_conf=/etc/webalizer/webalizer.conf.sample -auto=apache,squid,proftpd,wuftpd -skip_old=0 +webalizer=/usr/bin/webalizer naked=0 +skip_old=0 +auto=apache,squid,proftpd,wuftpd diff --git a/webmin/webmin/config b/webmin/webmin/config index 1fbd7e8be..0ef0141a4 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ +upshow=1 cron_mode=0 -osdn=1 -letsencrypt_dns_wait=10 +last_version_check=1549050668 warn_days=7 +upmissing=0 updays=1 -update=0 +last_version_number=1.900 upmins=47 -upmissing=0 -last_version_check=1549050668 +osdn=1 +update=0 uphour=23 -upshow=1 -last_version_number=1.900 +letsencrypt_dns_wait=10 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index 98189b873..aba4f69e8 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 -ftpgroups=/etc/wu-ftpd/ftpgroups +pid_file=/var/run/ftpd.pids-all log_file=/var/log/xferlog -ftphosts=/etc/wu-ftpd/ftphosts -ftpusers=/etc/wu-ftpd/ftpusers ftpaccess=/etc/wu-ftpd/ftpaccess -pid_file=/var/run/ftpd.pids-all -ftpd_path=/usr/sbin/wu-ftpd +ftpgroups=/etc/wu-ftpd/ftpgroups +ftphosts=/etc/wu-ftpd/ftphosts diff --git a/webmin/xinetd/config b/webmin/xinetd/config index b733863ce..96216e74c 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -xinetd_conf=/etc/xinetd.conf -start_cmd=/etc/init.d/xinetd start pid_file=/var/run/xinetd.pid -protocols_file=/etc/protocols +start_cmd=/etc/init.d/xinetd start lookup_servs=1 +xinetd_conf=/etc/xinetd.conf +protocols_file=/etc/protocols -- 2.43.0