From 9fb5d921ae819f087702dae2814237b46e8d3e5a Mon Sep 17 00:00:00 2001 From: mhoellein Date: Tue, 28 Dec 2021 18:07:19 +0100 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -webmin 1.983 all +webmin 1.984 all --- webmin/acl/config | 2 +- webmin/adsl-client/config | 10 ++-- webmin/ajaxterm/config | 2 +- webmin/apache/config | 36 +++++++-------- webmin/apache/httpd-info | 6 +-- webmin/backup-config/config | 2 +- webmin/bacula-backup/config | 16 +++---- webmin/bind8/config | 70 ++++++++++++++-------------- webmin/cluster-passwd/config | 2 +- webmin/cluster-software/config | 2 +- webmin/cluster-useradmin/config | 8 ++-- webmin/cluster-webmin/config | 2 +- webmin/config | 48 +++++++++---------- webmin/cpan/config | 6 +-- webmin/cron/config | 36 +++++++-------- webmin/custom/config | 4 +- webmin/dhcpd/config | 24 +++++----- webmin/dovecot/config | 4 +- webmin/exim/config | 10 ++-- webmin/exports/config | 2 +- webmin/fail2ban/config | 4 +- webmin/fetchmail/config | 2 +- webmin/filter/config | 4 +- webmin/firewall/config | 8 ++-- webmin/firewall6/config | 8 ++-- webmin/fsdump/config | 8 ++-- webmin/grub/config | 2 +- webmin/heartbeat/config | 20 ++++---- webmin/htaccess-htpasswd/config | 6 +-- webmin/idmapd/config | 4 +- webmin/inetd/config | 20 ++++---- webmin/init/config | 18 ++++---- webmin/inittab/config | 2 +- webmin/ipfilter/config | 8 ++-- webmin/ipfw/config | 8 ++-- webmin/ipsec/config | 6 +-- webmin/iscsi-client/config | 6 +-- webmin/iscsi-server/config | 6 +-- webmin/iscsi-target/config | 6 +-- webmin/iscsi-tgtd/config | 2 +- webmin/jabber/config | 4 +- webmin/ldap-client/config | 2 +- webmin/ldap-server/config | 8 ++-- webmin/ldap-useradmin/config | 36 +++++++-------- webmin/logrotate/config | 2 +- webmin/lpadmin/config | 18 ++++---- webmin/mailboxes/config | 82 ++++++++++++++++----------------- webmin/man/config | 10 ++-- webmin/miniserv.conf | 2 +- webmin/mon/config | 6 +-- webmin/mount/config | 14 +++--- webmin/mysql/config | 30 ++++++------ webmin/nis/config | 4 +- webmin/openslp/config | 4 +- webmin/package-updates/config | 2 +- webmin/pam/config | 2 +- webmin/pap/config | 12 ++--- webmin/passwd/config | 2 +- webmin/postfix/config | 40 ++++++++-------- webmin/postgresql/config | 36 +++++++-------- webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 10 ++-- webmin/proc/config | 6 +-- webmin/procmail/config | 2 +- webmin/proftpd/config | 12 ++--- webmin/qmailadmin/config | 18 ++++---- webmin/quota/config | 32 ++++++------- webmin/raid/config | 2 +- webmin/samba/config | 24 +++++----- webmin/sarg/config | 2 +- webmin/sendmail/config | 40 ++++++++-------- webmin/servers/config | 14 +++--- webmin/shorewall/config | 4 +- webmin/shorewall6/config | 6 +-- webmin/smart-status/config | 2 +- webmin/software/config | 2 +- webmin/spam/config | 14 +++--- webmin/squid/config | 30 ++++++------ webmin/sshd/config | 12 ++--- webmin/status/config | 18 ++++---- webmin/syslog-ng/config | 6 +-- webmin/syslog/config | 28 +++++------ webmin/system-status/config | 2 +- webmin/telnet/config | 6 +-- webmin/time/config | 4 +- webmin/updown/config | 4 +- webmin/useradmin/config | 60 ++++++++++++------------ webmin/usermin/config | 6 +-- webmin/version | 2 +- webmin/webalizer/config | 6 +-- webmin/webmin/config | 14 +++--- webmin/wuftpd/config | 10 ++-- webmin/xinetd/config | 4 +- 94 files changed, 582 insertions(+), 582 deletions(-) diff --git a/webmin/acl/config b/webmin/acl/config index e5e83c2ab..ee9b4c16b 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ -order=0 display=1 ssleay=/usr/bin/openssl +order=0 diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index 5f022136c..c79328941 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -conf_style=0 -pap_file=/etc/ppp/pap-secrets -pppoe_cmd=pppoe -pppoe_conf=/etc/ppp/pppoe.conf -start_cmd=adsl-start stop_cmd=adsl-stop +pppoe_conf=/etc/ppp/pppoe.conf status_cmd=adsl-status +pppoe_cmd=pppoe +conf_style=0 +start_cmd=adsl-start +pap_file=/etc/ppp/pap-secrets diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config index 003ebb11c..a31edabcb 100644 --- a/webmin/ajaxterm/config +++ b/webmin/ajaxterm/config @@ -1,2 +1,2 @@ -timeout=120 autologin=0 +timeout=120 diff --git a/webmin/apache/config b/webmin/apache/config index fd5328a9d..fca0b07f9 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,25 +1,25 @@ -start_cmd=/etc/init.d/apache2 start +test_config=1 +apply_cmd=/usr/sbin/apache2ctl graceful +virt_file=/etc/apache2/sites-available access_conf=/etc/apache2/access.conf -allow_virtualmin=0 show_names=0 -test_apachectl=1 -defines_name=APACHE_ARGUMENTS -test_always=0 -show_order=0 -max_servers=100 -show_list=0 -format_config=1 -auto_mods=1 -defines_file=/etc/apache2/envvars -mime_types=/etc/apache2/mime.types test_manual=0 -httpd_dir=/etc/apache2 -link_dir=/etc/apache2/sites-enabled apachectl_path=/usr/sbin/apache2ctl +show_order=0 +start_cmd=/etc/init.d/apache2 start +defines_name=APACHE_ARGUMENTS +httpd_dir=/etc/apache2 httpd_conf=/etc/apache2/apache2.conf +test_always=0 +auto_mods=1 httpd_path=/usr/sbin/apache2 -test_config=1 -stop_cmd=/etc/init.d/apache2 stop srm_conf=/etc/apache2/srm.conf -apply_cmd=/usr/sbin/apache2ctl graceful -virt_file=/etc/apache2/sites-available +test_apachectl=1 +format_config=1 +max_servers=100 +link_dir=/etc/apache2/sites-enabled +mime_types=/etc/apache2/mime.types +show_list=0 +stop_cmd=/etc/init.d/apache2 stop +defines_file=/etc/apache2/envvars +allow_virtualmin=0 diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index 76d82cefb..2ccb9915e 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,5 +1,5 @@ -time=1633634249 +time=1640034432 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd -version=2.451 -fullversion=2.4.51 +version=2.452 +fullversion=2.4.52 diff --git a/webmin/backup-config/config b/webmin/backup-config/config index 42c8775c3..c6694b382 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -apply=1 webmin_subs=0 date_subs=0 +apply=1 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index ed73456d5..c43e5f238 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -apply=1 +wait=1 +db=bacula driver=Pg -pass= showdirs=0 -bacula_dir=/etc/bacula -db=bacula -btape=btape +bls=bls user=bacula -bextract=bextract +pass= +btape=btape +apply=1 init_start=0 -wait=1 -bls=bls +bacula_dir=/etc/bacula +bextract=bextract diff --git a/webmin/bind8/config b/webmin/bind8/config index f3f0fe6ff..3c8ce1438 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,46 +1,46 @@ -ndc_cmd=ndc -soa_start=0 -rndc_conf=/etc/bind/rndc.conf -rev_def=0 -max_zones=50 -checkconf=named-checkconf -named_conf=/etc/bind/named.conf -forwardzonefilename_format=ZONE.hosts +named_path=/usr/sbin/named +relative_paths=0 signzone=dnssec-signzone -updserial_man=1 -largezones=0 -rndc_cmd=rndc -allow_long=0 +max_zones=50 spf_record=0 -allow_underscore=1 -records_order=0 -updserial_def=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 -keygen=dnssec-keygen -force_random=0 -slave_dir=/var/lib/bind -soa_style=0 -relative_paths=0 -by_view=0 -master_dir=/var/lib/bind +records_order=0 ipv6_mode=1 -support_aaaa=1 -pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid +master_dir=/var/lib/bind +show_list=0 +rev_def=0 +named_conf=/etc/bind/named.conf +rndc_conf=/etc/bind/rndc.conf dnssec_info=1 -other_slaves=1 +force_random=0 +checkconf=named-checkconf checkzone=named-checkzone -no_pid_chroot=0 -confirm_rec=0 -show_list=0 -allow_comments=0 whois_cmd=whois +soa_style=0 +slave_dir=/var/lib/bind +forwardzonefilename_format=ZONE.hosts confirm_zone=1 -zones_file=/etc/bind/named.conf.local -no_chroot=0 -rndcconf_cmd=rndc-confgen -allow_wild=1 -reversezonefilename_format=ZONE.rev -named_path=/usr/sbin/named +support_aaaa=1 +largezones=0 +keygen=dnssec-keygen +ndc_cmd=ndc +updserial_def=0 master_ttl=1 +reversezonefilename_format=ZONE.rev +allow_underscore=1 +updserial_man=1 +rndcconf_cmd=rndc-confgen +rndc_cmd=rndc +other_slaves=1 +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 diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 02cf5b24f..2ab4c6af1 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ -sort_mode=0 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 f82119fb5..ee07e6c4e 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ +table_mode=0 conf_add_user=1 -conf_add_group=1 -conf_allow_refresh=1 sort_mode=0 -conf_allow_sync=1 conf_host_links=1 conf_find_user=1 -table_mode=0 conf_find_group=1 +conf_add_group=1 +conf_allow_refresh=1 +conf_allow_sync=1 diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-webmin/config +++ b/webmin/cluster-webmin/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/config b/webmin/config index b20881cd4..cbed1d7d5 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -lang_root=de.UTF-8 -feedback_to= +tempdelete_days=7 +md5pass=1 +passwd_uindex=0 +passwd_pindex=1 log=1 -product=webmin -help_height= -dateformat=dd/mon/yyyy by_view=0 -lang=en.UTF-8 -ld_env=LD_LIBRARY_PATH -real_os_version=18.04.1 -passwd_pindex=1 -referers_none=1 -theme=authentic-theme -hostnamemode=0 +os_version=9.0 +showhost=0 +feedback_to= os_type=debian-linux +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= -passwd_uindex=0 -sysinfo=0 +referers_none=1 +help_height= +lang=en.UTF-8 +real_os_version=18.04.1 showlogin=0 -tempdelete_days=7 -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -showhost=0 passwd_cindex=2 -hostnamedisplay= -passwd_file=/etc/shadow +lang_root=de.UTF-8 +hostnamemode=0 +theme=authentic-theme +dateformat=dd/mon/yyyy nofeedbackcc=0 -webprefix= -os_version=9.0 -passwd_mindex=4 -md5pass=1 +ld_env=LD_LIBRARY_PATH diff --git a/webmin/cpan/config b/webmin/cpan/config index 38e7be8a3..3441d61c5 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -incpackages=1 save_partial=0 +packages=http://www.cpan.org/modules/02packages.details.txt.gz refresh_days=30 -cpan=http://www.cpan.org/authors/id incyum=1 -packages=http://www.cpan.org/modules/02packages.details.txt.gz +incpackages=1 +cpan=http://www.cpan.org/authors/id diff --git a/webmin/cron/config b/webmin/cron/config index df378f10a..11b9918a9 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ -hourly_only=0 -max_len=80 -run_parts=run-parts -cron_deny_all=2 -max_jobs=100 -cron_deny_file=/var/spool/cron/deny +match_user=1 +vixie_cron=1 +show_comment=0 cron_allow_file=/var/spool/cron/allow -cron_delete_command=crontab -u USER -r -cronfiles_dir=/etc/cron.d -cron_input=1 -cron_user_get_command=crontab -l +show_next=0 cron_dir=/var/spool/cron/crontabs -kill_subs=0 -show_run=0 +cron_deny_all=2 +cron_user_get_command=crontab -l show_time=0 -cron_get_command=crontab -u USER -l -show_next=0 +max_len=80 +show_run=0 match_mode=0 -cron_user_edit_command=crontab -e -vixie_cron=1 +cron_deny_file=/var/spool/cron/deny cron_user_delete_command=crontab -r -show_comment=0 cron_edit_command=crontab -u USER -e +cron_get_command=crontab -u USER -l system_crontab=/etc/crontab -match_user=1 +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 +cron_delete_command=crontab -u USER -r diff --git a/webmin/custom/config b/webmin/custom/config index 6d0b22ef3..14aa50381 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ display_mode=0 -params_cmd=0 -columns=2 params_file=0 +columns=2 +params_cmd=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index 13cbcca95..93f3e23af 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,17 +1,17 @@ -start_cmd=service isc-dhcp-server start -lease_file=/var/lib/dhcp/dhcpd.leases -dhcpd_conf=/etc/dhcp/dhcpd.conf -lease_sort=0 -lease_vendor=0 -show_ip=0 -display_max=100 pid_file=/var/run/dhcpd.pid +dhcpd_path=/usr/sbin/dhcpd restart_cmd=service isc-dhcp-server restart -interfaces_type=debian lease_tz=0 -dhcpd_nocols=5 -show_mac=0 +start_cmd=service isc-dhcp-server start +lease_vendor=0 +group_name=0 +display_max=100 stop_cmd=service isc-dhcp-server stop -dhcpd_path=/usr/sbin/dhcpd +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 -group_name=0 diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 2c130e983..658fb103e 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ -pid_file=/var/run/dovecot/master.pid dovecot=/usr/sbin/dovecot -init_script=dovecot dovecot_config=/etc/dovecot/dovecot.conf +init_script=dovecot +pid_file=/var/run/dovecot/master.pid diff --git a/webmin/exim/config b/webmin/exim/config index 22de02062..f463fcb12 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_addrfile=/etc/exim4/email-addresses -exim_dir=/etc/exim4 -mail_system=1 -exim_aliasfileext= exim_dbmext=.dbm +exim_aliasfileext= +mail_system=1 +exim_addrfile=/etc/exim4/email-addresses exim_dbmfile=/etc/exim4/local_domains -exim_virt_dir=/etc/exim4/aliases exim_mail_file=Maildir +exim_dir=/etc/exim4 +exim_virt_dir=/etc/exim4/aliases diff --git a/webmin/exports/config b/webmin/exports/config index 8f8b567ee..b8864bec5 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ 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 +apply_cmd=exportfs -r diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index 6b240d5ac..4851099d2 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ -config_dir=/etc/fail2ban -client_cmd=/usr/bin/fail2ban-client init_script=fail2ban server_cmd=/usr/bin/fail2ban-server +config_dir=/etc/fail2ban +client_cmd=/usr/bin/fail2ban-client diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 00a9f6dbf..6f9c4bfbb 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 -fetchmail_path=fetchmail diff --git a/webmin/filter/config b/webmin/filter/config index 30615aada..5ce0e142b 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases -virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl virtualmin_config=/etc/webmin/virtual-server -reply_force=0 forward_procmail=0 +virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl +reply_force=0 warn_procmail=1 diff --git a/webmin/firewall/config b/webmin/firewall/config index a02e2c43a..3e434be28 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -comment_mod=0 -cluster_mode=1 -force_init=0 view_comment=0 -view_condition=1 +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 5c1f27174..9ebb1f19e 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -direct=0 -view_comment=0 -force_init=0 view_condition=1 -cluster_mode=1 comment_mod=0 +force_init=0 +cluster_mode=1 +direct=0 +view_comment=0 diff --git a/webmin/fsdump/config b/webmin/fsdump/config index f6e0efca7..5bc5d63f9 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -always_tar=0 -webmin_subs=0 -run_mode=0 nonewtape=0 -date_subs=0 +webmin_subs=0 simple_sched=0 +date_subs=0 +always_tar=0 +run_mode=0 error_email=0 diff --git a/webmin/grub/config b/webmin/grub/config index 2bb2e4e49..f6464eb2a 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ -grub_path=grub install=(hd0) +grub_path=grub menu_file=/boot/grub/menu.lst diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 5e2f0f025..d81ccd6da 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -stop_cmd=/etc/init.d/heartbeat stop -ha_dir=/etc/ha.d -haresources= +pid_file=/var/run/heartbeat.pid alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +ha_cf= +start_cmd=/etc/init.d/heartbeat start authkeys= -serials=/dev/ttyS* +stop_cmd=/etc/init.d/heartbeat stop apply_cmd=/etc/init.d/heartbeat reload -alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf -alt_haresources=/usr/share/doc/packages/heartbeat/haresources -resource_d= -start_cmd=/etc/init.d/heartbeat start -pid_file=/var/run/heartbeat.pid +haresources= +serials=/dev/ttyS* +ha_dir=/etc/ha.d heartbeat=/usr/lib/heartbeat/heartbeat +resource_d= req_resource_cmd=/usr/lib/heartbeat/req_resource -ha_cf= +alt_haresources=/usr/share/doc/packages/heartbeat/haresources +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index c3a636d54..531374e52 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ sha1=0 -htgroups=.htgroups -extra_directives= digest=1 -htpasswd=.htpasswd htaccess=.htaccess +htpasswd=.htpasswd md5=1 +extra_directives= +htgroups=.htgroups sort=0 diff --git a/webmin/idmapd/config b/webmin/idmapd/config index f32798d4d..f25eeba97 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ -idmapd_path=/usr/sbin/rpc.idmapd -idmapd_conf=/etc/idmapd.conf 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 diff --git a/webmin/inetd/config b/webmin/inetd/config index 1473c95c2..16ca21730 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -extended_inetd=1 ipv6=0 -rpc_protocols=tcp udp -sort_mode=0 +tcpd_path=/usr/sbin/tcpd restart_command=killall -HUP inetd -display_max=100 +sort_mode=0 +allow_file=/etc/hosts.allow +rpc_protocols=tcp udp deny_file=/etc/hosts.deny -qm_mode=0 -rpc_inetd=1 -tcpd_path=/usr/sbin/tcpd +extended_inetd=1 show_empty=1 -protocols_file=/etc/protocols -inetd_conf_file=/etc/inetd.conf -allow_file=/etc/hosts.allow rpc_file=/etc/rpc +display_max=100 +protocols_file=/etc/protocols +qm_mode=0 services_file=/etc/services +rpc_inetd=1 +inetd_conf_file=/etc/inetd.conf diff --git a/webmin/init/config b/webmin/init/config index 8ef7dd80a..e8736a7c6 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_dir=/etc/init.d -shutdown_command=poweroff -boot_levels=2 3 5 -show_opts=0 +init_base=/etc/ +no_chkconfig=0 +order_digits=2 inittab_id=id order=0 +boot_levels=2 3 5 atboot_product=webmin -expert=0 -init_base=/etc/ soft_links=1 -init_info=1 -no_chkconfig=0 status_check=0 +show_opts=0 reboot_command=reboot -order_digits=2 +shutdown_command=poweroff +init_info=1 diff --git a/webmin/inittab/config b/webmin/inittab/config index c2b25728b..31db3e7b1 100644 --- a/webmin/inittab/config +++ b/webmin/inittab/config @@ -1,2 +1,2 @@ -telinit=telinit inittab_file=/etc/inittab +telinit=telinit diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index d7012f35a..02d1031fc 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ view_comment=0 ipf=ipf -view_condition=1 -cluster_nat=1 -ipfstat=ipfstat ipnat=ipnat -ipf_conf=/etc/ipf/ipf.conf cluster_mode=0 +ipf_conf=/etc/ipf/ipf.conf +ipfstat=ipfstat +view_condition=1 +cluster_nat=1 ipnat_conf=/etc/ipf/ipnat.conf diff --git a/webmin/ipfw/config b/webmin/ipfw/config index dedab80b7..4841206a9 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -view_condition=1 -view_counters=0 -view_comment=0 +cluster_mode=0 ipfw=/sbin/ipfw version=2 -cluster_mode=0 +view_condition=1 +view_comment=0 +view_counters=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index cf7d2de26..ce745b4fb 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ +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 file=/etc/ipsec.conf -start_cmd=/etc/init.d/ipsec start -stop_cmd=/etc/init.d/ipsec stop -logfile=/var/log/messages diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index b96fd28d6..375b2bead 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -config_file=/etc/iscsi/iscsid.conf -ifaces_dir=/var/lib/iscsi/ifaces init_name=open-iscsi -iscsiiname=iscsi-iname +config_file=/etc/iscsi/iscsid.conf initiator_file=/etc/iscsi/initiatorname.iscsi iscsiadm=iscsiadm +ifaces_dir=/var/lib/iscsi/ifaces +iscsiiname=iscsi-iname diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 98fae4f09..994a11583 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -opts_file=/etc/sysconfig/netbsd-iscsi init_name=netbsd-iscsi -targets_file=/etc/iscsi/targets +pid_file=/var/run/iscsi-target.pid auths_file=/etc/iscsi/auths +targets_file=/etc/iscsi/targets iscsi_server=/usr/sbin/iscsi-target -pid_file=/var/run/iscsi-target.pid +opts_file=/etc/sysconfig/netbsd-iscsi diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index bdbc6a6ee..b4e6988e1 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ +ietadm=ietadm +initiators_file=/etc/iet/initiators.allow +init_name=iscsitarget opts_file=/etc/default/iscsitarget config_file=/etc/iet/ietd.conf -initiators_file=/etc/iet/initiators.allow -ietadm=ietadm targets_file=/etc/iet/targets.allow -init_name=iscsitarget pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 7bc34bff3..474e6caff 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ +tgtadm=tgtadm 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 c0fd4a355..b2225d4a6 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_dir=/var/lib/jabber -start_cmd=/etc/init.d/jabberd start jabber_config=/etc/jabber/jabber.xml +start_cmd=/etc/init.d/jabberd start diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index d45286770..4587ce571 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -secret=/etc/ldap.secret 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 48ba61309..488a741ae 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 init_name=slapd -stop_cmd=/etc/init.d/slapd stop -config_file=/etc/ldap/slapd.d -attr_count=6 -slapd=slapd browse_max=100 +stop_cmd=/etc/init.d/slapd stop diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 61dd0c2eb..3e11332fd 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -alias_same=0 +md5=0 +imap_class=SuSEeMailObject other_class=inetOrgPerson -shells=fixed,ldap,passwd,shells -secmode=0 -imap_foldersep=. -gecos=1 -auth_ldap=/etc/ldap.conf -person=1 -given=0 +mailfmt=0 +imap_folders=old public sent-mail +samba_class=sambaSamAccount +membox=0 samba_gclass=sambaGroup -md5=0 -multi_fields=0 +samba_def=0 given_order=0 -slappasswd=slappasswd quota_support=0 +multi_fields=0 +auth_ldap=/etc/ldap.conf ldap_tls=0 -imap_class=SuSEeMailObject -imap_login=cyrus -samba_class=sambaSamAccount -samba_def=0 -membox=0 +secmode=0 imap_def=0 -imap_folders=old public sent-mail -mailfmt=0 +imap_foldersep=. +person=1 +gecos=1 +slappasswd=slappasswd +alias_same=0 +given=0 +imap_login=cyrus +shells=fixed,ldap,passwd,shells diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 89a1a0d84..d0c77369e 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -sort_mode=0 logrotate=logrotate add_file=/etc/logrotate.d logrotate_conf=/etc/logrotate.conf +sort_mode=0 diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index 49ff60590..b13ee42ef 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ iface_owner=lp:lp -iface_perms=755 -stop_cmd=/etc/init.d/cupsys stop +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 -smbclient_path=smbclient -sort_mode=0 -start_cmd=/etc/init.d/cupsys start +spool_dir=/var/spool/cups show_status=0 -gs_fontpath= +stop_cmd=/etc/init.d/cupsys stop +gs_lib= +sort_mode=0 gs_path=gs show_jobs=0 -gs_lib= -spool_dir=/var/spool/cups -display_mode=0 +smbclient_path=smbclient iface_arg= +gs_fontpath= diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index fe0743e7b..e5aff8372 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -sync_perms=0700 -column_count=4 -spam_del=0 -check_mod=1 -mailbox_user=.usermin/mailbox -no_crlf=0 -show_mail=0 -html_edit=0 +no_mailer=0 +size_mode=1 +sync_delete=1 wrap_width=80 -link_mode=0 -mail_usermin=mail -date_fmt=dmy -spam_buttons=mail -top_buttons=2 -mail_system=3 auto=1 -sig_file=* +show_to=0 +sync_create=0 +maildir_deleted=0 vpopmail_dir=/home/vpopmail -perpage=20 +sort_mode=1 show_size=1 -view_html=0 +mail_usermin=mail +spam_report= +open_mode=0 fwd_mode=0 -show_unread=0 +link_mode=0 +no_crlf=0 +spam_buttons=mail +sync_modify=1 +from_virtualmin=1 +column_count=4 +view_html=0 +delete_warn=y +max_records=200 +sig_file=* +show_mail=0 +show_count=0 +perpage=20 +mail_system=3 ignore_users= -sync_delete=1 -no_orig_ip=0 -arrows=1 +mail_style=0 +show_delall=0 show_body=0 -log_read=0 -mail_file=Mailbox -size_mode=1 -mail_dir=Maildir -track_read=0 show_size_below=0 -sync_create=0 -maildir_deleted=0 -ignore_users_enabled=0 -show_delall=0 -spam_report= -from_virtualmin=1 +track_read=0 noindex_hostname=0 -max_records=200 -sort_mode=1 -show_to=0 -mail_style=0 -delete_warn=y -no_mailer=0 -sync_modify=1 +sync_perms=0700 +mailbox_user=.usermin/mailbox +spam_del=0 +mail_dir=Maildir +arrows=1 html_quote=0 -open_mode=0 +top_buttons=2 +show_unread=0 +check_mod=1 +date_fmt=dmy show_sent=0 -show_count=0 +log_read=0 +ignore_users_enabled=0 +html_edit=0 +no_orig_ip=0 +mail_file=Mailbox diff --git a/webmin/man/config b/webmin/man/config index dc072e208..403a13735 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -man2html_path=man2html +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=man PAGE -doc_dir=/usr/share/doc list_cmd_sect=man -w SECTION PAGE list_cmd=man -w PAGE -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 -kernel_dir=/usr/src/linux/Documentation +man2html_path=man2html +doc_dir=/usr/share/doc diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index d8179dc77..ac433f6ce 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.983 +server=MiniServ/1.984 diff --git a/webmin/mon/config b/webmin/mon/config index b435eb76e..2f31c62ff 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ cfbasedir=/etc/mon -start_cmd=/etc/init.d/mon start -mon_cgi=/var/www/cgi-bin/mon.cgi stop_cmd=/etc/init.d/mon stop +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 restart_cmd=/etc/init.d/mon restart +pid_file=/var/run/mon.pid diff --git a/webmin/mount/config b/webmin/mount/config index fbe35f717..c5882427a 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -sysinfo=1 -autofs_file=/etc/auto.master -auto_file=/etc/am-utils/amd.conf show_used=1 -fstab_file=/etc/fstab -long_fstypes=1 smbclient_path=smbclient -sort_mode=2 -nmblookup_path=nmblookup nfs_check=1 +auto_file=/etc/am-utils/amd.conf +autofs_file=/etc/auto.master +fstab_file=/etc/fstab +nmblookup_path=nmblookup +sort_mode=2 +sysinfo=1 +long_fstypes=1 diff --git a/webmin/mysql/config b/webmin/mysql/config index 2d14e9bad..20de73ccb 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -mysql=/usr/bin/mysql -mysqlshow=/usr/bin/mysqlshow -blob_mode=0 +stop_cmd=service mysql stop +passwd_mode=0 login=root -mysql_libs=/usr/local/mysql/lib +mysqlshow=/usr/bin/mysqlshow max_dbs=50 -date_subs=0 -stop_cmd=service mysql stop +mysqladmin=/usr/bin/mysqladmin +start_cmd=service mysql start +add_mode=1 +access=*: * +webmin_subs=0 +perpage=25 +mysqldump=/usr/bin/mysqldump max_text=1000 my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -mysqlimport=/usr/bin/mysqlimport -passwd_mode=0 +blob_mode=0 mysql_data=/var/lib/mysql -start_cmd=service mysql start -perpage=25 style=0 -mysqladmin=/usr/bin/mysqladmin -add_mode=1 -mysqldump=/usr/bin/mysqldump -webmin_subs=0 nodbi=0 -access=*: * +mysqlimport=/usr/bin/mysqlimport nopwd=0 +date_subs=0 +mysql_libs=/usr/local/mysql/lib +mysql=/usr/bin/mysql diff --git a/webmin/nis/config b/webmin/nis/config index 7ef8b7e54..2e30d8d54 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ nsswitch_conf=/etc/nsswitch.conf -max_size=100 -securenets=/etc/ypserv.securenets client_conf=/etc/yp.conf manual_build=0 +securenets=/etc/ypserv.securenets +max_size=100 diff --git a/webmin/openslp/config b/webmin/openslp/config index d422f0269..d84833406 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd_pid=/var/run/slpd.pid slpd=/usr/sbin/slpd +slpd_reg=/etc/slp.reg slpd_log=/var/log/slpd.log slpd_conf=/etc/slp.conf -slpd_reg=/etc/slp.reg +slpd_pid=/var/run/slpd.pid diff --git a/webmin/package-updates/config b/webmin/package-updates/config index 226c127d1..195d872e7 100644 --- a/webmin/package-updates/config +++ b/webmin/package-updates/config @@ -1,2 +1,2 @@ -cache_time=6 update_multiple=1 +cache_time=6 diff --git a/webmin/pam/config b/webmin/pam/config index b3d9581d6..29aeffd39 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ -mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so pam_dir=/etc/pam.d 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 ignore=README diff --git a/webmin/pap/config b/webmin/pap/config index d0ca6c837..342ddbc88 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -mgetty=mgetty -encrypt_pass=0 -ppp_options=/etc/ppp/options -login_config=/etc/mgetty+sendfax/login.config +pppd=pppd dialin_config=/etc/mgetty+sendfax/dialin.config -serials=/dev/ttyS[0-9]* +ppp_options=/etc/ppp/options pap_file=/etc/ppp/pap-secrets -pppd=pppd +serials=/dev/ttyS[0-9]* +encrypt_pass=0 +mgetty=mgetty +login_config=/etc/mgetty+sendfax/login.config diff --git a/webmin/passwd/config b/webmin/passwd/config index 1c1ed801d..04110de95 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -sort_mode=0 max_users=200 input_type=0 +sort_mode=0 diff --git a/webmin/postfix/config b/webmin/postfix/config index 4beebaee4..e483e4d33 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ -fwd_mode=0 -postfix_control_command=/usr/sbin/postfix -mailq_count=0 -postfix_aliases_table_command=/usr/sbin/postalias -sort_mode=0 +prefix_cmts=0 +ldap_doms=0 postfix_lookup_table_command=/usr/sbin/postmap +check_config=1 +mailq_count=0 +postfix_super_command=/usr/sbin/postsuper perpage=20 +postfix_config_file=/etc/postfix/main.cf +show_cmts=0 postfix_config_command=/usr/sbin/postconf -prefix_cmts=0 -delete_warn=1 -check_config=1 -top_buttons=1 +postfix_newaliases_command=/usr/bin/newaliases max_records=200 -postfix_super_command=/usr/sbin/postsuper -postcat_cmd=/usr/sbin/postcat -postfix_master=/etc/postfix/master.cf -wrap_width=80 +postfix_aliases_table_command=/usr/sbin/postalias +delete_warn=1 max_maps=100 -ldap_doms=0 -index_check=1 -postfix_newaliases_command=/usr/bin/newaliases +sort_mode=0 mailq_dir=/var/spool/postfix -show_cmts=0 +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 -delete_confirm=1 columns=2 -postfix_config_file=/etc/postfix/main.cf -mailq_cmd=postqueue -p +index_check=1 +fwd_mode=0 +delete_confirm=1 +postcat_cmd=/usr/sbin/postcat diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 126d1226c..4a5e16001 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -dump_cmd=/usr/bin/pg_dump -rstr_cmd=/usr/bin/pg_restore -stop_cmd=/etc/init.d/postgresql* stop -max_text=1000 -blob_mode=0 -login=postgres +style=0 +pass= +nodbi=0 +plib= simple_sched=0 date_subs=0 -basedb=template1 -max_dbs=50 -plib= +blob_mode=0 access_own=0 -pass= -webmin_subs=0 -psql=/usr/bin/psql -nodbi=0 -access=*: * -sameunix=1 -perpage=25 +basedb=template1 start_cmd=/etc/init.d/postgresql* start -style=0 pid_file=/var/run/postmaster.pid -hba_conf=/etc/postgresql/*/main/pg_hba.conf add_mode=1 +sameunix=1 +access=*: * +hba_conf=/etc/postgresql/*/main/pg_hba.conf +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 +max_dbs=50 diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 237c75238..7af13e89f 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 4004e3f7f..d16208a8f 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ timeout=30 +pptp_options=/etc/ppp/options.pptp pap_file=/etc/ppp/chap-secrets -pptp=pptp peers_dir=/etc/ppp/peers -pptp_options=/etc/ppp/options.pptp +pptp=pptp diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index 43f163360..f74f8d3dd 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -pptp_ppp_options=/etc/ppp/pptpd-options -start_cmd=/etc/init.d/pptpd start +ppp_options=/etc/ppp/options file=/etc/pptpd.conf stop_cmd=/etc/init.d/pptpd stop -log_file=/var/log/messages -ppp_options=/etc/ppp/options -pptpd=pptpd +pptp_ppp_options=/etc/ppp/pptpd-options pap_file=/etc/ppp/chap-secrets +pptpd=pptpd pid_file=/var/run/pptpd.pid +start_cmd=/etc/init.d/pptpd start +log_file=/var/log/messages diff --git a/webmin/proc/config b/webmin/proc/config index 3ecab3230..741d6e45c 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -base_ppid=1 trace_java=0 +base_ppid=1 +hide_self=1 ps_style=linux -default_mode=last cut_length=80 -hide_self=1 +default_mode=last diff --git a/webmin/procmail/config b/webmin/procmail/config index 71541070b..9b36ccfbe 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -includes=0 procmail=procmail procmailrc=/etc/procmailrc +includes=0 diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 29f6376e4..975589cca 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -test_config=1 -proftpd_conf=/etc/proftpd/proftpd.conf -start_cmd=/etc/init.d/proftpd start -stop_cmd=/etc/init.d/proftpd stop -proftpd_path=/usr/sbin/proftpd test_manual=0 +proftpd_path=/usr/sbin/proftpd +stop_cmd=/etc/init.d/proftpd stop +proftpd_conf=/etc/proftpd/proftpd.conf +pid_file=/var/run/proftpd.pid ftpusers=/etc/ftpusers +start_cmd=/etc/init.d/proftpd start +test_config=1 test_always=0 -pid_file=/var/run/proftpd.pid diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 44998a8dd..b9e4c8a3a 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ +perpage=20 +mail_dir= +mailq_sort=0 mail_system=1 -mail_file=Mailbox +mailq_count=0 max_records=200 -mailq_sort=0 -qmail_dir=/var/qmail +delete_warn=1 +index_min=1000000 +mail_file=Mailbox columns=2 -fwd_mode=0 -mailq_count=0 mail_dir_qmail=Maildir -mail_dir= +fwd_mode=0 sort_mode=0 -perpage=20 -delete_warn=1 -index_min=1000000 +qmail_dir=/var/qmail diff --git a/webmin/quota/config b/webmin/quota/config index 8c8b0a7e7..cbf3f9d30 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -block_mode=1 -quotacheck_command=quotacheck -u -g -hide_uids=0 +group_setquota_command=setquota -g +user_copy_command=edquota -u -p +email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the allowed quota. ${USED} of disk space is being used, out of a maximum of ${QUOTA}. +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 group_quota_command=quota -v -g +show_grace=1 sort_mode=0 +pc_show=1 +group_quotaon_command=quotaon -g group_repquota_command=repquota -g -v -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}. -display_max=100 -user_repquota_command=repquota -u -v +user_quotaon_command=quotaon -u +block_size=1024 +hide_uids=0 group_copy_command=edquota -g -p -user_quotaoff_command=quotaoff -u -group_setquota_command=setquota -g user_quota_command=quota -v -u -group_edquota_command=edquota -g user_setquota_command=setquota -u -user_edquota_command=edquota -u -block_size=1024 -pc_show=1 +block_mode=1 group_grace_command=edquota -g -t +user_repquota_command=repquota -u -v group_quotaoff_command=quotaoff -g -user_quotaon_command=quotaon -u -user_copy_command=edquota -u -p -group_quotaon_command=quotaon -g diff --git a/webmin/raid/config b/webmin/raid/config index 7e973e1af..c4849915b 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ -raidtab=/etc/raidtab mdstat=/proc/mdstat mdadm=/etc/mdadm/mdadm.conf +raidtab=/etc/raidtab diff --git a/webmin/samba/config b/webmin/samba/config index af265ef2b..e8c223e2c 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -samba_password_program=/usr/bin/smbpasswd -dont_convert=-499 -text_lists=0 -swat=/usr/sbin/swat -samba_server=/usr/sbin/smbd -stop_cmd=service smbd stop ; service nmbd stop -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' samba_status_program=/usr/bin/smbstatus -pdbedit=/usr/bin/pdbedit -smbgroupedit=/usr/bin/smbgroupedit +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 -smb_passwd=/etc/samba/smbpasswd -sort_mode=0 +pdbedit=/usr/bin/pdbedit +samba_server=/usr/sbin/smbd +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 -run_from_inetd=0 +smb_passwd=/etc/samba/smbpasswd +smbgroupedit=/usr/bin/smbgroupedit +dont_convert=-499 +sort_mode=0 +text_lists=0 diff --git a/webmin/sarg/config b/webmin/sarg/config index 94490ca6c..2afcf8310 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -sarg=sarg sarg_conf=/etc/sarg/sarg.conf naked=0 +sarg=sarg clear=1 diff --git a/webmin/sendmail/config b/webmin/sendmail/config index 35dae77bd..02babbe60 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -mail_style=0 +mail_file=mbox +show_cmts=0 +mail_type=0 +max_records=200 delete_warn=1 -sendmail_command=/usr/lib/sendmail -bd -q1h -show_to=0 -sort_mode=0 -perpage=20 -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -prefix_cmts=0 +index_min=1000000 +sendmail_path=/usr/lib/sendmail mailq_count=0 sendmail_cf=/etc/mail/sendmail.cf +perpage=20 +prefix_cmts=0 +makemap_path=makemap +columns=2 +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +delete_confirm=1 fwd_mode=0 -sendmail_path=/usr/lib/sendmail sendmail_mc=/etc/mail/sendmail.mc -makemap_path=makemap -mailq_show=Date,From,To,Size,Status -max_records=200 +smrsh_dir=/etc/smrsh top_buttons=1 order_mail=0 -index_min=1000000 -track_read=0 +mailq_sort=0 sendmail_features=/usr/share/sendmail/cf +mailq_show=Date,From,To,Size,Status mail_dir=/var/spool/mail -mail_type=0 wrap_width=80 -delete_confirm=1 -columns=2 -mailq_sort=0 -show_cmts=0 -mail_file=mbox -smrsh_dir=/etc/smrsh +mail_style=0 +sort_mode=0 +track_read=0 +sendmail_command=/usr/lib/sendmail -bd -q1h +show_to=0 diff --git a/webmin/servers/config b/webmin/servers/config index a4ec76b5c..4287c1e68 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -display_mode=0 +sort_mode=0 +deffast=2 +show_ip=0 capath=/usr/share/ca-certificates +max_servers=100 +deflink=0 resolve=1 -deffast=2 -show_status=1 groups_dir=/etc/cluster/groups -show_ip=0 -sort_mode=0 +display_mode=0 +show_status=1 scan_time=5 -deflink=0 -max_servers=100 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 8ff1c2d22..5980d830f 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -macros=/usr/share/shorewall +actions=/etc/shorewall/actions /usr/share/shorewall/actions.std config_dir=/etc/shorewall +macros=/usr/share/shorewall display_zone_descriptions=1 -actions=/etc/shorewall/actions /usr/share/shorewall/actions.std shorewall=shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index a9434ece0..43cc6dea3 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -macros=/usr/share/shorewall6 -config_dir=/etc/shorewall6 shorewall6=shorewall6 display_zone_descriptions=1 +macros=/usr/share/shorewall6 +config_dir=/etc/shorewall6 +actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std diff --git a/webmin/smart-status/config b/webmin/smart-status/config index fadfec290..364a682bf 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ -smartctl=smartctl ata=0 +smartctl=smartctl attribs=1 mode=1 diff --git a/webmin/software/config b/webmin/software/config index c93f3edb6..037d899f3 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ update_system=apt -package_system=debian apt_mode=0 +package_system=debian diff --git a/webmin/spam/config b/webmin/spam/config index 8dd12b06d..d8edf5d39 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -call_spam=1 +warn_procmail=1 spamassassin=spamassassin -restart_cmd=/etc/init.d/spamassassin restart -procmailrc=/etc/procmailrc -mode=0 procmail_cmd=* +procmailrc=/etc/procmailrc sa_learn=sa-learn -processes=spamd amavisd -addto=0 +mode=0 +call_spam=1 local_cf=/etc/spamassassin/local.cf -warn_procmail=1 max_awl=200 +processes=spamd amavisd +addto=0 +restart_cmd=/etc/init.d/spamassassin restart diff --git a/webmin/squid/config b/webmin/squid/config index 50e6b1009..f1d8e85e2 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -sort_conf=0 -cal_fmt=w -calamaris=calamaris +cache_dir=/var/spool/squid +cal_args=-aw squid_path=squid +pid_file=/var/run/squid.pid +calamaris=calamaris +cal_max=50000 +squid_restart=service squid reload +squid_start=service squid start +restart_pos=0 cal_all=1 +cal_fmt=w sync_delete=0 -crypt_conf=0 squidclient=squidclient -cal_max=50000 -sync_create=0 -squid_start=service squid start -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi -squid_conf=/etc/squid/squid.conf -cache_dir=/var/spool/squid -pid_file=/var/run/squid.pid sync_modify=1 -restart_pos=0 -cal_args=-aw -log_dir=/var/log/squid +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi squid_stop=service squid stop -squid_restart=service squid reload +log_dir=/var/log/squid +sync_create=0 +crypt_conf=0 +sort_conf=0 +squid_conf=/etc/squid/squid.conf diff --git a/webmin/sshd/config b/webmin/sshd/config index 59a500e15..a0a125f2c 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -sshd_path=/usr/sbin/sshd -sync_pass=0 -client_config=/etc/ssh/ssh_config stop_cmd=service ssh stop +sshd_config=/etc/ssh/sshd_config +sync_pass=0 sync_gnupg=0 +sync_auth=1 start_cmd=service ssh start -keygen_path=/usr/bin/ssh-keygen +client_config=/etc/ssh/ssh_config pid_file=/var/run/sshd.pid -sync_auth=1 -sshd_config=/etc/ssh/sshd_config +keygen_path=/usr/bin/ssh-keygen +sshd_path=/usr/sbin/sshd sync_create=0 diff --git a/webmin/status/config b/webmin/status/config index 87f9fb3a2..ad7d1d3e3 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,14 +1,14 @@ -snmp_version=2 -snmp_trap=1.3.6.1.4.1.10000.1.1 -subject_mode=0 +pinger=linux sched_offset=0 -sort_mode=0 -output=0 +columns=2 sysinfo_users=0 +history_purge=30 index_status=1 -history_show=50 +snmp_version=2 sysinfo=0 -pinger=linux +history_show=50 +sort_mode=0 +output=0 pager_cmd=sms_client -history_purge=30 -columns=2 +subject_mode=0 +snmp_trap=1.3.6.1.4.1.10000.1.1 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index 0c4bd6a67..b92f41137 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -pid_file=/var/run/syslog-ng.pid compressed=1 -stop_cmd=/etc/init.d/syslog-ng stop start_cmd=/etc/init.d/syslog-ng start -syslogng_conf=/etc/syslog-ng/syslog-ng.conf syslogng_cmd=syslog-ng +pid_file=/var/run/syslog-ng.pid +stop_cmd=/etc/init.d/syslog-ng stop lines=20 +syslogng_conf=/etc/syslog-ng/syslog-ng.conf diff --git a/webmin/syslog/config b/webmin/syslog/config index 76f6c26e3..7ec7ca6cb 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -pri_all=1 others=1 -lines=20 -tags=0 -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -socket=0 -signal_cmd=/usr/sbin/service rsyslog restart -pid_file=/var/run/rsyslogd.pid -restart_cmd=/usr/sbin/service rsyslog restart -m4_conf=0 +reverse=0 +start_cmd=/usr/sbin/service rsyslog start compressed=1 +m4_path= +restart_cmd=/usr/sbin/service rsyslog restart +pid_file=/var/run/rsyslogd.pid +pipe=1 syslogd=/usr/sbin/rsyslogd -start_cmd=/usr/sbin/service rsyslog start -reverse=0 -syslog_conf=/etc/rsyslog.conf +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 sync=1 -pipe=1 -m4_path= +tags=0 +syslog_conf=/etc/rsyslog.conf diff --git a/webmin/system-status/config b/webmin/system-status/config index c627a9fec..b6a7e4155 100644 --- a/webmin/system-status/config +++ b/webmin/system-status/config @@ -1,2 +1,2 @@ -collect_pkgs=1 collect_interval=5 +collect_pkgs=1 diff --git a/webmin/telnet/config b/webmin/telnet/config index bd4ffb297..634438b50 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ +mode=1 +proxy=0 sizemode=0 -no_test=0 detach=0 -proxy=0 -mode=1 +no_test=0 diff --git a/webmin/time/config b/webmin/time/config index 97f47250e..858452b37 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ seconds=1 +lease=5 timeserver=0.pool.ntp.org -timeserver_hardware=1 zone_style=linux +timeserver_hardware=1 ntp_only=1 -lease=5 diff --git a/webmin/updown/config b/webmin/updown/config index f6605280c..aba856c09 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ +ddir=/ duser=root -user=root dir=/ -ddir=/ +user=root diff --git a/webmin/useradmin/config b/webmin/useradmin/config index 343496bf3..e2a36f7ba 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -passwd_progmode=0 -email_type=0 -gshadow_file=/etc/gshadow -base_uid=1000 -skip_md5=0 uid_calc=0 -shadow_file=/etc/shadow -passwd_same=0 -home_base=/home +secmode=0 random_password=0 -md5=1 -last_show=0 -passwd_file=/etc/passwd -default_other=1 -alias_check=0 -home_style=0 -passwd_dict=0 +shadow_file=/etc/shadow +skip_md5=0 +email_type=0 uid_mode=1 -passwd_stars=0 -sort_mode=0 +selinux_con=user_u:object_r:user_home_dir_t user_files=/etc/skel -empty_mode=0 -base_gid=1000 -display_max=400 -membox=0 -delete_root=0 -lock_string=* -secmode=0 extra_real=0 -selinux_con=user_u:object_r:user_home_dir_t -from_files=0 -new_user_group=0 -gid_calc=0 +passwd_dict=0 shells=fixed,passwd,shells -default_group=users +base_uid=1000 new_user_gid=0 -delete_only=0 +last_show=0 +delete_root=0 group_file=/etc/group +display_max=400 +from_files=0 +base_gid=1000 display_mode=1 +gshadow_file=/etc/gshadow +passwd_same=0 +md5=1 +home_base=/home +alias_check=0 +empty_mode=0 +default_group=users +delete_only=0 +default_other=1 +passwd_progmode=0 gid_mode=1 +membox=0 +sort_mode=0 +home_style=0 +new_user_group=0 +passwd_stars=0 +lock_string=* homedir_perms=0755 +gid_calc=0 +passwd_file=/etc/passwd diff --git a/webmin/usermin/config b/webmin/usermin/config index 30c69584c..a4b4d7968 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -upmissing=0 usermin_dir=/etc/usermin -cron_mode=0 -update=0 upshow=1 +cron_mode=0 +upmissing=0 uphour=4 +update=0 updays=1 diff --git a/webmin/version b/webmin/version index 586788aa9..3d21771ae 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.983 +1.984 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index 164463222..023508f00 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -auto=apache,squid,proftpd,wuftpd -skip_old=0 -alt_conf=/etc/webalizer/webalizer.conf.sample 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 naked=0 diff --git a/webmin/webmin/config b/webmin/webmin/config index 19da63f74..1fbd7e8be 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ +cron_mode=0 osdn=1 -updays=1 -uphour=23 -upshow=1 letsencrypt_dns_wait=10 -last_version_number=1.900 +warn_days=7 +updays=1 +update=0 upmins=47 upmissing=0 last_version_check=1549050668 -warn_days=7 -update=0 -cron_mode=0 +uphour=23 +upshow=1 +last_version_number=1.900 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index 48b976174..98189b873 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftpusers=/etc/wu-ftpd/ftpusers +ftpconversions=/etc/wu-ftpd/ftpconversions ftpgroups=/etc/wu-ftpd/ftpgroups -pid_file=/var/run/ftpd.pids-all -ftpd_path=/usr/sbin/wu-ftpd -ftpaccess=/etc/wu-ftpd/ftpaccess log_file=/var/log/xferlog -ftpconversions=/etc/wu-ftpd/ftpconversions 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 diff --git a/webmin/xinetd/config b/webmin/xinetd/config index c388770ef..b733863ce 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 -lookup_servs=1 pid_file=/var/run/xinetd.pid -xinetd_conf=/etc/xinetd.conf protocols_file=/etc/protocols +lookup_servs=1 -- 2.43.0