From 63c0a2346d9579308fe8e49b8f64858cc7b393c1 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Fri, 8 Jan 2021 10:56:33 +0100 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -code-brand 6.4-9 all -collaboraoffice6.4 6.4.10.15-15 amd64 -collaboraoffice6.4-ure 6.4.10.15-15 amd64 +code-brand 6.4-10 all +collaboraoffice6.4 6.4.10.19-19 amd64 +collaboraoffice6.4-ure 6.4.10.19-19 amd64 -collaboraofficebasis6.4-calc 6.4.10.15-15 amd64 -collaboraofficebasis6.4-core 6.4.10.15-15 amd64 -collaboraofficebasis6.4-draw 6.4.10.15-15 amd64 -collaboraofficebasis6.4-en-us 6.4.10.15-15 amd64 -collaboraofficebasis6.4-extension-pdf-import 6.4.10.15-15 amd64 -collaboraofficebasis6.4-graphicfilter 6.4.10.15-15 amd64 -collaboraofficebasis6.4-images 6.4.10.15-15 amd64 -collaboraofficebasis6.4-impress 6.4.10.15-15 amd64 -collaboraofficebasis6.4-ooofonts 6.4.10.15-15 amd64 -collaboraofficebasis6.4-ooolinguistic 6.4.10.15-15 amd64 -collaboraofficebasis6.4-writer 6.4.10.15-15 amd64 +collaboraofficebasis6.4-calc 6.4.10.19-19 amd64 +collaboraofficebasis6.4-core 6.4.10.19-19 amd64 +collaboraofficebasis6.4-draw 6.4.10.19-19 amd64 +collaboraofficebasis6.4-en-us 6.4.10.19-19 amd64 +collaboraofficebasis6.4-extension-pdf-import 6.4.10.19-19 amd64 +collaboraofficebasis6.4-graphicfilter 6.4.10.19-19 amd64 +collaboraofficebasis6.4-images 6.4.10.19-19 amd64 +collaboraofficebasis6.4-impress 6.4.10.19-19 amd64 +collaboraofficebasis6.4-ooofonts 6.4.10.19-19 amd64 +collaboraofficebasis6.4-ooolinguistic 6.4.10.19-19 amd64 +collaboraofficebasis6.4-writer 6.4.10.19-19 amd64 -libopenjp2-7 2.3.1-1ubuntu4 amd64 +libopenjp2-7 2.3.1-1ubuntu4.20.04.1 amd64 -linux-libc-dev 5.4.0-59.65 amd64 +linux-libc-dev 5.4.0-60.67 amd64 -loolwsd 6.4.2-3 amd64 +loolwsd 6.4.3-1 amd64 -tzdata 2020d-0ubuntu0.20.04 all +tzdata 2020f-0ubuntu0.20.04 all -webmin 1.962 all +webmin 1.970 all --- webmin/acl/config | 4 +- webmin/adsl-client/config | 8 ++-- webmin/apache/config | 36 +++++++------- webmin/bacula-backup/config | 10 ++-- webmin/bandwidth/config | 2 +- webmin/bind8/config | 68 +++++++++++++------------- webmin/cluster-passwd/config | 2 +- webmin/cluster-software/config | 2 +- webmin/cluster-useradmin/config | 8 ++-- webmin/cluster-webmin/config | 2 +- webmin/config | 42 ++++++++--------- webmin/cpan/config | 6 +-- webmin/cron/config | 38 +++++++-------- webmin/dhcpd/config | 21 +++++---- webmin/dovecot/config | 4 +- webmin/exim/config | 8 ++-- webmin/exports/config | 2 +- webmin/fail2ban/config | 4 +- webmin/fetchmail/config | 6 +-- webmin/filter/config | 6 +-- webmin/firewall/config | 4 +- webmin/firewall6/config | 6 +-- webmin/firewalld/config | 2 +- webmin/fsdump/config | 6 +-- webmin/grub/config | 4 +- webmin/heartbeat/config | 20 ++++---- webmin/htaccess-htpasswd/config | 10 ++-- webmin/idmapd/config | 2 +- webmin/inetd/config | 20 ++++---- webmin/init/config | 24 +++++----- webmin/inittab/config | 2 +- webmin/ipfilter/config | 8 ++-- webmin/ipfw/config | 8 ++-- webmin/ipsec/config | 10 ++-- webmin/iscsi-client/config | 6 +-- webmin/iscsi-server/config | 2 +- webmin/iscsi-target/config | 8 ++-- webmin/iscsi-tgtd/config | 4 +- webmin/jabber/config | 6 +-- webmin/ldap-client/config | 2 +- webmin/ldap-server/config | 12 ++--- webmin/ldap-useradmin/config | 36 +++++++------- webmin/logrotate/config | 4 +- webmin/lpadmin/config | 22 ++++----- webmin/lvm/config | 2 +- webmin/mailboxes/config | 84 ++++++++++++++++----------------- webmin/man/config | 8 ++-- webmin/miniserv.conf | 2 +- webmin/mon/config | 6 +-- webmin/mount/config | 10 ++-- webmin/mysql/config | 34 ++++++------- webmin/net/config | 2 +- webmin/nis/config | 4 +- webmin/openslp/config | 6 +-- webmin/pam/config | 4 +- webmin/pap/config | 8 ++-- webmin/passwd/config | 4 +- webmin/postfix/config | 40 ++++++++-------- webmin/postgresql/config | 30 ++++++------ webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 6 +-- webmin/pptp-server/config | 10 ++-- webmin/proc/config | 8 ++-- webmin/procmail/config | 2 +- webmin/proftpd/config | 10 ++-- webmin/qmailadmin/config | 16 +++---- webmin/quota/config | 36 +++++++------- webmin/raid/config | 2 +- webmin/samba/config | 20 ++++---- webmin/sarg/config | 2 +- webmin/sendmail/config | 42 ++++++++--------- webmin/servers/config | 14 +++--- webmin/shell/config | 2 +- webmin/shorewall/config | 6 +-- webmin/shorewall6/config | 6 +-- webmin/smart-status/config | 4 +- webmin/software/config | 2 +- webmin/spam/config | 14 +++--- webmin/squid/config | 30 ++++++------ webmin/sshd/config | 14 +++--- webmin/status/config | 16 +++---- webmin/syslog-ng/config | 4 +- webmin/syslog/config | 30 ++++++------ webmin/tcpwrappers/config | 2 +- webmin/telnet/config | 4 +- webmin/time/config | 4 +- webmin/updown/config | 4 +- webmin/useradmin/config | 62 ++++++++++++------------ webmin/usermin/config | 8 ++-- webmin/version | 2 +- webmin/vgetty/config | 2 +- webmin/webalizer/config | 6 +-- webmin/webmin/config | 16 +++---- webmin/wuftpd/config | 8 ++-- webmin/xinetd/config | 6 +-- 95 files changed, 587 insertions(+), 586 deletions(-) diff --git a/webmin/acl/config b/webmin/acl/config index ee9b4c16b..017dd0405 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ -display=1 -ssleay=/usr/bin/openssl order=0 +ssleay=/usr/bin/openssl +display=1 diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index 3b7d1326e..fa9920957 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ +status_cmd=adsl-status conf_style=0 +pppoe_conf=/etc/ppp/pppoe.conf stop_cmd=adsl-stop -start_cmd=adsl-start -pppoe_cmd=pppoe -status_cmd=adsl-status pap_file=/etc/ppp/pap-secrets -pppoe_conf=/etc/ppp/pppoe.conf +pppoe_cmd=pppoe +start_cmd=adsl-start diff --git a/webmin/apache/config b/webmin/apache/config index da0315c05..de5503150 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -show_order=0 -httpd_path=/usr/sbin/apache2 -allow_virtualmin=0 -virt_file=/etc/apache2/sites-available -defines_file=/etc/apache2/envvars -max_servers=100 -test_manual=0 +test_apachectl=1 +show_list=0 +show_names=0 +access_conf=/etc/apache2/access.conf srm_conf=/etc/apache2/srm.conf -apachectl_path=/usr/sbin/apache2ctl -mime_types=/etc/apache2/mime.types -defines_name=APACHE_ARGUMENTS -start_cmd=/etc/init.d/apache2 start +test_always=0 +max_servers=100 apply_cmd=/usr/sbin/apache2ctl graceful +apachectl_path=/usr/sbin/apache2ctl +httpd_path=/usr/sbin/apache2 httpd_dir=/etc/apache2 -test_always=0 test_config=1 -test_apachectl=1 -stop_cmd=/etc/init.d/apache2 stop -access_conf=/etc/apache2/access.conf -show_names=0 +test_manual=0 +start_cmd=/etc/init.d/apache2 start httpd_conf=/etc/apache2/apache2.conf -link_dir=/etc/apache2/sites-enabled -show_list=0 +defines_name=APACHE_ARGUMENTS +defines_file=/etc/apache2/envvars +stop_cmd=/etc/init.d/apache2 stop auto_mods=1 +allow_virtualmin=0 +virt_file=/etc/apache2/sites-available +link_dir=/etc/apache2/sites-enabled +show_order=0 +mime_types=/etc/apache2/mime.types diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index b4e87b4be..e5df5033c 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -pass= +btape=btape db=bacula wait=1 -btape=btape -apply=1 -driver=Pg +bls=bls showdirs=0 init_start=0 bacula_dir=/etc/bacula +apply=1 user=bacula -bls=bls +pass= bextract=bextract +driver=Pg diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config index da72c415d..db38d7751 100644 --- a/webmin/bandwidth/config +++ b/webmin/bandwidth/config @@ -1,2 +1,2 @@ -bandwidth_log=/var/log/bandwidth firewall_system=firewall +bandwidth_log=/var/log/bandwidth diff --git a/webmin/bind8/config b/webmin/bind8/config index 65cf7dab1..6c30f4eb7 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,45 +1,45 @@ -rev_def=0 -confirm_zone=1 +master_dir=/var/lib/bind +signzone=dnssec-signzone +spf_record=0 +whois_cmd=whois largezones=0 -support_aaaa=1 -rndcconf_cmd=rndc-confgen -slave_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 +keygen=dnssec-keygen max_zones=50 -checkzone=named-checkzone -soa_style=0 -zones_file=/etc/bind/named.conf.local -short_names=0 +confirm_zone=1 +rev_must=0 show_list=0 -confirm_rec=0 +named_conf=/etc/bind/named.conf +relative_paths=0 +named_path=/usr/sbin/named +support_aaaa=1 +slave_dir=/var/lib/bind +ndc_cmd=ndc +other_slaves=1 +rndc_conf=/etc/bind/rndc.conf ipv6_mode=1 -spf_record=0 -soa_start=0 -master_ttl=1 -checkconf=named-checkconf -updserial_on=1 -allow_long=0 -by_view=0 -keygen=dnssec-keygen +allow_wild=1 +updserial_man=1 updserial_def=0 -other_slaves=1 +no_chroot=0 rndc_cmd=rndc -named_conf=/etc/bind/named.conf -pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid +master_ttl=1 +updserial_on=1 +short_names=0 +allow_comments=0 no_pid_chroot=0 -rndc_conf=/etc/bind/rndc.conf -relative_paths=0 -no_chroot=0 +rev_def=0 +allow_long=0 +confirm_rec=0 +checkconf=named-checkconf +reversezonefilename_format=ZONE.rev +zones_file=/etc/bind/named.conf.local force_random=0 +by_view=0 +checkzone=named-checkzone +rndcconf_cmd=rndc-confgen forwardzonefilename_format=ZONE.hosts -master_dir=/var/lib/bind -allow_wild=1 -named_path=/usr/sbin/named +soa_start=0 +soa_style=0 records_order=0 allow_underscore=1 -reversezonefilename_format=ZONE.rev -ndc_cmd=ndc -allow_comments=0 -signzone=dnssec-signzone -rev_must=0 -whois_cmd=whois -updserial_man=1 diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 75e5ffcde..2ab4c6af1 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ input_type=0 -max_users=200 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 36f8f0aed..0da24580e 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -conf_add_user=1 conf_add_group=1 -conf_allow_sync=1 +conf_add_user=1 +conf_host_links=1 sort_mode=0 -conf_find_group=1 conf_find_user=1 -conf_host_links=1 +conf_find_group=1 table_mode=0 conf_allow_refresh=1 +conf_allow_sync=1 diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config index fd788cb1e..470eaee86 100644 --- a/webmin/cluster-webmin/config +++ b/webmin/cluster-webmin/config @@ -1,2 +1,2 @@ -table_mode=0 sort_mode=0 +table_mode=0 diff --git a/webmin/config b/webmin/config index 241d79681..f00fec3a2 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -os_version=9.0 +nofeedbackcc=0 +dateformat=dd/mon/yyyy +referers_none=1 +showhost=0 +showlogin=0 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin ld_env=LD_LIBRARY_PATH -real_os_version=18.04.1 -theme=authentic-theme +os_version=9.0 +help_height= lang=en.UTF-8 -passwd_uindex=0 -referers_none=1 log=1 -os_type=debian-linux -hostnamedisplay= -md5pass=1 -nofeedbackcc=0 +passwd_uindex=0 feedback_to= +sysinfo=0 tempdelete_days=7 -lang_root=de.UTF-8 -passwd_mindex=4 product=webmin -dateformat=dd/mon/yyyy -webprefix= -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin passwd_pindex=1 -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -showhost=0 -sysinfo=0 +passwd_cindex=2 +webprefix= passwd_file=/etc/shadow -showlogin=0 hostnamemode=0 -passwd_cindex=2 -by_view=0 -help_height= +md5pass=1 real_os_type=Ubuntu Linux +real_os_version=18.04.1 +theme=authentic-theme +os_type=debian-linux +lang_root=de.UTF-8 +passwd_mindex=4 help_width= +by_view=0 +hostnamedisplay= +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' diff --git a/webmin/cpan/config b/webmin/cpan/config index c08bb3372..75e30348c 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -incyum=1 -incpackages=1 packages=http://www.cpan.org/modules/02packages.details.txt.gz -save_partial=0 +incyum=1 cpan=http://www.cpan.org/authors/id refresh_days=30 +save_partial=0 +incpackages=1 diff --git a/webmin/cron/config b/webmin/cron/config index a9cfdf4b3..bebefea7c 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ -show_comment=0 -max_jobs=100 -cron_allow_file=/var/spool/cron/allow -cron_dir=/var/spool/cron/crontabs -vixie_cron=1 -system_crontab=/etc/crontab -cron_get_command=crontab -u USER -l cron_input=1 -show_next=0 -cron_user_get_command=crontab -l -cronfiles_dir=/etc/cron.d -cron_user_edit_command=crontab -e +cron_deny_all=2 +match_mode=0 +system_crontab=/etc/crontab +hourly_only=0 cron_delete_command=crontab -u USER -r match_user=1 -kill_subs=0 +max_jobs=100 +cron_user_get_command=crontab -l show_run=0 -max_len=80 -cron_deny_all=2 -hourly_only=0 -match_mode=0 -cron_deny_file=/var/spool/cron/deny +vixie_cron=1 +kill_subs=0 cron_edit_command=crontab -u USER -e -cron_user_delete_command=crontab -r -run_parts=run-parts show_time=0 +cron_get_command=crontab -u USER -l +run_parts=run-parts +cron_deny_file=/var/spool/cron/deny +cron_dir=/var/spool/cron/crontabs +cron_user_delete_command=crontab -r +show_next=0 +cron_user_edit_command=crontab -e +show_comment=0 +cronfiles_dir=/etc/cron.d +max_len=80 +cron_allow_file=/var/spool/cron/allow diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index 098b57a32..52499e809 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,16 +1,17 @@ -start_cmd=service isc-dhcp-server start -show_mac=0 -dhcpd_nocols=5 -dhcpd_conf=/etc/dhcp/dhcpd.conf -desc_name=0 -display_max=100 -dhcpd_path=/usr/sbin/dhcpd -group_name=0 pid_file=/var/run/dhcpd.pid -lease_sort=0 +display_max=100 +desc_name=0 +dhcpd_nocols=5 stop_cmd=service isc-dhcp-server stop +group_name=0 +show_mac=0 show_ip=0 -lease_tz=0 lease_file=/var/lib/dhcp/dhcpd.leases +dhcpd_path=/usr/sbin/dhcpd interfaces_type=debian +lease_tz=0 +dhcpd_conf=/etc/dhcp/dhcpd.conf +lease_sort=0 +lease_vendor=0 +start_cmd=service isc-dhcp-server start restart_cmd=service isc-dhcp-server restart diff --git a/webmin/dovecot/config b/webmin/dovecot/config index d6e9d8483..345812ba1 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ -dovecot_config=/etc/dovecot/dovecot.conf pid_file=/var/run/dovecot/master.pid -dovecot=/usr/sbin/dovecot +dovecot_config=/etc/dovecot/dovecot.conf init_script=dovecot +dovecot=/usr/sbin/dovecot diff --git a/webmin/exim/config b/webmin/exim/config index 58d77d68f..492b81315 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ exim_dbmfile=/etc/exim4/local_domains -exim_dir=/etc/exim4 -exim_addrfile=/etc/exim4/email-addresses -exim_mail_file=Maildir -exim_aliasfileext= exim_dbmext=.dbm +exim_aliasfileext= mail_system=1 exim_virt_dir=/etc/exim4/aliases +exim_addrfile=/etc/exim4/email-addresses +exim_mail_file=Maildir +exim_dir=/etc/exim4 diff --git a/webmin/exports/config b/webmin/exports/config index b8864bec5..d23f7b7df 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ -exports_file=/etc/exports restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi +exports_file=/etc/exports apply_cmd=exportfs -r diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index 00afde779..aebf23ff0 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ +client_cmd=/usr/bin/fail2ban-client config_dir=/etc/fail2ban -init_script=fail2ban server_cmd=/usr/bin/fail2ban-server -client_cmd=/usr/bin/fail2ban-client +init_script=fail2ban diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 38cf033bf..b7ac7bb6d 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ -view_mode=0 +fetchmail_path=fetchmail config_file= max_users=400 -pid_file=/var/run/fetchmail.pid daemon_user=root -fetchmail_path=fetchmail +view_mode=0 +pid_file=/var/run/fetchmail.pid diff --git a/webmin/filter/config b/webmin/filter/config index fdc102a5d..c5a7085ee 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ +virtualmin_config=/etc/webmin/virtual-server +forward_procmail=0 reply_force=0 -alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases warn_procmail=1 +alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl -forward_procmail=0 -virtualmin_config=/etc/webmin/virtual-server diff --git a/webmin/firewall/config b/webmin/firewall/config index 3f438a7f7..e55c04164 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -view_comment=0 -direct=0 view_condition=1 comment_mod=0 force_init=0 +direct=0 cluster_mode=1 +view_comment=0 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index d20de0ca5..8546d5339 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -force_init=0 -cluster_mode=1 +view_condition=1 comment_mod=0 +force_init=0 direct=0 -view_condition=1 view_comment=0 +cluster_mode=1 diff --git a/webmin/firewalld/config b/webmin/firewalld/config index 0aae64fac..ff329a00d 100644 --- a/webmin/firewalld/config +++ b/webmin/firewalld/config @@ -1,2 +1,2 @@ -init_name=firewalld firewall_cmd=firewall-cmd +init_name=firewalld diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 7987b3b6f..ef8d33dbd 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -nonewtape=0 +simple_sched=0 date_subs=0 -run_mode=0 +nonewtape=0 always_tar=0 +run_mode=0 error_email=0 -simple_sched=0 webmin_subs=0 diff --git a/webmin/grub/config b/webmin/grub/config index f6464eb2a..49d2d2860 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ -install=(hd0) -grub_path=grub menu_file=/boot/grub/menu.lst +grub_path=grub +install=(hd0) diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index f5ce8b865..2c681a4e8 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -ha_dir=/etc/ha.d -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys -req_resource_cmd=/usr/lib/heartbeat/req_resource -heartbeat=/usr/lib/heartbeat/heartbeat -alt_haresources=/usr/share/doc/packages/heartbeat/haresources +stop_cmd=/etc/init.d/heartbeat stop +serials=/dev/ttyS* ha_cf= -apply_cmd=/etc/init.d/heartbeat reload +pid_file=/var/run/heartbeat.pid +heartbeat=/usr/lib/heartbeat/heartbeat +haresources= authkeys= +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +ha_dir=/etc/ha.d alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf start_cmd=/etc/init.d/heartbeat start +req_resource_cmd=/usr/lib/heartbeat/req_resource +alt_haresources=/usr/share/doc/packages/heartbeat/haresources resource_d= -stop_cmd=/etc/init.d/heartbeat stop -pid_file=/var/run/heartbeat.pid -haresources= -serials=/dev/ttyS* +apply_cmd=/etc/init.d/heartbeat reload diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index f6f23cddc..f69f43bbe 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ +sort=0 +sha1=0 +extra_directives= +md5=1 htpasswd=.htpasswd digest=1 -extra_directives= -htgroups=.htgroups -sha1=0 htaccess=.htaccess -md5=1 -sort=0 +htgroups=.htgroups diff --git a/webmin/idmapd/config b/webmin/idmapd/config index f25eeba97..bc70dab5e 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ +idmapd_path=/usr/sbin/rpc.idmapd 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 35e997de4..787fce483 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -allow_file=/etc/hosts.allow -ipv6=0 +restart_command=killall -HUP inetd +rpc_protocols=tcp udp qm_mode=0 +protocols_file=/etc/protocols +services_file=/etc/services show_empty=1 +inetd_conf_file=/etc/inetd.conf +allow_file=/etc/hosts.allow +ipv6=0 +display_max=100 tcpd_path=/usr/sbin/tcpd -rpc_protocols=tcp udp +rpc_file=/etc/rpc +extended_inetd=1 rpc_inetd=1 -protocols_file=/etc/protocols deny_file=/etc/hosts.deny -inetd_conf_file=/etc/inetd.conf sort_mode=0 -extended_inetd=1 -rpc_file=/etc/rpc -restart_command=killall -HUP inetd -display_max=100 -services_file=/etc/services diff --git a/webmin/init/config b/webmin/init/config index f19c956db..6435979ca 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -order=0 -no_chkconfig=0 +init_dir=/etc/init.d init_base=/etc/ -inittab_id=id -shutdown_command=poweroff -soft_links=1 +boot_levels=2 3 5 init_info=1 +order=0 +reboot_command=reboot +atboot_product=webmin +soft_links=1 sort_mode=0 -boot_levels=2 3 5 +expert=0 +status_check=0 +order_digits=2 +inittab_id=id +shutdown_command=poweroff show_opts=0 +no_chkconfig=0 desc=1 -order_digits=2 -atboot_product=webmin -status_check=0 -reboot_command=reboot -expert=0 -init_dir=/etc/init.d 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 2e72bf825..3868167e4 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ +cluster_nat=1 +ipfstat=ipfstat +ipnat_conf=/etc/ipf/ipnat.conf +ipf_conf=/etc/ipf/ipf.conf view_condition=1 ipnat=ipnat cluster_mode=0 -ipnat_conf=/etc/ipf/ipnat.conf -cluster_nat=1 -ipf_conf=/etc/ipf/ipf.conf -ipfstat=ipfstat ipf=ipf view_comment=0 diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 003915a6f..b4f494a99 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -view_condition=1 cluster_mode=0 -view_counters=0 -ipfw=/sbin/ipfw -version=2 view_comment=0 +view_condition=1 +version=2 +ipfw=/sbin/ipfw +view_counters=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 8e7b4c23f..742d950b0 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ -logfile=/var/log/messages restart_cmd=/etc/init.d/ipsec restart +start_cmd=/etc/init.d/ipsec start +policies_dir=/etc/ipsec.d/policies +stop_cmd=/etc/init.d/ipsec stop file=/etc/ipsec.conf -secrets=/etc/ipsec.secrets ipsec=/usr/sbin/ipsec -stop_cmd=/etc/init.d/ipsec stop -policies_dir=/etc/ipsec.d/policies -start_cmd=/etc/init.d/ipsec start +logfile=/var/log/messages +secrets=/etc/ipsec.secrets diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index fdbb38f1f..79e006bf4 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ +iscsiiname=iscsi-iname init_name=open-iscsi -config_file=/etc/iscsi/iscsid.conf +ifaces_dir=/var/lib/iscsi/ifaces initiator_file=/etc/iscsi/initiatorname.iscsi -iscsiiname=iscsi-iname iscsiadm=iscsiadm -ifaces_dir=/var/lib/iscsi/ifaces +config_file=/etc/iscsi/iscsid.conf diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index c2c53fef4..d3e3570c5 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,5 +1,5 @@ -iscsi_server=/usr/sbin/iscsi-target pid_file=/var/run/iscsi-target.pid +iscsi_server=/usr/sbin/iscsi-target auths_file=/etc/iscsi/auths targets_file=/etc/iscsi/targets init_name=netbsd-iscsi diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index e524d883f..877ab9b89 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ +config_file=/etc/iet/ietd.conf pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid -init_name=iscsitarget -opts_file=/etc/default/iscsitarget initiators_file=/etc/iet/initiators.allow -config_file=/etc/iet/ietd.conf -targets_file=/etc/iet/targets.allow ietadm=ietadm +init_name=iscsitarget +targets_file=/etc/iet/targets.allow +opts_file=/etc/default/iscsitarget diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 34a3e9561..919d3cc99 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ +tgtadm=tgtadm tgtd=tgtd +tgtadmin=tgt-admin config_file=/etc/tgt/targets.conf -tgtadm=tgtadm init_name=tgtd -tgtadmin=tgt-admin diff --git a/webmin/jabber/config b/webmin/jabber/config index 415989b80..6290372db 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_daemon=/usr/sbin/jabberd jabber_dir=/var/lib/jabber +jabber_config=/etc/jabber/jabber.xml +start_cmd=/etc/init.d/jabberd start +stop_cmd=/etc/init.d/jabberd stop diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index d45286770..4460f14f7 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -secret=/etc/ldap.secret auth_ldap=/etc/ldap.conf +secret=/etc/ldap.secret init_name=nslcd diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index bc7fc2cf0..40830ef79 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ +ldap_user=openldap stop_cmd=/etc/init.d/slapd stop -attr_count=6 -config_file=/etc/ldap/slapd.d +schema_dir=/etc/ldap/schema +slapd=slapd init_name=slapd -browse_max=100 start_cmd=/etc/init.d/slapd start -slapd=slapd +browse_max=100 apply_cmd=/etc/init.d/slapd restart -schema_dir=/etc/ldap/schema -ldap_user=openldap +config_file=/etc/ldap/slapd.d +attr_count=6 diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 49cda461d..6f993f422 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -multi_fields=0 +membox=0 +imap_login=cyrus +samba_def=0 +given=0 +samba_class=sambaSamAccount +ldap_tls=0 +slappasswd=slappasswd +imap_folders=old public sent-mail +imap_foldersep=. alias_same=0 -mailfmt=0 -given_order=0 gecos=1 -other_class=inetOrgPerson -imap_folders=old public sent-mail -slappasswd=slappasswd -auth_ldap=/etc/ldap.conf +imap_class=SuSEeMailObject person=1 -samba_class=sambaSamAccount -imap_login=cyrus +imap_def=0 samba_gclass=sambaGroup -membox=0 +multi_fields=0 +mailfmt=0 +md5=0 +secmode=0 +auth_ldap=/etc/ldap.conf shells=fixed,ldap,passwd,shells -imap_def=0 -given=0 quota_support=0 -secmode=0 -imap_class=SuSEeMailObject -samba_def=0 -md5=0 -ldap_tls=0 -imap_foldersep=. +given_order=0 +other_class=inetOrgPerson diff --git a/webmin/logrotate/config b/webmin/logrotate/config index bdc255d3a..d0c77369e 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 d454639c6..cf7436a9e 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -print_style=cups -display_mode=0 -iface_perms=755 -gs_path=gs -show_jobs=0 +start_cmd=/etc/init.d/cupsys start show_status=0 -stop_cmd=/etc/init.d/cupsys stop iface_owner=lp:lp -gs_fontpath= -start_cmd=/etc/init.d/cupsys start sort_mode=0 -iface_arg= +print_style=cups +model_path=/usr/share/foomatic/db /usr/share/ppd +show_jobs=0 +smbclient_path=smbclient +iface_perms=755 +gs_fontpath= spool_dir=/var/spool/cups gs_lib= -model_path=/usr/share/foomatic/db /usr/share/ppd +gs_path=gs +stop_cmd=/etc/init.d/cupsys stop +iface_arg= driver_style=cups -smbclient_path=smbclient +display_mode=0 diff --git a/webmin/lvm/config b/webmin/lvm/config index 63b743f61..a5ef0ed4d 100644 --- a/webmin/lvm/config +++ b/webmin/lvm/config @@ -1,2 +1,2 @@ -lvm_conf=/etc/lvm/lvm.conf show_table=0 +lvm_conf=/etc/lvm/lvm.conf diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index 4df4dd0f5..603d491cc 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -view_html=0 -sync_modify=1 -show_to=0 -delete_warn=y -date_fmt=dmy -sync_perms=0700 -check_mod=1 -arrows=1 -show_size=1 -ignore_users_enabled=0 -wrap_width=80 -no_crlf=0 +noindex_hostname=0 +maildir_deleted=0 vpopmail_dir=/home/vpopmail -mail_style=0 -show_count=0 -max_records=200 +link_mode=0 +sync_delete=1 +show_body=0 +show_to=0 +mailbox_user=.usermin/mailbox +log_read=0 +view_html=0 +html_edit=0 +from_virtualmin=1 +mail_usermin=mail +auto=1 +show_unread=0 +mail_file=Mailbox +sync_create=0 +mail_system=3 +ignore_users= spam_report= -html_quote=0 -fwd_mode=0 -maildir_deleted=0 +check_mod=1 top_buttons=2 +show_sent=0 +show_size_below=0 +mail_style=0 +column_count=4 +no_crlf=0 size_mode=1 -mail_usermin=mail +wrap_width=80 +fwd_mode=0 +show_size=1 +track_read=0 spam_buttons=mail mail_dir=Maildir -show_size_below=0 -noindex_hostname=0 -mailbox_user=.usermin/mailbox -ignore_users= -sort_mode=1 open_mode=0 -auto=1 -mail_system=3 +delete_warn=y no_mailer=0 -track_read=0 -from_virtualmin=1 -sig_file=* -show_unread=0 -html_edit=0 -sync_delete=1 -show_mail=0 -show_delall=0 -column_count=4 +max_records=200 perpage=20 -show_body=0 -sync_create=0 -log_read=0 -spam_del=0 +html_quote=0 no_orig_ip=0 -link_mode=0 -show_sent=0 -mail_file=Mailbox +sort_mode=1 +sync_perms=0700 +show_count=0 +spam_del=0 +arrows=1 +show_mail=0 +ignore_users_enabled=0 +sync_modify=1 +date_fmt=dmy +sig_file=* +show_delall=0 diff --git a/webmin/man/config b/webmin/man/config index 6dd7f6b60..c9cb98fd5 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man +search_cmd=man -k PAGE man2html_path=man2html -doc_dir=/usr/share/doc kernel_dir=/usr/src/linux/Documentation -man_cmd_sect=man SECTION PAGE -list_cmd_sect=man -w SECTION PAGE list_cmd=man -w PAGE +list_cmd_sect=man -w SECTION PAGE man_cmd=man PAGE -search_cmd=man -k PAGE +doc_dir=/usr/share/doc +man_cmd_sect=man SECTION PAGE diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index 0e310926d..41d5fb9e7 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.962 +server=MiniServ/1.970 diff --git a/webmin/mon/config b/webmin/mon/config index 70892829b..236bd96e3 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ +monshow=/usr/bin/monshow +mon_cgi=/var/www/cgi-bin/mon.cgi pid_file=/var/run/mon.pid +cfbasedir=/etc/mon start_cmd=/etc/init.d/mon start -mon_cgi=/var/www/cgi-bin/mon.cgi restart_cmd=/etc/init.d/mon restart -monshow=/usr/bin/monshow -cfbasedir=/etc/mon stop_cmd=/etc/init.d/mon stop diff --git a/webmin/mount/config b/webmin/mount/config index 571b334e9..f8a41a882 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -sort_mode=2 +long_fstypes=1 autofs_file=/etc/auto.master -sysinfo=1 nfs_check=1 -smbclient_path=smbclient +sysinfo=1 auto_file=/etc/am-utils/amd.conf -fstab_file=/etc/fstab -long_fstypes=1 show_used=1 nmblookup_path=nmblookup +smbclient_path=smbclient +fstab_file=/etc/fstab +sort_mode=2 diff --git a/webmin/mysql/config b/webmin/mysql/config index 006f4f235..c99062d3c 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ +date_subs=0 +mysqladmin=/usr/bin/mysqladmin +mysqlshow=/usr/bin/mysqlshow +max_text=1000 +mysql_data=/var/lib/mysql +max_dbs=50 +access=*: * +add_mode=1 +mysql_libs=/usr/local/mysql/lib my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -mysqldump=/usr/bin/mysqldump -webmin_subs=0 -login=root +mysqlimport=/usr/bin/mysqlimport +style=0 mysql=/usr/bin/mysql -nopwd=0 passwd_mode=0 -mysqlimport=/usr/bin/mysqlimport +nodbi=0 start_cmd=service mysql start +login=root blob_mode=0 -access=*: * -nodbi=0 -perpage=25 -mysql_libs=/usr/local/mysql/lib +nopwd=0 stop_cmd=service mysql stop -mysqladmin=/usr/bin/mysqladmin -max_dbs=50 -mysql_data=/var/lib/mysql -mysqlshow=/usr/bin/mysqlshow -style=0 -date_subs=0 -add_mode=1 -max_text=1000 +webmin_subs=0 +mysqldump=/usr/bin/mysqldump +perpage=25 diff --git a/webmin/net/config b/webmin/net/config index 56c61c18e..04c0295d5 100644 --- a/webmin/net/config +++ b/webmin/net/config @@ -1,2 +1,2 @@ -hosts_file=/etc/hosts def_netmask=255.255.255.0 +hosts_file=/etc/hosts diff --git a/webmin/nis/config b/webmin/nis/config index 0d2c7e07b..27c816482 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ +max_size=100 client_conf=/etc/yp.conf -manual_build=0 securenets=/etc/ypserv.securenets nsswitch_conf=/etc/nsswitch.conf -max_size=100 +manual_build=0 diff --git a/webmin/openslp/config b/webmin/openslp/config index 1931cebef..ceff8f2f3 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd_reg=/etc/slp.reg -slpd_pid=/var/run/slpd.pid slpd_conf=/etc/slp.conf -slpd=/usr/sbin/slpd +slpd_reg=/etc/slp.reg slpd_log=/var/log/slpd.log +slpd=/usr/sbin/slpd +slpd_pid=/var/run/slpd.pid diff --git a/webmin/pam/config b/webmin/pam/config index 4287bf606..bfa27bec4 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ -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 pam_dir=/etc/pam.d +mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so ignore=README +lib_dirs=/lib/security /lib/*/security diff --git a/webmin/pap/config b/webmin/pap/config index e229aa32f..c71336d9d 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -pppd=pppd -encrypt_pass=0 login_config=/etc/mgetty+sendfax/login.config +encrypt_pass=0 ppp_options=/etc/ppp/options +pap_file=/etc/ppp/pap-secrets mgetty=mgetty -serials=/dev/ttyS[0-9]* dialin_config=/etc/mgetty+sendfax/dialin.config -pap_file=/etc/ppp/pap-secrets +serials=/dev/ttyS[0-9]* +pppd=pppd diff --git a/webmin/passwd/config b/webmin/passwd/config index 04110de95..02cf5b24f 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -max_users=200 -input_type=0 sort_mode=0 +input_type=0 +max_users=200 diff --git a/webmin/postfix/config b/webmin/postfix/config index 69b40f13b..3ccd64ca8 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ index_check=1 +show_cmts=0 +columns=2 +delete_warn=1 +delete_confirm=1 +max_maps=100 +postcat_cmd=/usr/sbin/postcat +postfix_lookup_table_command=/usr/sbin/postmap +mailq_dir=/var/spool/postfix +check_config=1 +fwd_mode=0 wrap_width=80 +mailq_sort=0 +mailq_cmd=postqueue -p postfix_super_command=/usr/sbin/postsuper -mailq_dir=/var/spool/postfix -ldap_doms=0 -postfix_newaliases_command=/usr/bin/newaliases -max_records=200 +postfix_control_command=/usr/sbin/postfix postfix_master=/etc/postfix/master.cf -postfix_config_file=/etc/postfix/main.cf -mailq_cmd=postqueue -p -sort_mode=0 -postfix_lookup_table_command=/usr/sbin/postmap -delete_warn=1 -delete_confirm=1 -postfix_config_command=/usr/sbin/postconf prefix_cmts=0 +postfix_newaliases_command=/usr/bin/newaliases +postfix_config_command=/usr/sbin/postconf +ldap_doms=0 postfix_aliases_table_command=/usr/sbin/postalias -postcat_cmd=/usr/sbin/postcat mailq_count=0 -postfix_control_command=/usr/sbin/postfix -max_maps=100 -show_cmts=0 -fwd_mode=0 +top_buttons=1 +postfix_config_file=/etc/postfix/main.cf perpage=20 -columns=2 +max_records=200 +sort_mode=0 postfix_queue_command=postqueue -check_config=1 -top_buttons=1 -mailq_sort=0 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 1ea5f3d6d..ccf813b00 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ +max_text=1000 +dump_cmd=/usr/bin/pg_dump +date_subs=0 hba_conf=/etc/postgresql/*/main/pg_hba.conf -webmin_subs=0 -sameunix=1 -simple_sched=0 plib= +add_mode=1 +access=*: * max_dbs=50 -pid_file=/var/run/postmaster.pid -dump_cmd=/usr/bin/pg_dump +blob_mode=0 +login=postgres +nodbi=0 rstr_cmd=/usr/bin/pg_restore +start_cmd=/etc/init.d/postgresql* start +access_own=0 style=0 -login=postgres pass= perpage=25 -access=*: * +basedb=template1 +webmin_subs=0 psql=/usr/bin/psql -nodbi=0 -start_cmd=/etc/init.d/postgresql* start -access_own=0 -blob_mode=0 +sameunix=1 +pid_file=/var/run/postmaster.pid stop_cmd=/etc/init.d/postgresql* stop -max_text=1000 -add_mode=1 -date_subs=0 -basedb=template1 +simple_sched=0 diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index e0a3e10a8..7af13e89f 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ file=/etc/wvdial.conf -wvdialconf=wvdialconf wvdial=wvdial +wvdialconf=wvdialconf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 79cca84a4..24a51544b 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -peers_dir=/etc/ppp/peers -pap_file=/etc/ppp/chap-secrets -pptp_options=/etc/ppp/options.pptp timeout=30 pptp=pptp +pap_file=/etc/ppp/chap-secrets +peers_dir=/etc/ppp/peers +pptp_options=/etc/ppp/options.pptp diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index d2920c69a..927f24917 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ start_cmd=/etc/init.d/pptpd start -pptp_ppp_options=/etc/ppp/pptpd-options -pap_file=/etc/ppp/chap-secrets -pid_file=/var/run/pptpd.pid log_file=/var/log/messages +pap_file=/etc/ppp/chap-secrets +ppp_options=/etc/ppp/options +stop_cmd=/etc/init.d/pptpd stop file=/etc/pptpd.conf pptpd=pptpd -stop_cmd=/etc/init.d/pptpd stop -ppp_options=/etc/ppp/options +pid_file=/var/run/pptpd.pid +pptp_ppp_options=/etc/ppp/pptpd-options diff --git a/webmin/proc/config b/webmin/proc/config index c51d66e9e..44bdddc57 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -default_mode=last -trace_java=0 -hide_self=1 ps_style=linux -base_ppid=1 cut_length=80 +base_ppid=1 +trace_java=0 +default_mode=last +hide_self=1 diff --git a/webmin/procmail/config b/webmin/procmail/config index d5df94749..ff60bb0d1 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -includes=0 procmailrc=/etc/procmailrc procmail=procmail +includes=0 diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 3b2dfa6d1..bfd0b30c6 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -test_config=1 -test_always=0 -ftpusers=/etc/ftpusers stop_cmd=/etc/init.d/proftpd stop -proftpd_path=/usr/sbin/proftpd +test_config=1 pid_file=/var/run/proftpd.pid -test_manual=0 proftpd_conf=/etc/proftpd/proftpd.conf +proftpd_path=/usr/sbin/proftpd +test_manual=0 +ftpusers=/etc/ftpusers +test_always=0 start_cmd=/etc/init.d/proftpd start diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 9d708d7d1..bc7236b58 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -max_records=200 -mail_dir_qmail=Maildir mail_file=Mailbox -mailq_count=0 +delete_warn=1 mailq_sort=0 +columns=2 +mail_system=1 +fwd_mode=0 qmail_dir=/var/qmail +sort_mode=0 index_min=1000000 -mail_system=1 -columns=2 -delete_warn=1 +max_records=200 perpage=20 -sort_mode=0 -fwd_mode=0 mail_dir= +mailq_count=0 +mail_dir_qmail=Maildir diff --git a/webmin/quota/config b/webmin/quota/config index 21ca380b0..7f6dbfc1e 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ +user_edquota_command=edquota -u +group_repquota_command=repquota -g -v 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_repquota_command=repquota -u -v -group_setquota_command=setquota -g -block_size=1024 -display_max=100 -group_copy_command=edquota -g -p -sort_mode=0 -hide_uids=0 user_copy_command=edquota -u -p -group_quota_command=quota -v -g -block_mode=1 -user_edquota_command=edquota -u -quotacheck_command=quotacheck -u -g +user_setquota_command=setquota -u +display_max=100 pc_show=1 +quotacheck_command=quotacheck -u -g +user_quotaoff_command=quotaoff -u +group_grace_command=edquota -g -t +user_grace_command=edquota -u -t +group_quotaon_command=quotaon -g +group_quota_command=quota -v -g group_edquota_command=edquota -g +group_setquota_command=setquota -g +hide_uids=0 +show_grace=1 +user_repquota_command=repquota -u -v user_quota_command=quota -v -u +block_mode=1 user_quotaon_command=quotaon -u -show_grace=1 -group_quotaon_command=quotaon -g -user_grace_command=edquota -u -t -group_repquota_command=repquota -g -v +sort_mode=0 +group_copy_command=edquota -g -p +block_size=1024 group_quotaoff_command=quotaoff -g -user_quotaoff_command=quotaoff -u -user_setquota_command=setquota -u -group_grace_command=edquota -g -t diff --git a/webmin/raid/config b/webmin/raid/config index 3314566d0..4bd2da90e 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ +mdstat=/proc/mdstat raidtab=/etc/raidtab mdadm=/etc/mdadm/mdadm.conf -mdstat=/proc/mdstat diff --git a/webmin/samba/config b/webmin/samba/config index 23e778f6c..8894532e1 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -sort_mode=0 +smb_passwd=/etc/samba/smbpasswd +smbgroupedit=/usr/bin/smbgroupedit text_lists=0 -samba_status_program=/usr/bin/smbstatus -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' start_cmd=service smbd start ; service nmbd start +restart_cmd=service smbd restart ; service nmbd restart pdbedit=/usr/bin/pdbedit -smbgroupedit=/usr/bin/smbgroupedit swat=/usr/sbin/swat -smb_passwd=/etc/samba/smbpasswd run_from_inetd=0 -net=/usr/bin/net samba_password_program=/usr/bin/smbpasswd -samba_server=/usr/sbin/smbd -name_server=/usr/sbin/nmbd -restart_cmd=service smbd restart ; service nmbd restart +sort_mode=0 +samba_status_program=/usr/bin/smbstatus +dont_convert=-499 smb_conf=/etc/samba/smb.conf +name_server=/usr/sbin/nmbd +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +samba_server=/usr/sbin/smbd stop_cmd=service smbd stop ; service nmbd stop -dont_convert=-499 +net=/usr/bin/net diff --git a/webmin/sarg/config b/webmin/sarg/config index 75406f229..0b89616c5 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ naked=0 clear=1 -sarg=sarg sarg_conf=/etc/sarg/sarg.conf +sarg=sarg diff --git a/webmin/sendmail/config b/webmin/sendmail/config index df977e0da..b8ac25d44 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -perpage=20 +sendmail_features=/usr/share/sendmail/cf +mail_file=mbox +delete_confirm=1 +delete_warn=1 +order_mail=0 columns=2 +smrsh_dir=/etc/smrsh show_cmts=0 +index_min=1000000 +wrap_width=80 fwd_mode=0 +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +mail_dir=/var/spool/mail +track_read=0 +show_to=0 +sendmail_mc=/etc/mail/sendmail.mc sendmail_cf=/etc/mail/sendmail.cf -top_buttons=1 -mailq_sort=0 -sendmail_command=/usr/lib/sendmail -bd -q1h -index_min=1000000 -mail_file=mbox -smrsh_dir=/etc/smrsh -mailq_count=0 prefix_cmts=0 -sendmail_features=/usr/share/sendmail/cf +mailq_sort=0 mailq_show=Date,From,To,Size,Status -show_to=0 +sendmail_command=/usr/lib/sendmail -bd -q1h sort_mode=0 -delete_warn=1 -mail_dir=/var/spool/mail -track_read=0 -mail_type=0 -delete_confirm=1 -sendmail_path=/usr/lib/sendmail -wrap_width=80 max_records=200 -order_mail=0 -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -makemap_path=makemap +perpage=20 mail_style=0 -sendmail_mc=/etc/mail/sendmail.mc +sendmail_path=/usr/lib/sendmail +top_buttons=1 +mailq_count=0 +mail_type=0 +makemap_path=makemap diff --git a/webmin/servers/config b/webmin/servers/config index 48cb3c64b..610a8a8da 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -deffast=2 scan_time=5 -deflink=0 -display_mode=0 -show_ip=0 -show_status=1 -sort_mode=0 max_servers=100 -capath=/usr/share/ca-certificates +show_status=1 +deffast=2 groups_dir=/etc/cluster/groups +show_ip=0 resolve=1 +sort_mode=0 +capath=/usr/share/ca-certificates +display_mode=0 +deflink=0 diff --git a/webmin/shell/config b/webmin/shell/config index 044e158ce..42aceaa41 100644 --- a/webmin/shell/config +++ b/webmin/shell/config @@ -1,3 +1,3 @@ clear_envs=0 -max_output=100000 max_runtime=86400 +max_output=100000 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 7e55b32a1..5980d830f 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ +actions=/etc/shorewall/actions /usr/share/shorewall/actions.std +config_dir=/etc/shorewall macros=/usr/share/shorewall -shorewall=shorewall display_zone_descriptions=1 -config_dir=/etc/shorewall -actions=/etc/shorewall/actions /usr/share/shorewall/actions.std +shorewall=shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index 4cc447b64..f253e44a0 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ -config_dir=/etc/shorewall6 display_zone_descriptions=1 -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -shorewall6=shorewall6 macros=/usr/share/shorewall6 +config_dir=/etc/shorewall6 +shorewall6=shorewall6 +actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std diff --git a/webmin/smart-status/config b/webmin/smart-status/config index fadfec290..f4c63c585 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ -smartctl=smartctl ata=0 -attribs=1 +smartctl=smartctl mode=1 +attribs=1 diff --git a/webmin/software/config b/webmin/software/config index 9476e6757..facec37dd 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ +package_system=debian apt_mode=0 update_system=apt -package_system=debian diff --git a/webmin/spam/config b/webmin/spam/config index 9b0981d85..42d68db22 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -addto=0 -procmailrc=/etc/procmailrc -spamassassin=spamassassin sa_learn=sa-learn -local_cf=/etc/spamassassin/local.cf +call_spam=1 +addto=0 processes=spamd amavisd warn_procmail=1 -mode=0 -restart_cmd=/etc/init.d/spamassassin restart -call_spam=1 procmail_cmd=* +restart_cmd=/etc/init.d/spamassassin restart +procmailrc=/etc/procmailrc +mode=0 +local_cf=/etc/spamassassin/local.cf max_awl=200 +spamassassin=spamassassin diff --git a/webmin/squid/config b/webmin/squid/config index 82ef0317a..2121d422c 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -sync_create=0 -squid_stop=service squid stop -squidclient=squidclient -squid_restart=service squid reload -squid_start=service squid start +cal_all=1 cal_args=-aw +log_dir=/var/log/squid +restart_pos=0 +sync_create=0 calamaris=calamaris -sort_conf=0 -sync_modify=1 cache_dir=/var/spool/squid -squid_conf=/etc/squid/squid.conf -crypt_conf=0 -restart_pos=0 +squidclient=squidclient cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi -cal_all=1 -cal_fmt=w +sync_modify=1 +squid_stop=service squid stop +pid_file=/var/run/squid.pid +sync_delete=0 +squid_conf=/etc/squid/squid.conf squid_path=squid +crypt_conf=0 cal_max=50000 -sync_delete=0 -log_dir=/var/log/squid -pid_file=/var/run/squid.pid +sort_conf=0 +cal_fmt=w +squid_start=service squid start +squid_restart=service squid reload diff --git a/webmin/sshd/config b/webmin/sshd/config index 734a08d35..4383c82cc 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -sshd_config=/etc/ssh/sshd_config -keygen_path=/usr/bin/ssh-keygen -sync_gnupg=0 sync_pass=0 -sync_create=0 -start_cmd=service ssh start +keygen_path=/usr/bin/ssh-keygen +client_config=/etc/ssh/ssh_config sshd_path=/usr/sbin/sshd stop_cmd=service ssh stop -client_config=/etc/ssh/ssh_config -sync_auth=1 pid_file=/var/run/sshd.pid +start_cmd=service ssh start +sshd_config=/etc/ssh/sshd_config +sync_gnupg=0 +sync_create=0 +sync_auth=1 diff --git a/webmin/status/config b/webmin/status/config index 5cae5e7c5..62f8adbd5 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ -subject_mode=0 -sysinfo=0 -output=0 index_status=1 sort_mode=0 -columns=2 +sysinfo_users=0 +history_show=50 sched_offset=0 history_purge=30 -snmp_version=2 -pager_cmd=sms_client +subject_mode=0 +output=0 +sysinfo=0 snmp_trap=1.3.6.1.4.1.10000.1.1 -sysinfo_users=0 -history_show=50 +pager_cmd=sms_client +columns=2 +snmp_version=2 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index 8cc42e4e2..d2eeada17 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -syslogng_cmd=syslog-ng compressed=1 -pid_file=/var/run/syslog-ng.pid +syslogng_cmd=syslog-ng syslogng_conf=/etc/syslog-ng/syslog-ng.conf +pid_file=/var/run/syslog-ng.pid 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 02825981f..15606bfc3 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -compressed=1 -pid_file=/var/run/rsyslogd.pid -lines=20 -m4_conf=0 -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -others=1 -m4_path= -socket=0 -restart_cmd=/usr/sbin/service rsyslog restart -pri_all=1 -pri_dir=1 syslog_conf=/etc/rsyslog.conf -syslogd=/usr/sbin/rsyslogd -reverse=0 +sync=1 +pipe=1 signal_cmd=/usr/sbin/service rsyslog restart tags=0 +others=1 +restart_cmd=/usr/sbin/service rsyslog restart +syslogd=/usr/sbin/rsyslogd start_cmd=/usr/sbin/service rsyslog start -pipe=1 -sync=1 +socket=0 +m4_path= +compressed=1 +m4_conf=0 +lines=20 +reverse=0 +pid_file=/var/run/rsyslogd.pid +pri_dir=1 +pri_all=1 +facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config index ddc301405..10eceba4d 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ +hosts_deny=/etc/hosts.deny hosts_allow=/etc/hosts.allow inetd_services=0 -hosts_deny=/etc/hosts.deny diff --git a/webmin/telnet/config b/webmin/telnet/config index ba8e81dd5..a9d4fc375 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ +proxy=0 +sizemode=0 no_test=0 detach=0 mode=1 -sizemode=0 -proxy=0 diff --git a/webmin/time/config b/webmin/time/config index b92e28f8b..ba693e15b 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ +lease=5 ntp_only=1 +timeserver=0.pool.ntp.org zone_style=linux -lease=5 timeserver_hardware=1 seconds=1 -timeserver=0.pool.ntp.org diff --git a/webmin/updown/config b/webmin/updown/config index 6153634f5..2d7e2b876 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ user=root -dir=/ -duser=root ddir=/ +duser=root +dir=/ diff --git a/webmin/useradmin/config b/webmin/useradmin/config index e472cb397..347639dd4 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -alias_check=0 -md5=1 -last_show=0 -email_type=0 -uid_calc=0 -selinux_con=user_u:object_r:user_home_dir_t -home_style=0 default_group=users -base_uid=1000 -secmode=0 -new_user_gid=0 -from_files=0 -membox=0 -shells=fixed,passwd,shells -empty_mode=0 -gid_calc=0 +passwd_dict=0 homedir_perms=0755 -base_gid=1000 -gshadow_file=/etc/gshadow -group_file=/etc/group -shadow_file=/etc/shadow -passwd_stars=0 -passwd_file=/etc/passwd -random_password=0 +home_base=/home sort_mode=0 +membox=0 +delete_only=0 +selinux_con=user_u:object_r:user_home_dir_t +base_gid=1000 +home_style=0 +passwd_same=0 +uid_calc=0 +alias_check=0 user_files=/etc/skel -extra_real=0 -skip_md5=0 -home_base=/home uid_mode=1 +skip_md5=0 +base_uid=1000 +gshadow_file=/etc/gshadow +lock_string=* +gid_calc=0 +md5=1 +shadow_file=/etc/shadow display_max=400 -delete_only=0 +passwd_file=/etc/passwd display_mode=1 -new_user_group=0 -passwd_progmode=0 -passwd_dict=0 -lock_string=* +empty_mode=0 gid_mode=1 +passwd_progmode=0 +group_file=/etc/group delete_root=0 +new_user_group=0 default_other=1 -passwd_same=0 +random_password=0 +passwd_stars=0 +new_user_gid=0 +last_show=0 +secmode=0 +from_files=0 +shells=fixed,passwd,shells +email_type=0 +extra_real=0 diff --git a/webmin/usermin/config b/webmin/usermin/config index 77ceaf16c..e4c583b96 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -uphour=4 -upmissing=0 update=0 +upshow=1 +uphour=4 +cron_mode=0 updays=1 +upmissing=0 usermin_dir=/etc/usermin -cron_mode=0 -upshow=1 diff --git a/webmin/version b/webmin/version index e33e37d10..84ad446c9 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.962 +1.970 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 15bb757e4..047829112 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -naked=0 -webalizer_conf=/etc/webalizer/webalizer.conf -skip_old=0 alt_conf=/etc/webalizer/webalizer.conf.sample webalizer=/usr/bin/webalizer +skip_old=0 auto=apache,squid,proftpd,wuftpd +webalizer_conf=/etc/webalizer/webalizer.conf +naked=0 diff --git a/webmin/webmin/config b/webmin/webmin/config index ef7f6f6cb..7de4b9733 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ -osdn=1 -warn_days=7 -last_version_check=1549050668 +update=0 +uphour=23 +cron_mode=0 +upmins=47 +upmissing=0 letsencrypt_dns_wait=10 last_version_number=1.900 upshow=1 -cron_mode=0 -uphour=23 -upmins=47 +last_version_check=1549050668 updays=1 -upmissing=0 -update=0 +warn_days=7 +osdn=1 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index 2008166db..f89453ddb 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftphosts=/etc/wu-ftpd/ftphosts +ftpusers=/etc/wu-ftpd/ftpusers +ftpgroups=/etc/wu-ftpd/ftpgroups ftpconversions=/etc/wu-ftpd/ftpconversions -pid_file=/var/run/ftpd.pids-all +ftphosts=/etc/wu-ftpd/ftphosts ftpd_path=/usr/sbin/wu-ftpd -ftpusers=/etc/wu-ftpd/ftpusers log_file=/var/log/xferlog -ftpgroups=/etc/wu-ftpd/ftpgroups ftpaccess=/etc/wu-ftpd/ftpaccess +pid_file=/var/run/ftpd.pids-all diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 709f2b49e..14054cfe7 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -pid_file=/var/run/xinetd.pid -xinetd_conf=/etc/xinetd.conf -lookup_servs=1 start_cmd=/etc/init.d/xinetd start protocols_file=/etc/protocols +lookup_servs=1 +pid_file=/var/run/xinetd.pid +xinetd_conf=/etc/xinetd.conf -- 2.43.0