From 93a3d66ddd5a48ac499a71d881da2c99abd9f894 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Wed, 16 Jun 2021 11:30:26 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -imagemagick-6-common 8:6.9.10.23+dfsg-2.1ubuntu11.2 all +imagemagick-6-common 8:6.9.10.23+dfsg-2.1ubuntu11.4 all -libmagickcore-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.2 amd64 -libmagickwand-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.2 amd64 +libmagickcore-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.4 amd64 +libmagickwand-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.4 amd64 -python3-ply 3.11-3build1 all +python3-ply 3.11-3ubuntu0.1 all -webmin 1.974 all +webmin 1.979 all --- webmin/acl/config | 2 +- webmin/adsl-client/config | 8 +-- webmin/apache/config | 36 +++++----- webmin/apache/httpd-info | 4 +- webmin/at/config | 2 +- webmin/backup-config/config | 2 +- webmin/bacula-backup/config | 14 ++-- webmin/bind8/config | 74 ++++++++++---------- webmin/cluster-passwd/config | 2 +- webmin/cluster-software/config | 2 +- webmin/cluster-useradmin/config | 12 ++-- webmin/cluster-usermin/config | 2 +- webmin/config | 44 ++++++------ webmin/cpan/config | 6 +- webmin/cron/config | 32 ++++----- webmin/custom/config | 4 +- webmin/dhcpd/config | 22 +++--- webmin/dovecot/config | 4 +- webmin/exim/config | 12 ++-- webmin/exports/config | 2 +- webmin/fail2ban/config | 4 +- webmin/failed.pl | 1 + webmin/fetchmail/config | 6 +- webmin/filter/config | 4 +- webmin/firewall/config | 4 +- webmin/firewall6/config | 6 +- webmin/firewalld/config | 2 +- webmin/fsdump/config | 10 +-- webmin/grub/config | 2 +- webmin/heartbeat/config | 20 +++--- webmin/htaccess-htpasswd/config | 12 ++-- webmin/idmapd/config | 2 +- webmin/inetd/config | 24 +++---- webmin/init/config | 24 +++---- webmin/ipfilter/config | 8 +-- webmin/ipfw/config | 6 +- webmin/ipsec/config | 12 ++-- webmin/iscsi-client/config | 6 +- webmin/iscsi-server/config | 4 +- webmin/iscsi-target/config | 6 +- webmin/iscsi-tgtd/config | 4 +- webmin/jabber/config | 4 +- webmin/ldap-client/config | 4 +- webmin/ldap-server/config | 8 +-- webmin/ldap-useradmin/config | 34 +++++----- webmin/login.pl | 1 + webmin/logout.pl | 1 + webmin/logrotate/config | 4 +- webmin/lpadmin/config | 22 +++--- webmin/mailboxes/config | 82 +++++++++++------------ webmin/man/config | 10 +-- webmin/miniserv.conf | 2 +- webmin/mon/config | 6 +- webmin/mount/config | 12 ++-- webmin/mysql/config | 30 ++++----- webmin/mysql/version | 2 +- webmin/nis/config | 4 +- webmin/openslp/config | 4 +- webmin/pam/config | 4 +- webmin/pap/config | 8 +-- webmin/postfix/config | 40 +++++------ webmin/postgresql/config | 38 +++++------ webmin/ppp-client/config | 4 +- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 12 ++-- webmin/proc/config | 6 +- webmin/procmail/config | 2 +- webmin/proftpd/config | 10 +-- webmin/qmailadmin/config | 18 ++--- webmin/quota/config | 38 +++++------ webmin/raid/config | 2 +- webmin/samba/config | 22 +++--- webmin/sarg/config | 4 +- webmin/sendmail/config | 42 ++++++------ webmin/servers/config | 12 ++-- webmin/shorewall/config | 6 +- webmin/shorewall6/config | 4 +- webmin/smart-status/config | 4 +- webmin/spam/config | 14 ++-- webmin/squid/config | 28 ++++---- webmin/sshd/config | 12 ++-- webmin/status/config | 14 ++-- webmin/syslog-ng/config | 6 +- webmin/syslog/config | 28 ++++---- webmin/system-status/config | 2 +- webmin/system-status/enable-collection.pl | 1 + webmin/telnet/config | 4 +- webmin/time/config | 4 +- webmin/useradmin/config | 58 ++++++++-------- webmin/usermin/config | 8 +-- webmin/version | 2 +- webmin/vgetty/config | 2 +- webmin/webalizer/config | 6 +- webmin/webmin/config | 12 ++-- webmin/wuftpd/config | 10 +-- webmin/xinetd/config | 2 +- 96 files changed, 590 insertions(+), 586 deletions(-) diff --git a/webmin/acl/config b/webmin/acl/config index c572bfa88..017dd0405 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ -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 5e183f2af..fd5b932c3 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -pap_file=/etc/ppp/pap-secrets -start_cmd=adsl-start -stop_cmd=adsl-stop -pppoe_conf=/etc/ppp/pppoe.conf pppoe_cmd=pppoe +stop_cmd=adsl-stop +start_cmd=adsl-start status_cmd=adsl-status conf_style=0 +pap_file=/etc/ppp/pap-secrets +pppoe_conf=/etc/ppp/pppoe.conf diff --git a/webmin/apache/config b/webmin/apache/config index b64d5913d..87d7b9740 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -stop_cmd=/etc/init.d/apache2 stop -defines_name=APACHE_ARGUMENTS -link_dir=/etc/apache2/sites-enabled -apachectl_path=/usr/sbin/apache2ctl -httpd_dir=/etc/apache2 -test_always=0 -defines_file=/etc/apache2/envvars test_config=1 +apply_cmd=/usr/sbin/apache2ctl graceful +test_apachectl=1 +test_manual=0 +virt_file=/etc/apache2/sites-available +show_list=0 +defines_name=APACHE_ARGUMENTS max_servers=100 -srm_conf=/etc/apache2/srm.conf +mime_types=/etc/apache2/mime.types auto_mods=1 -allow_virtualmin=0 -test_apachectl=1 -show_order=0 +defines_file=/etc/apache2/envvars +httpd_dir=/etc/apache2 +stop_cmd=/etc/init.d/apache2 stop +link_dir=/etc/apache2/sites-enabled +start_cmd=/etc/init.d/apache2 start access_conf=/etc/apache2/access.conf -show_list=0 +show_order=0 +httpd_conf=/etc/apache2/apache2.conf +srm_conf=/etc/apache2/srm.conf +apachectl_path=/usr/sbin/apache2ctl httpd_path=/usr/sbin/apache2 show_names=0 -httpd_conf=/etc/apache2/apache2.conf -virt_file=/etc/apache2/sites-available -start_cmd=/etc/init.d/apache2 start -test_manual=0 -mime_types=/etc/apache2/mime.types -apply_cmd=/usr/sbin/apache2ctl graceful +allow_virtualmin=0 +test_always=0 diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index f3ba49775..37e584aae 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,4 +1,4 @@ -time=1615648121 +time=1623136011 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd -version=2.446 +version=2.448 diff --git a/webmin/at/config b/webmin/at/config index 6f83c111c..abf2f6455 100644 --- a/webmin/at/config +++ b/webmin/at/config @@ -1,2 +1,2 @@ -at_style=linux at_dir=/var/spool/cron/atjobs +at_style=linux diff --git a/webmin/backup-config/config b/webmin/backup-config/config index c6694b382..c13b50ad6 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 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index 984f7d99b..264c5e47e 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -user=bacula init_start=0 +showdirs=0 +bacula_dir=/etc/bacula pass= -db=bacula +driver=Pg +apply=1 +user=bacula +btape=btape wait=1 bls=bls +db=bacula bextract=bextract -btape=btape -driver=Pg -bacula_dir=/etc/bacula -showdirs=0 -apply=1 diff --git a/webmin/bind8/config b/webmin/bind8/config index be8d0ff2c..57386ecc0 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,46 +1,46 @@ -ipv6_mode=1 -by_view=0 -checkzone=named-checkzone -allow_comments=0 -rndc_cmd=rndc -no_pid_chroot=0 -soa_style=0 -confirm_rec=0 -allow_long=0 -force_random=0 +rev_must=0 +named_conf=/etc/bind/named.conf confirm_zone=1 -reversezonefilename_format=ZONE.rev -dnssec_info=1 -rndcconf_cmd=rndc-confgen -forwardzonefilename_format=ZONE.hosts -rev_def=0 -updserial_def=0 -slave_dir=/var/lib/bind -largezones=0 other_slaves=1 -no_chroot=0 -records_order=0 -relative_paths=0 +support_aaaa=1 +rndc_cmd=rndc +named_path=/usr/sbin/named +ipv6_mode=1 +show_list=0 +rndcconf_cmd=rndc-confgen checkconf=named-checkconf -rndc_conf=/etc/bind/rndc.conf -rev_must=0 -updserial_man=1 allow_underscore=1 +whois_cmd=whois +forwardzonefilename_format=ZONE.hosts +max_zones=50 +reversezonefilename_format=ZONE.rev +updserial_man=1 +master_dir=/var/lib/bind pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid -signzone=dnssec-signzone -allow_wild=1 +no_chroot=0 +confirm_rec=0 spf_record=0 +updserial_def=0 zones_file=/etc/bind/named.conf.local -master_ttl=1 -support_aaaa=1 -max_zones=50 -short_names=0 -master_dir=/var/lib/bind -named_path=/usr/sbin/named -ndc_cmd=ndc updserial_on=1 -show_list=0 -soa_start=0 +force_random=0 +signzone=dnssec-signzone +allow_wild=1 +no_pid_chroot=0 +rev_def=0 +checkzone=named-checkzone +ndc_cmd=ndc +soa_style=0 +largezones=0 +allow_comments=0 keygen=dnssec-keygen -named_conf=/etc/bind/named.conf -whois_cmd=whois +short_names=0 +relative_paths=0 +soa_start=0 +master_ttl=1 +rndc_conf=/etc/bind/rndc.conf +dnssec_info=1 +allow_long=0 +records_order=0 +slave_dir=/var/lib/bind +by_view=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-software/config b/webmin/cluster-software/config index fd788cb1e..470eaee86 100644 --- a/webmin/cluster-software/config +++ b/webmin/cluster-software/config @@ -1,2 +1,2 @@ -table_mode=0 sort_mode=0 +table_mode=0 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index 5c5784fc6..67c3e504f 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -table_mode=0 -conf_find_user=1 -conf_find_group=1 -conf_allow_refresh=1 -conf_allow_sync=1 -conf_add_user=1 sort_mode=0 +conf_find_group=1 +conf_find_user=1 conf_add_group=1 conf_host_links=1 +conf_add_user=1 +conf_allow_sync=1 +conf_allow_refresh=1 +table_mode=0 diff --git a/webmin/cluster-usermin/config b/webmin/cluster-usermin/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-usermin/config +++ b/webmin/cluster-usermin/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/config b/webmin/config index 022504ed4..9c1c9a30e 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +real_os_version=18.04.1 os_version=9.0 -lang_root=de.UTF-8 -ld_env=LD_LIBRARY_PATH -referers_none=1 -feedback_to= -passwd_cindex=2 -product=webmin -showlogin=0 lang=en.UTF-8 +tempdelete_days=7 real_os_type=Ubuntu Linux -help_height= +webprefix= +help_width= +feedback_to= +nofeedbackcc=0 +product=webmin md5pass=1 -by_view=0 path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -nofeedbackcc=0 -webprefix= passwd_mindex=4 -real_os_version=18.04.1 -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -passwd_file=/etc/shadow -theme=authentic-theme -dateformat=dd/mon/yyyy +showhost=0 +by_view=0 passwd_uindex=0 -tempdelete_days=7 -log=1 +ld_env=LD_LIBRARY_PATH sysinfo=0 -hostnamemode=0 -passwd_pindex=1 -showhost=0 +theme=authentic-theme +passwd_file=/etc/shadow hostnamedisplay= -help_width= +lang_root=de.UTF-8 +passwd_cindex=2 +referers_none=1 +showlogin=0 +hostnamemode=0 +help_height= os_type=debian-linux +passwd_pindex=1 +dateformat=dd/mon/yyyy +log=1 diff --git a/webmin/cpan/config b/webmin/cpan/config index 201970d3f..54f5a54c3 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ incyum=1 -save_partial=0 packages=http://www.cpan.org/modules/02packages.details.txt.gz -refresh_days=30 -incpackages=1 cpan=http://www.cpan.org/authors/id +incpackages=1 +save_partial=0 +refresh_days=30 diff --git a/webmin/cron/config b/webmin/cron/config index b0a0004fa..3fec1d948 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ +cron_delete_command=crontab -u USER -r +match_mode=0 +run_parts=run-parts +cron_user_edit_command=crontab -e +system_crontab=/etc/crontab +cron_allow_file=/var/spool/cron/allow +vixie_cron=1 +cron_deny_file=/var/spool/cron/deny +cronfiles_dir=/etc/cron.d +max_len=80 +cron_input=1 match_user=1 max_jobs=100 +hourly_only=0 cron_deny_all=2 -cron_deny_file=/var/spool/cron/deny -cron_input=1 -cron_user_edit_command=crontab -e show_time=0 cron_user_delete_command=crontab -r -max_len=80 -cronfiles_dir=/etc/cron.d -hourly_only=0 -cron_delete_command=crontab -u USER -r -vixie_cron=1 -match_mode=0 -show_comment=0 -cron_edit_command=crontab -u USER -e +show_next=0 cron_user_get_command=crontab -l +show_comment=0 +show_run=0 cron_dir=/var/spool/cron/crontabs -system_crontab=/etc/crontab -cron_allow_file=/var/spool/cron/allow cron_get_command=crontab -u USER -l -show_run=0 +cron_edit_command=crontab -u USER -e kill_subs=0 -show_next=0 -run_parts=run-parts diff --git a/webmin/custom/config b/webmin/custom/config index b0d710c45..55a8becd6 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -params_cmd=0 -display_mode=0 columns=2 params_file=0 +display_mode=0 +params_cmd=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index bd51b3012..54654dad5 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,17 +1,17 @@ -desc_name=0 +show_mac=0 lease_sort=0 -stop_cmd=service isc-dhcp-server stop -lease_vendor=0 -group_name=0 -dhcpd_conf=/etc/dhcp/dhcpd.conf +dhcpd_nocols=5 +desc_name=0 +lease_tz=0 display_max=100 restart_cmd=service isc-dhcp-server restart -pid_file=/var/run/dhcpd.pid -show_mac=0 -lease_file=/var/lib/dhcp/dhcpd.leases -dhcpd_nocols=5 show_ip=0 -start_cmd=service isc-dhcp-server start +lease_vendor=0 interfaces_type=debian -lease_tz=0 +dhcpd_conf=/etc/dhcp/dhcpd.conf +stop_cmd=service isc-dhcp-server stop +lease_file=/var/lib/dhcp/dhcpd.leases +start_cmd=service isc-dhcp-server start +pid_file=/var/run/dhcpd.pid dhcpd_path=/usr/sbin/dhcpd +group_name=0 diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 658fb103e..106ee6dbb 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ -dovecot=/usr/sbin/dovecot -dovecot_config=/etc/dovecot/dovecot.conf init_script=dovecot +dovecot_config=/etc/dovecot/dovecot.conf pid_file=/var/run/dovecot/master.pid +dovecot=/usr/sbin/dovecot diff --git a/webmin/exim/config b/webmin/exim/config index 038c2c1e3..7615024b8 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_mail_file=Maildir -exim_addrfile=/etc/exim4/email-addresses -mail_system=1 -exim_dir=/etc/exim4 -exim_dbmext=.dbm -exim_aliasfileext= exim_virt_dir=/etc/exim4/aliases +exim_dbmext=.dbm exim_dbmfile=/etc/exim4/local_domains +exim_aliasfileext= +mail_system=1 +exim_dir=/etc/exim4 +exim_mail_file=Maildir +exim_addrfile=/etc/exim4/email-addresses diff --git a/webmin/exports/config b/webmin/exports/config index 78081f81c..8f8b567ee 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ -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 aebf23ff0..d058f9824 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ -client_cmd=/usr/bin/fail2ban-client -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/failed.pl b/webmin/failed.pl index 60342d489..235639bef 100755 --- a/webmin/failed.pl +++ b/webmin/failed.pl @@ -8,5 +8,6 @@ $root || die "No root= line found in /etc/webmin/miniserv.conf"; $ENV{'PERLLIB'} = "$root"; $ENV{'WEBMIN_CONFIG'} = "/etc/webmin"; $ENV{'WEBMIN_VAR'} = "/var/webmin"; +delete($ENV{'MINISERV_CONFIG'}); chdir("$root"); exec("$root/record-failed.pl", @ARGV) || die "Failed to run $root/record-failed.pl : $!"; diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 99ab0f6f8..c20ad8cc1 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ max_users=400 +daemon_user=root +view_mode=0 config_file= -pid_file=/var/run/fetchmail.pid fetchmail_path=fetchmail -view_mode=0 -daemon_user=root +pid_file=/var/run/fetchmail.pid diff --git a/webmin/filter/config b/webmin/filter/config index 935c86bc6..946703895 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ -forward_procmail=0 -alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases warn_procmail=1 virtualmin_config=/etc/webmin/virtual-server virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl +forward_procmail=0 reply_force=0 +alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases diff --git a/webmin/firewall/config b/webmin/firewall/config index 76fed521d..c7a2d7d24 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ comment_mod=0 view_comment=0 cluster_mode=1 -view_condition=1 -force_init=0 direct=0 +force_init=0 +view_condition=1 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 82939db86..3f182ff0a 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -force_init=0 -direct=0 -comment_mod=0 view_comment=0 cluster_mode=1 +comment_mod=0 +direct=0 +force_init=0 view_condition=1 diff --git a/webmin/firewalld/config b/webmin/firewalld/config index ff329a00d..0aae64fac 100644 --- a/webmin/firewalld/config +++ b/webmin/firewalld/config @@ -1,2 +1,2 @@ -firewall_cmd=firewall-cmd init_name=firewalld +firewall_cmd=firewall-cmd diff --git a/webmin/fsdump/config b/webmin/fsdump/config index a6930596b..6f0f9254c 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -webmin_subs=0 -run_mode=0 -always_tar=0 -date_subs=0 -error_email=0 nonewtape=0 +date_subs=0 +always_tar=0 +run_mode=0 simple_sched=0 +error_email=0 +webmin_subs=0 diff --git a/webmin/grub/config b/webmin/grub/config index 084704907..f6464eb2a 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ install=(hd0) -menu_file=/boot/grub/menu.lst grub_path=grub +menu_file=/boot/grub/menu.lst diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 958a6ed12..defab373e 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -serials=/dev/ttyS* -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys -ha_cf= -authkeys= -heartbeat=/usr/lib/heartbeat/heartbeat -alt_haresources=/usr/share/doc/packages/heartbeat/haresources alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf apply_cmd=/etc/init.d/heartbeat reload -haresources= -start_cmd=/etc/init.d/heartbeat start +authkeys= +resource_d= +serials=/dev/ttyS* req_resource_cmd=/usr/lib/heartbeat/req_resource -ha_dir=/etc/ha.d +heartbeat=/usr/lib/heartbeat/heartbeat +ha_cf= stop_cmd=/etc/init.d/heartbeat stop -resource_d= +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +haresources= +alt_haresources=/usr/share/doc/packages/heartbeat/haresources +ha_dir=/etc/ha.d pid_file=/var/run/heartbeat.pid +start_cmd=/etc/init.d/heartbeat start diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index 293b3d362..7907b3f7f 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -extra_directives= -sort=0 -htpasswd=.htpasswd -digest=1 -sha1=0 -md5=1 htgroups=.htgroups htaccess=.htaccess +digest=1 +md5=1 +sha1=0 +sort=0 +extra_directives= +htpasswd=.htpasswd diff --git a/webmin/idmapd/config b/webmin/idmapd/config index f25eeba97..d6cd4227f 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 +restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi idmapd_path=/usr/sbin/rpc.idmapd diff --git a/webmin/inetd/config b/webmin/inetd/config index 5dad58cf6..e8d1d75fa 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -rpc_file=/etc/rpc -rpc_protocols=tcp udp -ipv6=0 -rpc_inetd=1 -deny_file=/etc/hosts.deny -protocols_file=/etc/protocols -inetd_conf_file=/etc/inetd.conf -tcpd_path=/usr/sbin/tcpd show_empty=1 -sort_mode=0 -qm_mode=0 -restart_command=killall -HUP inetd +protocols_file=/etc/protocols +services_file=/etc/services allow_file=/etc/hosts.allow +ipv6=0 +sort_mode=0 display_max=100 extended_inetd=1 -services_file=/etc/services +inetd_conf_file=/etc/inetd.conf +tcpd_path=/usr/sbin/tcpd +rpc_inetd=1 +rpc_protocols=tcp udp +rpc_file=/etc/rpc +restart_command=killall -HUP inetd +deny_file=/etc/hosts.deny +qm_mode=0 diff --git a/webmin/init/config b/webmin/init/config index 9bcd5010c..3c3fc5108 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -init_dir=/etc/init.d -soft_links=1 -no_chkconfig=0 -init_base=/etc/ init_info=1 -show_opts=0 -reboot_command=reboot -desc=1 +init_base=/etc/ order=0 -shutdown_command=poweroff -expert=0 -order_digits=2 status_check=0 -atboot_product=webmin +no_chkconfig=0 +sort_mode=0 inittab_id=id +expert=0 +reboot_command=reboot +show_opts=0 +soft_links=1 +atboot_product=webmin +order_digits=2 +desc=1 +shutdown_command=poweroff boot_levels=2 3 5 -sort_mode=0 +init_dir=/etc/init.d diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index fdebcd946..7cb54a2de 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ -cluster_mode=0 ipf_conf=/etc/ipf/ipf.conf ipf=ipf -ipnat=ipnat view_condition=1 ipnat_conf=/etc/ipf/ipnat.conf -view_comment=0 -cluster_nat=1 ipfstat=ipfstat +ipnat=ipnat +cluster_nat=1 +view_comment=0 +cluster_mode=0 diff --git a/webmin/ipfw/config b/webmin/ipfw/config index e927f16f7..0593c117d 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -view_comment=0 +view_counters=0 +view_condition=1 version=2 ipfw=/sbin/ipfw -view_condition=1 +view_comment=0 cluster_mode=0 -view_counters=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 191f13a15..6caa0bd68 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ -file=/etc/ipsec.conf -ipsec=/usr/sbin/ipsec -logfile=/var/log/messages -restart_cmd=/etc/init.d/ipsec restart -start_cmd=/etc/init.d/ipsec start +stop_cmd=/etc/init.d/ipsec stop secrets=/etc/ipsec.secrets policies_dir=/etc/ipsec.d/policies -stop_cmd=/etc/init.d/ipsec stop +restart_cmd=/etc/init.d/ipsec restart +ipsec=/usr/sbin/ipsec +start_cmd=/etc/init.d/ipsec start +file=/etc/ipsec.conf +logfile=/var/log/messages diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 9e1711732..ab04a7b87 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -init_name=open-iscsi -initiator_file=/etc/iscsi/initiatorname.iscsi +iscsiadm=iscsiadm iscsiiname=iscsi-iname config_file=/etc/iscsi/iscsid.conf -iscsiadm=iscsiadm +initiator_file=/etc/iscsi/initiatorname.iscsi +init_name=open-iscsi ifaces_dir=/var/lib/iscsi/ifaces diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index d31eaf93d..185ca6178 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ +init_name=netbsd-iscsi +targets_file=/etc/iscsi/targets opts_file=/etc/sysconfig/netbsd-iscsi auths_file=/etc/iscsi/auths -init_name=netbsd-iscsi iscsi_server=/usr/sbin/iscsi-target pid_file=/var/run/iscsi-target.pid -targets_file=/etc/iscsi/targets diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index f154008c8..5071f24b3 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ -targets_file=/etc/iet/targets.allow -pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid init_name=iscsitarget initiators_file=/etc/iet/initiators.allow +targets_file=/etc/iet/targets.allow opts_file=/etc/default/iscsitarget -config_file=/etc/iet/ietd.conf +pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid ietadm=ietadm +config_file=/etc/iet/ietd.conf diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 90828cbbe..2cf30091b 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ -init_name=tgtd -tgtadmin=tgt-admin tgtadm=tgtadm tgtd=tgtd config_file=/etc/tgt/targets.conf +init_name=tgtd +tgtadmin=tgt-admin diff --git a/webmin/jabber/config b/webmin/jabber/config index 415989b80..e37142113 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -jabber_config=/etc/jabber/jabber.xml stop_cmd=/etc/init.d/jabberd stop -start_cmd=/etc/init.d/jabberd start +jabber_config=/etc/jabber/jabber.xml jabber_daemon=/usr/sbin/jabberd 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..4587ce571 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -secret=/etc/ldap.secret -init_name=nslcd auth_ldap=/etc/ldap.conf +init_name=nslcd +secret=/etc/ldap.secret diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index f47a11828..33facfa15 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ +slapd=slapd init_name=slapd +apply_cmd=/etc/init.d/slapd restart attr_count=6 stop_cmd=/etc/init.d/slapd stop -config_file=/etc/ldap/slapd.d schema_dir=/etc/ldap/schema +config_file=/etc/ldap/slapd.d browse_max=100 -slapd=slapd -start_cmd=/etc/init.d/slapd start ldap_user=openldap -apply_cmd=/etc/init.d/slapd restart +start_cmd=/etc/init.d/slapd start diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index e8a4b7437..531ddbcfa 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -quota_support=0 +samba_class=sambaSamAccount imap_class=SuSEeMailObject -slappasswd=slappasswd -gecos=1 -given_order=0 -mailfmt=0 samba_gclass=sambaGroup +membox=0 +mailfmt=0 auth_ldap=/etc/ldap.conf -alias_same=0 -secmode=0 -imap_folders=old public sent-mail -md5=0 +samba_def=0 +slappasswd=slappasswd +shells=fixed,ldap,passwd,shells +imap_foldersep=. imap_login=cyrus +person=1 +md5=0 +quota_support=0 +given_order=0 +imap_folders=old public sent-mail +secmode=0 given=0 -other_class=inetOrgPerson -membox=0 +imap_def=0 ldap_tls=0 +alias_same=0 multi_fields=0 -samba_class=sambaSamAccount -samba_def=0 -person=1 -imap_def=0 -shells=fixed,ldap,passwd,shells -imap_foldersep=. +other_class=inetOrgPerson +gecos=1 diff --git a/webmin/login.pl b/webmin/login.pl index 9355bd8da..1616cc936 100755 --- a/webmin/login.pl +++ b/webmin/login.pl @@ -8,5 +8,6 @@ $root || die "No root= line found in /etc/webmin/miniserv.conf"; $ENV{'PERLLIB'} = "$root"; $ENV{'WEBMIN_CONFIG'} = "/etc/webmin"; $ENV{'WEBMIN_VAR'} = "/var/webmin"; +delete($ENV{'MINISERV_CONFIG'}); chdir("$root"); exec("$root/record-login.pl", @ARGV) || die "Failed to run $root/record-login.pl : $!"; diff --git a/webmin/logout.pl b/webmin/logout.pl index 23aa20246..7b19aed08 100755 --- a/webmin/logout.pl +++ b/webmin/logout.pl @@ -8,5 +8,6 @@ $root || die "No root= line found in /etc/webmin/miniserv.conf"; $ENV{'PERLLIB'} = "$root"; $ENV{'WEBMIN_CONFIG'} = "/etc/webmin"; $ENV{'WEBMIN_VAR'} = "/var/webmin"; +delete($ENV{'MINISERV_CONFIG'}); chdir("$root"); exec("$root/record-logout.pl", @ARGV) || die "Failed to run $root/record-logout.pl : $!"; diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 3cea25e7f..7633e98b5 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -logrotate=logrotate +add_file=/etc/logrotate.d logrotate_conf=/etc/logrotate.conf sort_mode=0 -add_file=/etc/logrotate.d +logrotate=logrotate diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index e847d4cc7..b1e039129 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -display_mode=0 print_style=cups -start_cmd=/etc/init.d/cupsys start -gs_fontpath= +sort_mode=0 spool_dir=/var/spool/cups -gs_path=gs -gs_lib= -driver_style=cups -iface_perms=755 +display_mode=0 +iface_arg= iface_owner=lp:lp +iface_perms=755 +start_cmd=/etc/init.d/cupsys start +gs_lib= +gs_path=gs +model_path=/usr/share/foomatic/db /usr/share/ppd +gs_fontpath= show_jobs=0 +stop_cmd=/etc/init.d/cupsys stop +driver_style=cups smbclient_path=smbclient show_status=0 -sort_mode=0 -iface_arg= -stop_cmd=/etc/init.d/cupsys stop -model_path=/usr/share/foomatic/db /usr/share/ppd diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index 02d796dde..9b9ce7858 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -show_to=0 +noindex_hostname=0 +mail_usermin=mail +html_quote=0 +sync_perms=0700 +sync_modify=1 +wrap_width=80 +show_count=0 +show_unread=0 ignore_users_enabled=0 -delete_warn=y -mail_dir=Maildir -mail_system=3 -fwd_mode=0 -mailbox_user=.usermin/mailbox -show_sent=0 +sync_create=0 +sync_delete=1 +show_size=1 +log_read=0 +show_to=0 +no_mailer=0 +open_mode=0 no_crlf=0 -auto=1 +max_records=200 +mail_file=Mailbox +date_fmt=dmy +no_orig_ip=0 +mail_style=0 +spam_del=0 +vpopmail_dir=/home/vpopmail show_mail=0 -arrows=1 -html_quote=0 -ignore_users= -open_mode=0 -sync_create=0 +mail_system=3 link_mode=0 -view_html=0 +track_read=0 +show_body=0 perpage=20 -sync_delete=1 -size_mode=1 +top_buttons=2 +arrows=1 +from_virtualmin=1 maildir_deleted=0 sig_file=* +html_edit=0 +size_mode=1 +check_mod=1 +column_count=4 show_size_below=0 -no_orig_ip=0 -show_count=0 -show_unread=0 -max_records=200 -spam_report= -from_virtualmin=1 -spam_del=0 -track_read=0 -date_fmt=dmy -top_buttons=2 -sync_perms=0700 -mail_file=Mailbox -mail_usermin=mail show_delall=0 -wrap_width=80 -column_count=4 -log_read=0 -no_mailer=0 +mail_dir=Maildir sort_mode=1 -noindex_hostname=0 -show_size=1 -sync_modify=1 -mail_style=0 -vpopmail_dir=/home/vpopmail -check_mod=1 +show_sent=0 +auto=1 +fwd_mode=0 +spam_report= +delete_warn=y +view_html=0 +ignore_users= spam_buttons=mail -html_edit=0 -show_body=0 +mailbox_user=.usermin/mailbox diff --git a/webmin/man/config b/webmin/man/config index b5e281fc0..08a3bbed3 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -doc_dir=/usr/share/doc -man_cmd=man PAGE list_cmd=man -w PAGE -search_cmd=man -k PAGE +kernel_dir=/usr/src/linux/Documentation +man_cmd_sect=man SECTION PAGE man2html_path=man2html list_cmd_sect=man -w SECTION PAGE -kernel_dir=/usr/src/linux/Documentation +search_cmd=man -k PAGE man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man -man_cmd_sect=man SECTION PAGE +man_cmd=man PAGE +doc_dir=/usr/share/doc diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index c0f6a8464..eedfddb52 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.974 +server=MiniServ/1.979 diff --git a/webmin/mon/config b/webmin/mon/config index c10046be0..fce12211e 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -start_cmd=/etc/init.d/mon start +stop_cmd=/etc/init.d/mon stop restart_cmd=/etc/init.d/mon restart -pid_file=/var/run/mon.pid +start_cmd=/etc/init.d/mon start monshow=/usr/bin/monshow +pid_file=/var/run/mon.pid mon_cgi=/var/www/cgi-bin/mon.cgi cfbasedir=/etc/mon -stop_cmd=/etc/init.d/mon stop diff --git a/webmin/mount/config b/webmin/mount/config index 173f0feb9..d2c8c36cb 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -smbclient_path=smbclient -show_used=1 -long_fstypes=1 +autofs_file=/etc/auto.master fstab_file=/etc/fstab +auto_file=/etc/am-utils/amd.conf nfs_check=1 -autofs_file=/etc/auto.master -sort_mode=2 +show_used=1 sysinfo=1 -auto_file=/etc/am-utils/amd.conf +smbclient_path=smbclient +long_fstypes=1 +sort_mode=2 nmblookup_path=nmblookup diff --git a/webmin/mysql/config b/webmin/mysql/config index aec34b503..aca5132b5 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf +nopwd=0 max_text=1000 -access=*: * -mysqlshow=/usr/bin/mysqlshow -login=root max_dbs=50 -start_cmd=service mysql start -add_mode=1 -nopwd=0 -mysqlimport=/usr/bin/mysqlimport +login=root +style=0 mysql=/usr/bin/mysql -webmin_subs=0 +date_subs=0 +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf +mysqlshow=/usr/bin/mysqlshow +mysqlimport=/usr/bin/mysqlimport +perpage=25 mysqladmin=/usr/bin/mysqladmin -nodbi=0 mysql_data=/var/lib/mysql -mysql_libs=/usr/local/mysql/lib blob_mode=0 +nodbi=0 +mysql_libs=/usr/local/mysql/lib +add_mode=1 +access=*: * stop_cmd=service mysql stop -passwd_mode=0 mysqldump=/usr/bin/mysqldump -perpage=25 -date_subs=0 -style=0 +webmin_subs=0 +passwd_mode=0 +start_cmd=service mysql start diff --git a/webmin/mysql/version b/webmin/mysql/version index 7ed0616f8..d5cc598b7 100644 --- a/webmin/mysql/version +++ b/webmin/mysql/version @@ -1 +1 @@ -8.0.23-0ubuntu0 +8.0.25-0ubuntu0 diff --git a/webmin/nis/config b/webmin/nis/config index cccab7be9..83bb5285e 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ +nsswitch_conf=/etc/nsswitch.conf manual_build=0 +max_size=100 securenets=/etc/ypserv.securenets client_conf=/etc/yp.conf -max_size=100 -nsswitch_conf=/etc/nsswitch.conf diff --git a/webmin/openslp/config b/webmin/openslp/config index 630b639cf..af734bea6 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ slpd=/usr/sbin/slpd -slpd_conf=/etc/slp.conf -slpd_reg=/etc/slp.reg slpd_log=/var/log/slpd.log +slpd_reg=/etc/slp.reg slpd_pid=/var/run/slpd.pid +slpd_conf=/etc/slp.conf diff --git a/webmin/pam/config b/webmin/pam/config index 44c9cbe9e..67aa68b50 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ -mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so -lib_dirs=/lib/security /lib/*/security pam_dir=/etc/pam.d ignore=README +mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so +lib_dirs=/lib/security /lib/*/security diff --git a/webmin/pap/config b/webmin/pap/config index 307d5f417..cfff8e90e 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -dialin_config=/etc/mgetty+sendfax/dialin.config +ppp_options=/etc/ppp/options serials=/dev/ttyS[0-9]* +pppd=pppd +pap_file=/etc/ppp/pap-secrets login_config=/etc/mgetty+sendfax/login.config +dialin_config=/etc/mgetty+sendfax/dialin.config encrypt_pass=0 mgetty=mgetty -ppp_options=/etc/ppp/options -pppd=pppd -pap_file=/etc/ppp/pap-secrets diff --git a/webmin/postfix/config b/webmin/postfix/config index d3250a5b7..54bbb7cba 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ -postfix_control_command=/usr/sbin/postfix -postfix_newaliases_command=/usr/bin/newaliases +postfix_queue_command=postqueue +fwd_mode=0 +delete_warn=1 +mailq_dir=/var/spool/postfix sort_mode=0 +postfix_control_command=/usr/sbin/postfix +postfix_super_command=/usr/sbin/postsuper mailq_count=0 -prefix_cmts=0 -mailq_cmd=postqueue -p +postfix_config_command=/usr/sbin/postconf +mailq_sort=0 +max_records=200 +postcat_cmd=/usr/sbin/postcat +postfix_master=/etc/postfix/master.cf +perpage=20 +top_buttons=1 index_check=1 +mailq_cmd=postqueue -p +prefix_cmts=0 +postfix_newaliases_command=/usr/bin/newaliases postfix_config_file=/etc/postfix/main.cf -postfix_aliases_table_command=/usr/sbin/postalias +ldap_doms=0 columns=2 -perpage=20 -mailq_sort=0 -mailq_dir=/var/spool/postfix +delete_confirm=1 +postfix_aliases_table_command=/usr/sbin/postalias postfix_lookup_table_command=/usr/sbin/postmap -ldap_doms=0 max_maps=100 -delete_confirm=1 -postfix_master=/etc/postfix/master.cf -max_records=200 -postfix_queue_command=postqueue show_cmts=0 -check_config=1 -postfix_config_command=/usr/sbin/postconf -delete_warn=1 -top_buttons=1 wrap_width=80 -postfix_super_command=/usr/sbin/postsuper -fwd_mode=0 -postcat_cmd=/usr/sbin/postcat +check_config=1 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index faee89f12..30c7f595f 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -access_own=0 -hba_conf=/etc/postgresql/*/main/pg_hba.conf -plib= -add_mode=1 -blob_mode=0 stop_cmd=/etc/init.d/postgresql* stop -perpage=25 -date_subs=0 -pid_file=/var/run/postmaster.pid -style=0 -rstr_cmd=/usr/bin/pg_restore -webmin_subs=0 -max_text=1000 sameunix=1 -access=*: * pass= -login=postgres -max_dbs=50 -nodbi=0 +rstr_cmd=/usr/bin/pg_restore +start_cmd=/etc/init.d/postgresql* start +pid_file=/var/run/postmaster.pid dump_cmd=/usr/bin/pg_dump -psql=/usr/bin/psql -simple_sched=0 basedb=template1 -start_cmd=/etc/init.d/postgresql* start +hba_conf=/etc/postgresql/*/main/pg_hba.conf +date_subs=0 +max_text=1000 +simple_sched=0 +access=*: * +psql=/usr/bin/psql +webmin_subs=0 +add_mode=1 +nodbi=0 +access_own=0 +perpage=25 +blob_mode=0 +plib= +style=0 +max_dbs=50 +login=postgres diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 7af13e89f..54849d0a2 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ -file=/etc/wvdial.conf -wvdial=wvdial wvdialconf=wvdialconf +wvdial=wvdial +file=/etc/wvdial.conf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 43865ec3a..bb3ddbef2 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ +pptp=pptp timeout=30 pptp_options=/etc/ppp/options.pptp -pap_file=/etc/ppp/chap-secrets -pptp=pptp peers_dir=/etc/ppp/peers +pap_file=/etc/ppp/chap-secrets diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index b597f98ce..68798ff77 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -pptp_ppp_options=/etc/ppp/pptpd-options -log_file=/var/log/messages -ppp_options=/etc/ppp/options -stop_cmd=/etc/init.d/pptpd stop +pap_file=/etc/ppp/chap-secrets file=/etc/pptpd.conf pptpd=pptpd -pid_file=/var/run/pptpd.pid +ppp_options=/etc/ppp/options +stop_cmd=/etc/init.d/pptpd stop +log_file=/var/log/messages start_cmd=/etc/init.d/pptpd start -pap_file=/etc/ppp/chap-secrets +pptp_ppp_options=/etc/ppp/pptpd-options +pid_file=/var/run/pptpd.pid diff --git a/webmin/proc/config b/webmin/proc/config index a77aef77c..1f0df31bf 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ cut_length=80 -ps_style=linux -hide_self=1 base_ppid=1 -default_mode=last +ps_style=linux trace_java=0 +default_mode=last +hide_self=1 diff --git a/webmin/procmail/config b/webmin/procmail/config index 9b36ccfbe..5dae99ba1 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ procmail=procmail -procmailrc=/etc/procmailrc includes=0 +procmailrc=/etc/procmailrc diff --git a/webmin/proftpd/config b/webmin/proftpd/config index a3c4d1f3a..08670b304 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -stop_cmd=/etc/init.d/proftpd stop test_config=1 -test_always=0 -proftpd_path=/usr/sbin/proftpd -test_manual=0 -proftpd_conf=/etc/proftpd/proftpd.conf pid_file=/var/run/proftpd.pid start_cmd=/etc/init.d/proftpd start +proftpd_conf=/etc/proftpd/proftpd.conf +stop_cmd=/etc/init.d/proftpd stop +proftpd_path=/usr/sbin/proftpd +test_always=0 ftpusers=/etc/ftpusers +test_manual=0 diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 0f2b14f59..cf56e223e 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -mail_dir_qmail=Maildir -mailq_count=0 -sort_mode=0 -max_records=200 mailq_sort=0 -columns=2 -delete_warn=1 -perpage=20 -mail_dir= +max_records=200 mail_system=1 +mail_dir= index_min=1000000 qmail_dir=/var/qmail -mail_file=Mailbox +columns=2 +mail_dir_qmail=Maildir +mailq_count=0 +perpage=20 fwd_mode=0 +delete_warn=1 +mail_file=Mailbox +sort_mode=0 diff --git a/webmin/quota/config b/webmin/quota/config index 5527b06a5..92c0693d7 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -show_grace=1 -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 -block_mode=1 -user_setquota_command=setquota -u +group_edquota_command=edquota -g +group_quotaoff_command=quotaoff -g +group_quotaon_command=quotaon -g +hide_uids=0 sort_mode=0 -user_quotaon_command=quotaon -u -display_max=100 -user_edquota_command=edquota -u -pc_show=1 user_grace_command=edquota -u -t -group_quotaon_command=quotaon -g +display_max=100 +show_grace=1 +group_setquota_command=setquota -g +user_repquota_command=repquota -u -v +block_mode=1 +block_size=1024 quotacheck_command=quotacheck -u -g -hide_uids=0 -group_edquota_command=edquota -g -group_copy_command=edquota -g -p +user_quotaon_command=quotaon -u +group_grace_command=edquota -g -t +user_setquota_command=setquota -u user_quotaoff_command=quotaoff -u -user_repquota_command=repquota -u -v -group_quota_command=quota -v -g -group_repquota_command=repquota -g -v -group_quotaoff_command=quotaoff -g +user_edquota_command=edquota -u user_copy_command=edquota -u -p -group_grace_command=edquota -g -t -group_setquota_command=setquota -g +group_repquota_command=repquota -g -v +group_copy_command=edquota -g -p +group_quota_command=quota -v -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}. +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 0af908e0a..450b83ae7 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -swat=/usr/sbin/swat +run_from_inetd=0 +start_cmd=service smbd start ; service nmbd start +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +pdbedit=/usr/bin/pdbedit net=/usr/bin/net -restart_cmd=service smbd restart ; service nmbd restart -sort_mode=0 stop_cmd=service smbd stop ; service nmbd stop +swat=/usr/sbin/swat +sort_mode=0 +dont_convert=-499 +restart_cmd=service smbd restart ; service nmbd restart samba_server=/usr/sbin/smbd -text_lists=0 -start_cmd=service smbd start ; service nmbd start samba_status_program=/usr/bin/smbstatus -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' -run_from_inetd=0 -smb_passwd=/etc/samba/smbpasswd -dont_convert=-499 -pdbedit=/usr/bin/pdbedit samba_password_program=/usr/bin/smbpasswd -smb_conf=/etc/samba/smb.conf smbgroupedit=/usr/bin/smbgroupedit +text_lists=0 +smb_conf=/etc/samba/smb.conf +smb_passwd=/etc/samba/smbpasswd name_server=/usr/sbin/nmbd diff --git a/webmin/sarg/config b/webmin/sarg/config index c41edca4f..125c56c89 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -naked=0 sarg=sarg -sarg_conf=/etc/sarg/sarg.conf clear=1 +sarg_conf=/etc/sarg/sarg.conf +naked=0 diff --git a/webmin/sendmail/config b/webmin/sendmail/config index e6ae9ba86..6751d3324 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ +sendmail_path=/usr/lib/sendmail smrsh_dir=/etc/smrsh -mailq_show=Date,From,To,Size,Status -track_read=0 -order_mail=0 -delete_warn=1 -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -max_records=200 -show_cmts=0 +mail_dir=/var/spool/mail show_to=0 +max_records=200 +mailq_sort=0 +sort_mode=0 mail_file=mbox +delete_warn=1 fwd_mode=0 -wrap_width=80 -mail_type=0 -top_buttons=1 -mail_dir=/var/spool/mail -sendmail_features=/usr/share/sendmail/cf -sendmail_cf=/etc/mail/sendmail.cf +sendmail_command=/usr/lib/sendmail -bd -q1h +mailq_count=0 +mailq_show=Date,From,To,Size,Status +makemap_path=makemap +sendmail_pid=/var/run/sendmail/mta/sendmail.pid mail_style=0 +delete_confirm=1 columns=2 -mailq_sort=0 +index_min=1000000 +wrap_width=80 +order_mail=0 sendmail_mc=/etc/mail/sendmail.mc +show_cmts=0 +track_read=0 +top_buttons=1 +sendmail_features=/usr/share/sendmail/cf perpage=20 -makemap_path=makemap -sort_mode=0 +sendmail_cf=/etc/mail/sendmail.cf +mail_type=0 prefix_cmts=0 -mailq_count=0 -sendmail_command=/usr/lib/sendmail -bd -q1h -sendmail_path=/usr/lib/sendmail -index_min=1000000 -delete_confirm=1 diff --git a/webmin/servers/config b/webmin/servers/config index 211aef8fc..7097c4113 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -resolve=1 -scan_time=5 deflink=0 -show_status=1 +scan_time=5 sort_mode=0 -groups_dir=/etc/cluster/groups +show_ip=0 +display_mode=0 +resolve=1 deffast=2 capath=/usr/share/ca-certificates -show_ip=0 max_servers=100 -display_mode=0 +show_status=1 +groups_dir=/etc/cluster/groups diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 9e2d83099..4a911a946 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -actions=/etc/shorewall/actions /usr/share/shorewall/actions.std -shorewall=shorewall -config_dir=/etc/shorewall display_zone_descriptions=1 +actions=/etc/shorewall/actions /usr/share/shorewall/actions.std macros=/usr/share/shorewall +config_dir=/etc/shorewall +shorewall=shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index 915cc8629..3be7e69b7 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ +shorewall6=shorewall6 display_zone_descriptions=1 +config_dir=/etc/shorewall6 macros=/usr/share/shorewall6 -shorewall6=shorewall6 actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -config_dir=/etc/shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index 2f395c4f9..89a62e9fe 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ -smartctl=smartctl mode=1 -attribs=1 ata=0 +smartctl=smartctl +attribs=1 diff --git a/webmin/spam/config b/webmin/spam/config index 348903ba0..f9402f2d2 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -local_cf=/etc/spamassassin/local.cf -procmail_cmd=* +sa_learn=sa-learn addto=0 +call_spam=1 +restart_cmd=/etc/init.d/spamassassin restart +procmail_cmd=* +mode=0 max_awl=200 -procmailrc=/etc/procmailrc spamassassin=spamassassin -mode=0 -call_spam=1 +local_cf=/etc/spamassassin/local.cf +procmailrc=/etc/procmailrc processes=spamd amavisd -restart_cmd=/etc/init.d/spamassassin restart -sa_learn=sa-learn warn_procmail=1 diff --git a/webmin/squid/config b/webmin/squid/config index 718160957..8813d5f94 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -sync_modify=1 -pid_file=/var/run/squid.pid -sync_create=0 -calamaris=calamaris -squid_path=squid cal_fmt=w -squid_restart=service squid reload -squidclient=squidclient -sort_conf=0 -squid_stop=service squid stop -squid_start=service squid start restart_pos=0 -cal_args=-aw +calamaris=calamaris +squid_start=service squid start +cache_dir=/var/spool/squid crypt_conf=0 -cal_all=1 -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +sync_modify=1 +squid_stop=service squid stop +sort_conf=0 log_dir=/var/log/squid +squid_path=squid sync_delete=0 +cal_args=-aw +cal_all=1 +pid_file=/var/run/squid.pid +squidclient=squidclient +squid_restart=service squid reload cal_max=50000 -cache_dir=/var/spool/squid +sync_create=0 squid_conf=/etc/squid/squid.conf +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi diff --git a/webmin/sshd/config b/webmin/sshd/config index e2b2c73c1..1f0f82b42 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -sync_gnupg=0 -pid_file=/var/run/sshd.pid +sshd_path=/usr/sbin/sshd +sshd_config=/etc/ssh/sshd_config sync_create=0 +sync_gnupg=0 start_cmd=service ssh start -sshd_config=/etc/ssh/sshd_config +pid_file=/var/run/sshd.pid client_config=/etc/ssh/ssh_config -sshd_path=/usr/sbin/sshd sync_pass=0 -sync_auth=1 -keygen_path=/usr/bin/ssh-keygen stop_cmd=service ssh stop +keygen_path=/usr/bin/ssh-keygen +sync_auth=1 diff --git a/webmin/status/config b/webmin/status/config index a0e8c0dbd..54961cdd7 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ +snmp_trap=1.3.6.1.4.1.10000.1.1 +snmp_version=2 +output=0 +sort_mode=0 +subject_mode=0 index_status=1 +history_purge=30 pager_cmd=sms_client sched_offset=0 +history_show=50 sysinfo_users=0 -snmp_trap=1.3.6.1.4.1.10000.1.1 -sort_mode=0 -subject_mode=0 sysinfo=0 -history_show=50 -snmp_version=2 -output=0 -history_purge=30 columns=2 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index cf17b180e..462458d50 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -syslogng_conf=/etc/syslog-ng/syslog-ng.conf compressed=1 syslogng_cmd=syslog-ng -stop_cmd=/etc/init.d/syslog-ng stop +start_cmd=/etc/init.d/syslog-ng start pid_file=/var/run/syslog-ng.pid +syslogng_conf=/etc/syslog-ng/syslog-ng.conf lines=20 -start_cmd=/etc/init.d/syslog-ng start +stop_cmd=/etc/init.d/syslog-ng stop diff --git a/webmin/syslog/config b/webmin/syslog/config index 122c6761f..23e7d5100 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -lines=20 -start_cmd=/usr/sbin/service rsyslog start -others=1 -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -signal_cmd=/usr/sbin/service rsyslog restart -socket=0 +syslog_conf=/etc/rsyslog.conf compressed=1 -pid_file=/var/run/rsyslogd.pid -restart_cmd=/usr/sbin/service rsyslog restart -m4_path= +socket=0 +syslogd=/usr/sbin/rsyslogd tags=0 -sync=1 -pipe=1 -syslog_conf=/etc/rsyslog.conf -pri_dir=1 pri_all=1 +pid_file=/var/run/rsyslogd.pid +start_cmd=/usr/sbin/service rsyslog start +sync=1 reverse=0 m4_conf=0 -syslogd=/usr/sbin/rsyslogd +pipe=1 +signal_cmd=/usr/sbin/service rsyslog restart +facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 +restart_cmd=/usr/sbin/service rsyslog restart +pri_dir=1 +others=1 +m4_path= +lines=20 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/system-status/enable-collection.pl b/webmin/system-status/enable-collection.pl index c736182c8..d3c23b2ba 100755 --- a/webmin/system-status/enable-collection.pl +++ b/webmin/system-status/enable-collection.pl @@ -8,5 +8,6 @@ $root || die "No root= line found in /etc/webmin/miniserv.conf"; $ENV{'PERLLIB'} = "$root"; $ENV{'WEBMIN_CONFIG'} = "/etc/webmin"; $ENV{'WEBMIN_VAR'} = "/var/webmin"; +delete($ENV{'MINISERV_CONFIG'}); chdir("$root/system-status"); exec("$root/system-status/enable-collection.pl", @ARGV) || die "Failed to run $root/system-status/enable-collection.pl : $!"; diff --git a/webmin/telnet/config b/webmin/telnet/config index 564a384c6..b5cbb0cf2 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ +sizemode=0 +detach=0 proxy=0 no_test=0 -sizemode=0 mode=1 -detach=0 diff --git a/webmin/time/config b/webmin/time/config index 2d666d1a7..767c675be 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ -lease=5 -ntp_only=1 zone_style=linux timeserver_hardware=1 +ntp_only=1 seconds=1 timeserver=0.pool.ntp.org +lease=5 diff --git a/webmin/useradmin/config b/webmin/useradmin/config index c48b57f39..11e3f233e 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -skip_md5=0 -from_files=0 +group_file=/etc/group uid_calc=0 base_uid=1000 +passwd_progmode=0 +email_type=0 base_gid=1000 -passwd_file=/etc/passwd -default_group=users -default_other=1 -shadow_file=/etc/shadow -user_files=/etc/skel -selinux_con=user_u:object_r:user_home_dir_t +lock_string=* +new_user_group=0 +extra_real=0 last_show=0 +display_max=400 +sort_mode=0 +display_mode=1 +from_files=0 +gshadow_file=/etc/gshadow md5=1 -alias_check=0 -email_type=0 +uid_mode=1 +passwd_same=0 delete_only=0 -secmode=0 -gshadow_file=/etc/gshadow +shadow_file=/etc/shadow +selinux_con=user_u:object_r:user_home_dir_t +default_group=users +default_other=1 empty_mode=0 -uid_mode=1 -extra_real=0 -sort_mode=0 +secmode=0 +passwd_file=/etc/passwd +passwd_dict=0 +user_files=/etc/skel +new_user_gid=0 +passwd_stars=0 +home_base=/home +shells=fixed,passwd,shells +gid_mode=1 +delete_root=0 +skip_md5=0 home_style=0 -display_max=400 membox=0 random_password=0 -passwd_dict=0 -group_file=/etc/group -new_user_group=0 -passwd_progmode=0 gid_calc=0 -home_base=/home -delete_root=0 -display_mode=1 -passwd_same=0 -new_user_gid=0 -shells=fixed,passwd,shells +alias_check=0 homedir_perms=0755 -lock_string=* -passwd_stars=0 -gid_mode=1 diff --git a/webmin/usermin/config b/webmin/usermin/config index 0a1a3187e..6991ccf53 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -uphour=4 -upshow=1 +cron_mode=0 +updays=1 usermin_dir=/etc/usermin +upshow=1 upmissing=0 -updays=1 update=0 -cron_mode=0 +uphour=4 diff --git a/webmin/version b/webmin/version index 495aca49f..ecba942f0 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.974 +1.979 diff --git a/webmin/vgetty/config b/webmin/vgetty/config index 00f79ad34..bb4eec4d2 100644 --- a/webmin/vgetty/config +++ b/webmin/vgetty/config @@ -1,2 +1,2 @@ -vgetty_config=/etc/mgetty+sendfax/voice.conf vgetty_cmd=vgetty +vgetty_config=/etc/mgetty+sendfax/voice.conf diff --git a/webmin/webalizer/config b/webmin/webalizer/config index 929b33a86..b382cbf16 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -webalizer=/usr/bin/webalizer naked=0 -auto=apache,squid,proftpd,wuftpd -alt_conf=/etc/webalizer/webalizer.conf.sample webalizer_conf=/etc/webalizer/webalizer.conf skip_old=0 +alt_conf=/etc/webalizer/webalizer.conf.sample +auto=apache,squid,proftpd,wuftpd +webalizer=/usr/bin/webalizer diff --git a/webmin/webmin/config b/webmin/webmin/config index 982ceb0b5..29b9d5d84 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ -last_version_number=1.900 -updays=1 +cron_mode=0 upmissing=0 update=0 +letsencrypt_dns_wait=10 osdn=1 -uphour=23 upshow=1 -cron_mode=0 -letsencrypt_dns_wait=10 -warn_days=7 upmins=47 +updays=1 last_version_check=1549050668 +uphour=23 +warn_days=7 +last_version_number=1.900 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index e783e2db8..7deb33731 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftpd_path=/usr/sbin/wu-ftpd -ftphosts=/etc/wu-ftpd/ftphosts +ftpaccess=/etc/wu-ftpd/ftpaccess pid_file=/var/run/ftpd.pids-all +log_file=/var/log/xferlog +ftphosts=/etc/wu-ftpd/ftphosts +ftpgroups=/etc/wu-ftpd/ftpgroups ftpusers=/etc/wu-ftpd/ftpusers -ftpaccess=/etc/wu-ftpd/ftpaccess +ftpd_path=/usr/sbin/wu-ftpd ftpconversions=/etc/wu-ftpd/ftpconversions -ftpgroups=/etc/wu-ftpd/ftpgroups -log_file=/var/log/xferlog diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 74d1cb77f..653c3a4bc 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -lookup_servs=1 pid_file=/var/run/xinetd.pid start_cmd=/etc/init.d/xinetd start protocols_file=/etc/protocols xinetd_conf=/etc/xinetd.conf +lookup_servs=1 -- 2.43.0