From 61d0040be96afbd77be5c5d100aed6ddd42b3b90 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Sun, 2 Aug 2020 09:26:55 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -code-brand 4.2-26 all -collaboraoffice6.2 6.2.10.20-20 amd64 -collaboraoffice6.2-ure 6.2.10.20-20 amd64 +code-brand 4.2-27 all +collaboraoffice6.2 6.2.10.21-21 amd64 +collaboraoffice6.2-ure 6.2.10.21-21 amd64 -collaboraofficebasis6.2-calc 6.2.10.20-20 amd64 -collaboraofficebasis6.2-core 6.2.10.20-20 amd64 -collaboraofficebasis6.2-draw 6.2.10.20-20 amd64 -collaboraofficebasis6.2-en-us 6.2.10.20-20 amd64 -collaboraofficebasis6.2-extension-pdf-import 6.2.10.20-20 amd64 -collaboraofficebasis6.2-graphicfilter 6.2.10.20-20 amd64 -collaboraofficebasis6.2-images 6.2.10.20-20 amd64 -collaboraofficebasis6.2-impress 6.2.10.20-20 amd64 -collaboraofficebasis6.2-ooofonts 6.2.10.20-20 amd64 -collaboraofficebasis6.2-ooolinguistic 6.2.10.20-20 amd64 -collaboraofficebasis6.2-writer 6.2.10.20-20 amd64 +collaboraofficebasis6.2-calc 6.2.10.21-21 amd64 +collaboraofficebasis6.2-core 6.2.10.21-21 amd64 +collaboraofficebasis6.2-draw 6.2.10.21-21 amd64 +collaboraofficebasis6.2-en-us 6.2.10.21-21 amd64 +collaboraofficebasis6.2-extension-pdf-import 6.2.10.21-21 amd64 +collaboraofficebasis6.2-graphicfilter 6.2.10.21-21 amd64 +collaboraofficebasis6.2-images 6.2.10.21-21 amd64 +collaboraofficebasis6.2-impress 6.2.10.21-21 amd64 +collaboraofficebasis6.2-ooofonts 6.2.10.21-21 amd64 +collaboraofficebasis6.2-ooolinguistic 6.2.10.21-21 amd64 +collaboraofficebasis6.2-writer 6.2.10.21-21 amd64 -grub-common 2.04-1ubuntu26 amd64 +grub-common 2.04-1ubuntu26.2 amd64 -grub-pc 2.04-1ubuntu26 amd64 -grub-pc-bin 2.04-1ubuntu26 amd64 -grub2-common 2.04-1ubuntu26 amd64 +grub-pc 2.04-1ubuntu26.2 amd64 +grub-pc-bin 2.04-1ubuntu26.2 amd64 +grub2-common 2.04-1ubuntu26.2 amd64 -loolwsd 4.2.5-6 amd64 +loolwsd 4.2.6-2 amd64 -webmin 1.953 all +webmin 1.954 all --- apt/apt.conf.d/25loolwsd | 2 +- webmin/acl/config | 2 +- webmin/adsl-client/config | 6 +-- webmin/ajaxterm/config | 2 +- webmin/apache/config | 36 +++++++-------- webmin/apache/httpd-info | 2 +- webmin/at/config | 2 +- webmin/backup-config/config | 2 +- webmin/bacula-backup/config | 14 +++--- webmin/bandwidth/config | 2 +- webmin/bind8/config | 72 ++++++++++++++--------------- webmin/cluster-passwd/config | 2 +- webmin/cluster-software/config | 2 +- webmin/cluster-useradmin/config | 8 ++-- webmin/cluster-usermin/config | 2 +- webmin/config | 50 ++++++++++---------- webmin/cpan/config | 8 ++-- webmin/cron/config | 34 +++++++------- webmin/custom/config | 2 +- webmin/dhcpd/config | 20 ++++---- webmin/dovecot/config | 4 +- webmin/exim/config | 6 +-- webmin/fail2ban/config | 4 +- webmin/fetchmail/config | 8 ++-- webmin/filter/config | 6 +-- webmin/firewall/config | 6 +-- webmin/firewall6/config | 4 +- webmin/firewalld/config | 2 +- webmin/fsdump/config | 6 +-- webmin/grub/config | 2 +- webmin/heartbeat/config | 20 ++++---- webmin/htaccess-htpasswd/config | 8 ++-- webmin/idmapd/config | 2 +- webmin/inetd/config | 20 ++++---- webmin/init/config | 22 ++++----- webmin/ipfilter/config | 10 ++-- webmin/ipfw/config | 4 +- webmin/ipsec/config | 8 ++-- webmin/iscsi-client/config | 6 +-- webmin/iscsi-server/config | 6 +-- webmin/iscsi-target/config | 6 +-- webmin/iscsi-tgtd/config | 4 +- webmin/jabber/config | 2 +- webmin/ldap-client/config | 2 +- webmin/ldap-server/config | 12 ++--- webmin/ldap-useradmin/config | 34 +++++++------- webmin/logrotate/config | 4 +- webmin/lpadmin/config | 20 ++++---- webmin/mailboxes/config | 82 ++++++++++++++++----------------- webmin/man/config | 10 ++-- webmin/miniserv.conf | 2 +- webmin/mon/config | 8 ++-- webmin/mount/config | 12 ++--- webmin/mysql/config | 30 ++++++------ webmin/mysql/version | 2 +- webmin/nis/config | 4 +- webmin/openslp/config | 6 +-- webmin/package-updates/config | 2 +- webmin/pam/config | 4 +- webmin/pap/config | 8 ++-- webmin/postfix/config | 38 +++++++-------- webmin/postgresql/config | 32 ++++++------- webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 6 +-- webmin/proc/config | 4 +- webmin/procmail/config | 2 +- webmin/proftpd/config | 10 ++-- webmin/qmailadmin/config | 16 +++---- webmin/quota/config | 34 +++++++------- webmin/samba/config | 26 +++++------ webmin/sarg/config | 4 +- webmin/sendmail/config | 46 +++++++++--------- webmin/servers/config | 12 ++--- webmin/shell/config | 2 +- webmin/shorewall/config | 4 +- webmin/smart-status/config | 4 +- webmin/software/config | 4 +- webmin/spam/config | 16 +++---- webmin/squid/config | 26 +++++------ webmin/sshd/config | 12 ++--- webmin/status/config | 18 ++++---- webmin/stop | 3 +- webmin/syslog-ng/config | 8 ++-- webmin/syslog/config | 26 +++++------ webmin/system-status/config | 2 +- webmin/telnet/config | 4 +- webmin/time/config | 4 +- webmin/updown/config | 2 +- webmin/useradmin/config | 60 ++++++++++++------------ webmin/usermin/config | 8 ++-- webmin/version | 2 +- webmin/webalizer/config | 8 ++-- webmin/webmin/config | 16 +++---- webmin/wuftpd/config | 6 +-- webmin/xinetd/config | 4 +- 96 files changed, 577 insertions(+), 576 deletions(-) diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd index c8e80e38b..d17ef9bb7 100644 --- a/apt/apt.conf.d/25loolwsd +++ b/apt/apt.conf.d/25loolwsd @@ -1,2 +1,2 @@ // Rebuild systemplate of Collabora Online Development Edition -DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.2 >/dev/null 2>&1'"; }; +DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.2 >/dev/null 2>&1"; }; diff --git a/webmin/acl/config b/webmin/acl/config index 9c0a53994..ad7d02089 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ +ssleay=/usr/bin/openssl display=1 order=0 -ssleay=/usr/bin/openssl diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index fb5a3d2b0..0c4c7062b 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ +start_cmd=adsl-start +status_cmd=adsl-status pppoe_conf=/etc/ppp/pppoe.conf -stop_cmd=adsl-stop pap_file=/etc/ppp/pap-secrets pppoe_cmd=pppoe +stop_cmd=adsl-stop conf_style=0 -status_cmd=adsl-status -start_cmd=adsl-start 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 367b72335..bd73e19b8 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -show_names=0 -stop_cmd=/etc/init.d/apache2 stop -max_servers=100 -apply_cmd=/usr/sbin/apache2ctl graceful -start_cmd=/etc/init.d/apache2 start -httpd_dir=/etc/apache2 -test_manual=0 -apachectl_path=/usr/sbin/apache2ctl -defines_name=APACHE_ARGUMENTS -virt_file=/etc/apache2/sites-available -srm_conf=/etc/apache2/srm.conf -test_always=0 -test_config=1 +link_dir=/etc/apache2/sites-enabled mime_types=/etc/apache2/mime.types +test_always=0 httpd_conf=/etc/apache2/apache2.conf -auto_mods=1 -link_dir=/etc/apache2/sites-enabled +test_manual=0 +allow_virtualmin=0 +max_servers=100 +test_config=1 +access_conf=/etc/apache2/access.conf defines_file=/etc/apache2/envvars show_list=0 +srm_conf=/etc/apache2/srm.conf +stop_cmd=/etc/init.d/apache2 stop +show_order=0 +auto_mods=1 +apply_cmd=/usr/sbin/apache2ctl graceful +httpd_dir=/etc/apache2 test_apachectl=1 +virt_file=/etc/apache2/sites-available +apachectl_path=/usr/sbin/apache2ctl +start_cmd=/etc/init.d/apache2 start +defines_name=APACHE_ARGUMENTS +show_names=0 httpd_path=/usr/sbin/apache2 -allow_virtualmin=0 -access_conf=/etc/apache2/access.conf -show_order=0 diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index 22ee1292c..6f24290e2 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,4 +1,4 @@ -time=1587659920 +time=1587659947 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd version=2.443 diff --git a/webmin/at/config b/webmin/at/config index 6f83c111c..abf2f6455 100644 --- a/webmin/at/config +++ b/webmin/at/config @@ -1,2 +1,2 @@ -at_style=linux at_dir=/var/spool/cron/atjobs +at_style=linux diff --git a/webmin/backup-config/config b/webmin/backup-config/config index 42c8775c3..c13b50ad6 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -apply=1 webmin_subs=0 +apply=1 date_subs=0 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index a1f11a686..9aacce74f 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -pass= -btape=btape -bacula_dir=/etc/bacula bls=bls -driver=Pg +pass= db=bacula -user=bacula -apply=1 +wait=1 bextract=bextract init_start=0 -wait=1 +bacula_dir=/etc/bacula +driver=Pg showdirs=0 +btape=btape +user=bacula +apply=1 diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config index db38d7751..da72c415d 100644 --- a/webmin/bandwidth/config +++ b/webmin/bandwidth/config @@ -1,2 +1,2 @@ -firewall_system=firewall bandwidth_log=/var/log/bandwidth +firewall_system=firewall diff --git a/webmin/bind8/config b/webmin/bind8/config index 66c4e59a5..bed082cf8 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,45 +1,45 @@ +updserial_def=0 +spf_record=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 -forwardzonefilename_format=ZONE.hosts -allow_underscore=1 -master_ttl=1 -max_zones=50 -no_pid_chroot=0 -rndc_conf=/etc/bind/rndc.conf -zones_file=/etc/bind/named.conf.local -records_order=0 -updserial_on=1 -named_path=/usr/sbin/named -slave_dir=/var/lib/bind +soa_start=0 other_slaves=1 -ndc_cmd=ndc rev_must=0 -soa_start=0 -allow_comments=0 -allow_wild=1 -reversezonefilename_format=ZONE.rev -rndc_cmd=rndc -updserial_man=1 -rndcconf_cmd=rndc-confgen -master_dir=/var/lib/bind -whois_cmd=whois -force_random=0 -largezones=0 -spf_record=0 -confirm_zone=1 -show_list=0 -support_aaaa=1 -ipv6_mode=1 -rev_def=0 -soa_style=0 -relative_paths=0 -no_chroot=0 -updserial_def=0 -named_conf=/etc/bind/named.conf +allow_underscore=1 checkconf=named-checkconf +named_conf=/etc/bind/named.conf +slave_dir=/var/lib/bind signzone=dnssec-signzone -confirm_rec=0 +ipv6_mode=1 +largezones=0 +records_order=0 +whois_cmd=whois +no_chroot=0 +show_list=0 +by_view=0 short_names=0 +max_zones=50 +rndcconf_cmd=rndc-confgen +soa_style=0 +rev_def=0 +rndc_cmd=rndc +allow_wild=1 +master_ttl=1 +master_dir=/var/lib/bind +named_path=/usr/sbin/named +reversezonefilename_format=ZONE.rev allow_long=0 -by_view=0 +forwardzonefilename_format=ZONE.hosts +ndc_cmd=ndc +support_aaaa=1 +zones_file=/etc/bind/named.conf.local +no_pid_chroot=0 +rndc_conf=/etc/bind/rndc.conf checkzone=named-checkzone +updserial_man=1 +updserial_on=1 +relative_paths=0 +confirm_rec=0 +force_random=0 +confirm_zone=1 +allow_comments=0 keygen=dnssec-keygen diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 75e5ffcde..04110de95 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ -input_type=0 max_users=200 +input_type=0 sort_mode=0 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 5a783be59..5ec81d4e2 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ conf_host_links=1 +conf_add_user=1 conf_allow_refresh=1 sort_mode=0 -table_mode=0 +conf_add_group=1 conf_find_group=1 -conf_allow_sync=1 +table_mode=0 conf_find_user=1 -conf_add_group=1 -conf_add_user=1 +conf_allow_sync=1 diff --git a/webmin/cluster-usermin/config b/webmin/cluster-usermin/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-usermin/config +++ b/webmin/cluster-usermin/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/config b/webmin/config index 52e66c84a..07125f9d8 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -passwd_pindex=1 -md5pass=1 -passwd_mindex=4 -webprefix= -dateformat=dd/mon/yyyy -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin real_os_type=Ubuntu Linux -nofeedbackcc=0 -passwd_file=/etc/shadow -tempdelete_days=7 -showhost=0 -os_version=9.0 -feedback_to= -real_os_version=18.04.1 -passwd_cindex=2 -showlogin=0 -theme=authentic-theme sysinfo=0 -hostnamemode=0 -log=1 +dateformat=dd/mon/yyyy +passwd_cindex=2 +help_width= +tempdelete_days=7 hostnamedisplay= -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -product=webmin -lang_root=de.UTF-8 lang=en.UTF-8 -help_width= -help_height= -ld_env=LD_LIBRARY_PATH +nofeedbackcc=0 os_type=debian-linux -passwd_uindex=0 +hostnamemode=0 by_view=0 +ld_env=LD_LIBRARY_PATH +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +passwd_file=/etc/shadow +passwd_pindex=1 +showlogin=0 referers_none=1 +passwd_mindex=4 +feedback_to= +passwd_uindex=0 +theme=authentic-theme +os_version=9.0 +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +showhost=0 +help_height= +webprefix= +md5pass=1 +log=1 +lang_root=de.UTF-8 +product=webmin +real_os_version=18.04.1 diff --git a/webmin/cpan/config b/webmin/cpan/config index bf491dfd8..f25633443 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -packages=http://www.cpan.org/modules/02packages.details.txt.gz -cpan=http://www.cpan.org/authors/id -refresh_days=30 +incyum=1 save_partial=0 +cpan=http://www.cpan.org/authors/id +packages=http://www.cpan.org/modules/02packages.details.txt.gz incpackages=1 -incyum=1 +refresh_days=30 diff --git a/webmin/cron/config b/webmin/cron/config index 6cdb1b6dc..447e463ab 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ -hourly_only=0 -cron_user_edit_command=crontab -e -kill_subs=0 +cron_dir=/var/spool/cron/crontabs +show_run=0 +cron_deny_all=2 +show_next=0 max_jobs=100 +cronfiles_dir=/etc/cron.d +show_comment=0 +system_crontab=/etc/crontab cron_deny_file=/var/spool/cron/deny -show_time=0 -match_mode=0 -show_next=0 +hourly_only=0 +max_len=80 +cron_allow_file=/var/spool/cron/allow cron_get_command=crontab -u USER -l +show_time=0 +match_user=1 +cron_user_edit_command=crontab -e run_parts=run-parts +match_mode=0 +cron_user_get_command=crontab -l vixie_cron=1 -show_comment=0 cron_user_delete_command=crontab -r -cron_delete_command=crontab -u USER -r -cronfiles_dir=/etc/cron.d -cron_allow_file=/var/spool/cron/allow -max_len=80 -cron_dir=/var/spool/cron/crontabs -cron_deny_all=2 -system_crontab=/etc/crontab -cron_user_get_command=crontab -l cron_edit_command=crontab -u USER -e -match_user=1 +kill_subs=0 cron_input=1 -show_run=0 +cron_delete_command=crontab -u USER -r diff --git a/webmin/custom/config b/webmin/custom/config index 752c31344..9d7bae50a 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -columns=2 display_mode=0 params_cmd=0 params_file=0 +columns=2 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index 7afa885de..803837531 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,16 +1,16 @@ -restart_cmd=service isc-dhcp-server restart group_name=0 -lease_sort=0 -pid_file=/var/run/dhcpd.pid -desc_name=0 +restart_cmd=service isc-dhcp-server restart +dhcpd_path=/usr/sbin/dhcpd +interfaces_type=debian show_ip=0 -stop_cmd=service isc-dhcp-server stop -dhcpd_nocols=5 +lease_tz=0 lease_file=/var/lib/dhcp/dhcpd.leases +desc_name=0 +stop_cmd=service isc-dhcp-server stop start_cmd=service isc-dhcp-server start display_max=100 -interfaces_type=debian -show_mac=0 -lease_tz=0 dhcpd_conf=/etc/dhcp/dhcpd.conf -dhcpd_path=/usr/sbin/dhcpd +pid_file=/var/run/dhcpd.pid +dhcpd_nocols=5 +lease_sort=0 +show_mac=0 diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 6b5015323..689a1ad8a 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ +init_script=dovecot +dovecot=/usr/sbin/dovecot pid_file=/var/run/dovecot/master.pid dovecot_config=/etc/dovecot/dovecot.conf -dovecot=/usr/sbin/dovecot -init_script=dovecot diff --git a/webmin/exim/config b/webmin/exim/config index d37d19e54..6fc541c17 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_addrfile=/etc/exim4/email-addresses mail_system=1 -exim_aliasfileext= exim_dir=/etc/exim4 -exim_virt_dir=/etc/exim4/aliases exim_dbmext=.dbm +exim_addrfile=/etc/exim4/email-addresses +exim_virt_dir=/etc/exim4/aliases +exim_aliasfileext= exim_mail_file=Maildir exim_dbmfile=/etc/exim4/local_domains diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index 73862c6ef..3733143b5 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ -server_cmd=/usr/bin/fail2ban-server -client_cmd=/usr/bin/fail2ban-client config_dir=/etc/fail2ban init_script=fail2ban +client_cmd=/usr/bin/fail2ban-client +server_cmd=/usr/bin/fail2ban-server diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index cb824e95e..29af4eb26 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ -pid_file=/var/run/fetchmail.pid -config_file= -daemon_user=root -view_mode=0 max_users=400 +view_mode=0 fetchmail_path=fetchmail +pid_file=/var/run/fetchmail.pid +daemon_user=root +config_file= diff --git a/webmin/filter/config b/webmin/filter/config index 23d7054fc..dedf35ce1 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ +reply_force=0 +warn_procmail=1 alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases +virtualmin_config=/etc/webmin/virtual-server virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl forward_procmail=0 -warn_procmail=1 -reply_force=0 -virtualmin_config=/etc/webmin/virtual-server diff --git a/webmin/firewall/config b/webmin/firewall/config index c861679b9..e2b36c045 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ force_init=0 -view_condition=1 +comment_mod=0 view_comment=0 -cluster_mode=1 +view_condition=1 direct=0 -comment_mod=0 +cluster_mode=1 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 41105d5fc..b9519db9e 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ direct=0 -view_comment=0 cluster_mode=1 +view_condition=1 comment_mod=0 +view_comment=0 force_init=0 -view_condition=1 diff --git a/webmin/firewalld/config b/webmin/firewalld/config index ff329a00d..0aae64fac 100644 --- a/webmin/firewalld/config +++ b/webmin/firewalld/config @@ -1,2 +1,2 @@ -firewall_cmd=firewall-cmd init_name=firewalld +firewall_cmd=firewall-cmd diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 35bfc3a10..e2569aa79 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -always_tar=0 -date_subs=0 error_email=0 -webmin_subs=0 nonewtape=0 simple_sched=0 +date_subs=0 +always_tar=0 +webmin_subs=0 run_mode=0 diff --git a/webmin/grub/config b/webmin/grub/config index f6464eb2a..e16a6b3dd 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ +menu_file=/boot/grub/menu.lst install=(hd0) grub_path=grub -menu_file=/boot/grub/menu.lst diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 65e1966a8..414ae3c79 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -pid_file=/var/run/heartbeat.pid -req_resource_cmd=/usr/lib/heartbeat/req_resource -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys -ha_dir=/etc/ha.d -authkeys= -alt_haresources=/usr/share/doc/packages/heartbeat/haresources -heartbeat=/usr/lib/heartbeat/heartbeat -apply_cmd=/etc/init.d/heartbeat reload -haresources= start_cmd=/etc/init.d/heartbeat start alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +authkeys= +ha_cf= +alt_haresources=/usr/share/doc/packages/heartbeat/haresources stop_cmd=/etc/init.d/heartbeat stop resource_d= -ha_cf= +heartbeat=/usr/lib/heartbeat/heartbeat +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +haresources= +apply_cmd=/etc/init.d/heartbeat reload serials=/dev/ttyS* +pid_file=/var/run/heartbeat.pid +req_resource_cmd=/usr/lib/heartbeat/req_resource +ha_dir=/etc/ha.d diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index 70c3a9c13..6513eb92c 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -md5=1 -htaccess=.htaccess -extra_directives= -htgroups=.htgroups sha1=0 digest=1 htpasswd=.htpasswd +htaccess=.htaccess +htgroups=.htgroups +extra_directives= sort=0 +md5=1 diff --git a/webmin/idmapd/config b/webmin/idmapd/config index 12c48476c..f32798d4d 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ -restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi idmapd_path=/usr/sbin/rpc.idmapd idmapd_conf=/etc/idmapd.conf +restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi diff --git a/webmin/inetd/config b/webmin/inetd/config index d42d79d51..ae17754eb 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -inetd_conf_file=/etc/inetd.conf -tcpd_path=/usr/sbin/tcpd +restart_command=killall -HUP inetd rpc_inetd=1 +rpc_file=/etc/rpc +show_empty=1 services_file=/etc/services -extended_inetd=1 +tcpd_path=/usr/sbin/tcpd +ipv6=0 +display_max=100 qm_mode=0 -rpc_file=/etc/rpc allow_file=/etc/hosts.allow +inetd_conf_file=/etc/inetd.conf rpc_protocols=tcp udp -ipv6=0 -restart_command=killall -HUP inetd -show_empty=1 -display_max=100 -protocols_file=/etc/protocols -deny_file=/etc/hosts.deny sort_mode=0 +deny_file=/etc/hosts.deny +extended_inetd=1 +protocols_file=/etc/protocols diff --git a/webmin/init/config b/webmin/init/config index 500fee0c3..94bc0b8a7 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -reboot_command=reboot -soft_links=1 -status_check=0 -expert=0 atboot_product=webmin -init_base=/etc/ -show_opts=0 -desc=1 +init_dir=/etc/init.d +soft_links=1 order_digits=2 -boot_levels=2 3 5 +status_check=0 inittab_id=id -init_info=1 -shutdown_command=poweroff +init_base=/etc/ order=0 -init_dir=/etc/init.d +init_info=1 no_chkconfig=0 +expert=0 sort_mode=0 +boot_levels=2 3 5 +desc=1 +shutdown_command=poweroff +reboot_command=reboot +show_opts=0 diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index db243ccd9..66dbafb6c 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ -ipfstat=ipfstat ipnat=ipnat -view_condition=1 -cluster_mode=0 -ipnat_conf=/etc/ipf/ipnat.conf -ipf_conf=/etc/ipf/ipf.conf cluster_nat=1 +ipfstat=ipfstat view_comment=0 ipf=ipf +ipnat_conf=/etc/ipf/ipnat.conf +ipf_conf=/etc/ipf/ipf.conf +view_condition=1 +cluster_mode=0 diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 4a0563fd5..940f2b732 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ +view_comment=0 +cluster_mode=0 view_condition=1 ipfw=/sbin/ipfw version=2 view_counters=0 -cluster_mode=0 -view_comment=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 0df62201f..b9125fe9f 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ -policies_dir=/etc/ipsec.d/policies -logfile=/var/log/messages +stop_cmd=/etc/init.d/ipsec stop file=/etc/ipsec.conf +secrets=/etc/ipsec.secrets ipsec=/usr/sbin/ipsec +logfile=/var/log/messages restart_cmd=/etc/init.d/ipsec restart start_cmd=/etc/init.d/ipsec start -secrets=/etc/ipsec.secrets -stop_cmd=/etc/init.d/ipsec stop +policies_dir=/etc/ipsec.d/policies diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 0fbe6ac34..ff5acd59c 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -iscsiiname=iscsi-iname -ifaces_dir=/var/lib/iscsi/ifaces iscsiadm=iscsiadm +ifaces_dir=/var/lib/iscsi/ifaces config_file=/etc/iscsi/iscsid.conf -init_name=open-iscsi initiator_file=/etc/iscsi/initiatorname.iscsi +iscsiiname=iscsi-iname +init_name=open-iscsi diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index cf4987d02..e61268735 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -targets_file=/etc/iscsi/targets +opts_file=/etc/sysconfig/netbsd-iscsi +pid_file=/var/run/iscsi-target.pid init_name=netbsd-iscsi iscsi_server=/usr/sbin/iscsi-target +targets_file=/etc/iscsi/targets auths_file=/etc/iscsi/auths -opts_file=/etc/sysconfig/netbsd-iscsi -pid_file=/var/run/iscsi-target.pid diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index dcf64fb79..0b41f186e 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ -pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid -ietadm=ietadm -config_file=/etc/iet/ietd.conf opts_file=/etc/default/iscsitarget +config_file=/etc/iet/ietd.conf +ietadm=ietadm +pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid init_name=iscsitarget initiators_file=/etc/iet/initiators.allow targets_file=/etc/iet/targets.allow diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index e55f742ea..abe96e5c5 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ -tgtd=tgtd -tgtadm=tgtadm config_file=/etc/tgt/targets.conf +tgtd=tgtd init_name=tgtd tgtadmin=tgt-admin +tgtadm=tgtadm diff --git a/webmin/jabber/config b/webmin/jabber/config index 7820aa344..e4df9009d 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ jabber_config=/etc/jabber/jabber.xml +jabber_dir=/var/lib/jabber jabber_daemon=/usr/sbin/jabberd start_cmd=/etc/init.d/jabberd start stop_cmd=/etc/init.d/jabberd stop -jabber_dir=/var/lib/jabber diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 0f578e5fb..41ce77d5e 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ init_name=nslcd -auth_ldap=/etc/ldap.conf secret=/etc/ldap.secret +auth_ldap=/etc/ldap.conf diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index 81b6ee977..4e6f990db 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ +browse_max=100 +start_cmd=/etc/init.d/slapd start +apply_cmd=/etc/init.d/slapd restart schema_dir=/etc/ldap/schema -ldap_user=openldap -config_file=/etc/ldap/slapd.d attr_count=6 -browse_max=100 +ldap_user=openldap stop_cmd=/etc/init.d/slapd stop -slapd=slapd init_name=slapd -start_cmd=/etc/init.d/slapd start -apply_cmd=/etc/init.d/slapd restart +slapd=slapd +config_file=/etc/ldap/slapd.d diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 0d72858c8..193f6d99c 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -imap_class=SuSEeMailObject -imap_folders=old public sent-mail -auth_ldap=/etc/ldap.conf -secmode=0 -samba_def=0 given_order=0 -other_class=inetOrgPerson -samba_class=sambaSamAccount slappasswd=slappasswd -mailfmt=0 -quota_support=0 +multi_fields=0 alias_same=0 -imap_login=cyrus +shells=fixed,ldap,passwd,shells +given=0 +quota_support=0 +auth_ldap=/etc/ldap.conf samba_gclass=sambaGroup -membox=0 +ldap_tls=0 +samba_class=sambaSamAccount +imap_login=cyrus gecos=1 -md5=0 +samba_def=0 imap_foldersep=. -multi_fields=0 -given=0 -imap_def=0 person=1 -shells=fixed,ldap,passwd,shells -ldap_tls=0 +membox=0 +imap_class=SuSEeMailObject +md5=0 +other_class=inetOrgPerson +mailfmt=0 +secmode=0 +imap_def=0 +imap_folders=old public sent-mail diff --git a/webmin/logrotate/config b/webmin/logrotate/config index a89625b05..2b038f64c 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -logrotate_conf=/etc/logrotate.conf -logrotate=logrotate sort_mode=0 +logrotate=logrotate +logrotate_conf=/etc/logrotate.conf add_file=/etc/logrotate.d diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index 794e0c9af..7524c24a1 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -start_cmd=/etc/init.d/cupsys start gs_fontpath= -iface_owner=lp:lp stop_cmd=/etc/init.d/cupsys stop -smbclient_path=smbclient -gs_path=gs -spool_dir=/var/spool/cups iface_arg= -show_jobs=0 -iface_perms=755 -display_mode=0 -show_status=0 model_path=/usr/share/foomatic/db /usr/share/ppd sort_mode=0 +display_mode=0 +start_cmd=/etc/init.d/cupsys start +gs_path=gs gs_lib= -print_style=cups driver_style=cups +smbclient_path=smbclient +print_style=cups +show_status=0 +iface_perms=755 +iface_owner=lp:lp +show_jobs=0 +spool_dir=/var/spool/cups diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index 2d9653350..db10c31cd 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -mailbox_user=.usermin/mailbox -ignore_users_enabled=0 -no_orig_ip=0 -sync_create=0 -show_size_below=0 -column_count=4 -vpopmail_dir=/home/vpopmail -arrows=1 mail_dir=Maildir +column_count=4 max_records=200 -html_edit=0 -sort_mode=1 -show_count=0 -mail_system=3 -check_mod=1 ignore_users= +show_mail=0 +check_mod=1 no_mailer=0 -wrap_width=80 +spam_buttons=mail +show_sent=0 +sync_modify=1 date_fmt=dmy -delete_warn=y -top_buttons=2 -mail_style=0 -track_read=0 -show_delall=0 -no_crlf=0 -auto=1 -size_mode=1 -show_to=0 -mail_usermin=mail -open_mode=0 -log_read=0 -view_html=0 -noindex_hostname=0 +no_orig_ip=0 +sync_delete=1 +spam_del=0 +link_mode=0 +sort_mode=1 +sig_file=* +ignore_users_enabled=0 spam_report= sync_perms=0700 -sync_delete=1 -show_mail=0 -perpage=20 +log_read=0 +show_size=1 fwd_mode=0 -mail_file=Mailbox -sig_file=* -from_virtualmin=1 -show_sent=0 -sync_modify=1 +no_crlf=0 +view_html=0 +show_count=0 +mail_style=0 +delete_warn=y +html_edit=0 +mailbox_user=.usermin/mailbox +open_mode=0 +show_delall=0 +arrows=1 show_body=0 +show_to=0 +vpopmail_dir=/home/vpopmail +auto=1 +noindex_hostname=0 +maildir_deleted=0 +top_buttons=2 +sync_create=0 +mail_usermin=mail +wrap_width=80 html_quote=0 +track_read=0 +size_mode=1 +mail_file=Mailbox +show_size_below=0 +mail_system=3 +perpage=20 show_unread=0 -show_size=1 -link_mode=0 -spam_buttons=mail -maildir_deleted=0 -spam_del=0 +from_virtualmin=1 diff --git a/webmin/man/config b/webmin/man/config index e4e903ed8..9e5cf01e9 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -doc_dir=/usr/share/doc -list_cmd=man -w PAGE man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man +man_cmd=man PAGE +doc_dir=/usr/share/doc +search_cmd=man -k PAGE list_cmd_sect=man -w SECTION PAGE +list_cmd=man -w PAGE kernel_dir=/usr/src/linux/Documentation -man_cmd=man PAGE -man2html_path=man2html man_cmd_sect=man SECTION PAGE -search_cmd=man -k PAGE +man2html_path=man2html diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index 7921e7421..f916b3537 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.953 +server=MiniServ/1.954 diff --git a/webmin/mon/config b/webmin/mon/config index 236134e26..ffc3c1a82 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -restart_cmd=/etc/init.d/mon restart -stop_cmd=/etc/init.d/mon stop -cfbasedir=/etc/mon -monshow=/usr/bin/monshow mon_cgi=/var/www/cgi-bin/mon.cgi pid_file=/var/run/mon.pid +monshow=/usr/bin/monshow start_cmd=/etc/init.d/mon start +restart_cmd=/etc/init.d/mon restart +stop_cmd=/etc/init.d/mon stop +cfbasedir=/etc/mon diff --git a/webmin/mount/config b/webmin/mount/config index 6146dc791..6e41b9103 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -sysinfo=1 -show_used=1 -nfs_check=1 sort_mode=2 +auto_file=/etc/am-utils/amd.conf autofs_file=/etc/auto.master -long_fstypes=1 -nmblookup_path=nmblookup fstab_file=/etc/fstab -auto_file=/etc/am-utils/amd.conf +nfs_check=1 +show_used=1 smbclient_path=smbclient +long_fstypes=1 +nmblookup_path=nmblookup +sysinfo=1 diff --git a/webmin/mysql/config b/webmin/mysql/config index 5a99b8a16..58347a62e 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -max_text=1000 -date_subs=0 -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -nopwd=0 -add_mode=1 -passwd_mode=0 -mysqlshow=/usr/bin/mysqlshow -mysqldump=/usr/bin/mysqldump -webmin_subs=0 -max_dbs=50 -mysql=/usr/bin/mysql mysql_libs=/usr/local/mysql/lib -login=root +max_dbs=50 mysqlimport=/usr/bin/mysqlimport -style=0 +start_cmd=service mysql start +date_subs=0 +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf nodbi=0 -mysql_data=/var/lib/mysql +login=root +nopwd=0 perpage=25 mysqladmin=/usr/bin/mysqladmin access=*: * +max_text=1000 stop_cmd=service mysql stop +webmin_subs=0 +mysqlshow=/usr/bin/mysqlshow +mysql_data=/var/lib/mysql +mysqldump=/usr/bin/mysqldump +style=0 +add_mode=1 +mysql=/usr/bin/mysql blob_mode=0 -start_cmd=service mysql start +passwd_mode=0 diff --git a/webmin/mysql/version b/webmin/mysql/version index c8025f579..a7772731a 100644 --- a/webmin/mysql/version +++ b/webmin/mysql/version @@ -1 +1 @@ -5.7.30 +8.0.21-0ubuntu0 diff --git a/webmin/nis/config b/webmin/nis/config index cccab7be9..141abbd3c 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ -manual_build=0 securenets=/etc/ypserv.securenets +nsswitch_conf=/etc/nsswitch.conf client_conf=/etc/yp.conf +manual_build=0 max_size=100 -nsswitch_conf=/etc/nsswitch.conf diff --git a/webmin/openslp/config b/webmin/openslp/config index cc43550ea..8cb03a131 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd_log=/var/log/slpd.log -slpd=/usr/sbin/slpd -slpd_reg=/etc/slp.reg slpd_pid=/var/run/slpd.pid slpd_conf=/etc/slp.conf +slpd=/usr/sbin/slpd +slpd_log=/var/log/slpd.log +slpd_reg=/etc/slp.reg 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 f93cd4a8d..02a4dd593 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ -lib_dirs=/lib/security /lib/*/security -ignore=README pam_dir=/etc/pam.d mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so +lib_dirs=/lib/security /lib/*/security +ignore=README diff --git a/webmin/pap/config b/webmin/pap/config index 281dbaf94..838685a6e 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ login_config=/etc/mgetty+sendfax/login.config -dialin_config=/etc/mgetty+sendfax/dialin.config -encrypt_pass=0 +mgetty=mgetty +ppp_options=/etc/ppp/options pap_file=/etc/ppp/pap-secrets pppd=pppd -ppp_options=/etc/ppp/options -mgetty=mgetty serials=/dev/ttyS[0-9]* +encrypt_pass=0 +dialin_config=/etc/mgetty+sendfax/dialin.config diff --git a/webmin/postfix/config b/webmin/postfix/config index 04ec47b58..2b6de6a35 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ -mailq_sort=0 +postfix_aliases_table_command=/usr/sbin/postalias +postfix_control_command=/usr/sbin/postfix +delete_confirm=1 +postfix_config_file=/etc/postfix/main.cf +sort_mode=0 wrap_width=80 +show_cmts=0 +mailq_count=0 postfix_queue_command=postqueue -postfix_aliases_table_command=/usr/sbin/postalias +index_check=1 +postfix_newaliases_command=/usr/bin/newaliases perpage=20 +postfix_config_command=/usr/sbin/postconf fwd_mode=0 +ldap_doms=0 postcat_cmd=/usr/sbin/postcat -top_buttons=1 -postfix_control_command=/usr/sbin/postfix -postfix_newaliases_command=/usr/bin/newaliases -show_cmts=0 -index_check=1 -postfix_lookup_table_command=/usr/sbin/postmap -mailq_dir=/var/spool/postfix postfix_master=/etc/postfix/master.cf +mailq_dir=/var/spool/postfix delete_warn=1 -prefix_cmts=0 -ldap_doms=0 -postfix_config_command=/usr/sbin/postconf -delete_confirm=1 +max_records=200 +postfix_lookup_table_command=/usr/sbin/postmap +max_maps=100 check_config=1 +top_buttons=1 +columns=2 postfix_super_command=/usr/sbin/postsuper -mailq_count=0 +prefix_cmts=0 mailq_cmd=postqueue -p -max_maps=100 -postfix_config_file=/etc/postfix/main.cf -sort_mode=0 -columns=2 -max_records=200 +mailq_sort=0 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 918eca31e..afb264fb0 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -max_text=1000 +nodbi=0 +login=postgres date_subs=0 -sameunix=1 -add_mode=1 -webmin_subs=0 +perpage=25 +hba_conf=/etc/postgresql/*/main/pg_hba.conf +access_own=0 +start_cmd=/etc/init.d/postgresql* start +basedb=template1 max_dbs=50 +blob_mode=0 +plib= pass= -login=postgres -rstr_cmd=/usr/bin/pg_restore +add_mode=1 style=0 simple_sched=0 -nodbi=0 +dump_cmd=/usr/bin/pg_dump pid_file=/var/run/postmaster.pid -perpage=25 -basedb=template1 -hba_conf=/etc/postgresql/*/main/pg_hba.conf -plib= -access_own=0 +sameunix=1 +stop_cmd=/etc/init.d/postgresql* stop +rstr_cmd=/usr/bin/pg_restore +max_text=1000 psql=/usr/bin/psql access=*: * -stop_cmd=/etc/init.d/postgresql* stop -dump_cmd=/usr/bin/pg_dump -blob_mode=0 -start_cmd=/etc/init.d/postgresql* start +webmin_subs=0 diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 5fd0f800c..54849d0a2 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ wvdialconf=wvdialconf -file=/etc/wvdial.conf wvdial=wvdial +file=/etc/wvdial.conf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index edcc9799c..c838e9e3c 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -pptp_options=/etc/ppp/options.pptp +timeout=30 pap_file=/etc/ppp/chap-secrets pptp=pptp +pptp_options=/etc/ppp/options.pptp peers_dir=/etc/ppp/peers -timeout=30 diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index 35e58e83d..1707907fa 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -pid_file=/var/run/pptpd.pid ppp_options=/etc/ppp/options +stop_cmd=/etc/init.d/pptpd stop +pap_file=/etc/ppp/chap-secrets pptp_ppp_options=/etc/ppp/pptpd-options file=/etc/pptpd.conf -pap_file=/etc/ppp/chap-secrets pptpd=pptpd +pid_file=/var/run/pptpd.pid log_file=/var/log/messages start_cmd=/etc/init.d/pptpd start -stop_cmd=/etc/init.d/pptpd stop diff --git a/webmin/proc/config b/webmin/proc/config index 4bf34bb1c..6e69a6bac 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -ps_style=linux hide_self=1 -base_ppid=1 default_mode=last cut_length=80 +ps_style=linux +base_ppid=1 trace_java=0 diff --git a/webmin/procmail/config b/webmin/procmail/config index 5b184fd7c..71541070b 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -procmailrc=/etc/procmailrc includes=0 procmail=procmail +procmailrc=/etc/procmailrc diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 00dfd329a..ea8c68997 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -ftpusers=/etc/ftpusers +test_manual=0 +test_always=0 +stop_cmd=/etc/init.d/proftpd stop proftpd_path=/usr/sbin/proftpd +proftpd_conf=/etc/proftpd/proftpd.conf pid_file=/var/run/proftpd.pid -test_manual=0 +ftpusers=/etc/ftpusers start_cmd=/etc/init.d/proftpd start -proftpd_conf=/etc/proftpd/proftpd.conf -test_always=0 test_config=1 -stop_cmd=/etc/init.d/proftpd stop diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 08a7321fc..ec36562a7 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -mail_dir_qmail=Maildir -columns=2 -max_records=200 mail_dir= -sort_mode=0 delete_warn=1 -index_min=1000000 +max_records=200 +sort_mode=0 qmail_dir=/var/qmail mail_file=Mailbox -mailq_count=0 -perpage=20 fwd_mode=0 -mail_system=1 mailq_sort=0 +perpage=20 +mail_system=1 +mail_dir_qmail=Maildir +columns=2 +index_min=1000000 +mailq_count=0 diff --git a/webmin/quota/config b/webmin/quota/config index 31201d02a..23a814ea8 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -user_setquota_command=setquota -u +block_size=1024 user_copy_command=edquota -u -p -block_mode=1 +group_edquota_command=edquota -g +show_grace=1 +group_copy_command=edquota -g -p +user_grace_command=edquota -u -t pc_show=1 -group_quotaon_command=quotaon -g -group_grace_command=edquota -g -t -user_repquota_command=repquota -u -v quotacheck_command=quotacheck -u -g -group_quotaoff_command=quotaoff -g email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the allowed quota. ${USED} of disk space is being used, out of a maximum of ${QUOTA}. -user_edquota_command=edquota -u -block_size=1024 -show_grace=1 +group_quotaon_command=quotaon -g +user_repquota_command=repquota -u -v +user_quotaon_command=quotaon -u +group_grace_command=edquota -g -t +display_max=100 group_quota_command=quota -v -g -user_quotaoff_command=quotaoff -u -hide_uids=0 +group_repquota_command=repquota -g -v +user_setquota_command=setquota -u +group_quotaoff_command=quotaoff -g group_setquota_command=setquota -g -group_copy_command=edquota -g -p user_quota_command=quota -v -u -group_edquota_command=edquota -g -display_max=100 +user_edquota_command=edquota -u sort_mode=0 -user_quotaon_command=quotaon -u -group_repquota_command=repquota -g -v -user_grace_command=edquota -u -t +hide_uids=0 +user_quotaoff_command=quotaoff -u +block_mode=1 diff --git a/webmin/samba/config b/webmin/samba/config index 91339ca67..b60e6dc23 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -pdbedit=/usr/bin/pdbedit -start_cmd=service smbd start ; service nmbd start -smb_conf=/etc/samba/smb.conf +swat=/usr/sbin/swat +net=/usr/bin/net +smbgroupedit=/usr/bin/smbgroupedit +samba_status_program=/usr/bin/smbstatus +dont_convert=-499 text_lists=0 -stop_cmd=service smbd stop ; service nmbd stop -samba_password_program=/usr/bin/smbpasswd run_from_inetd=0 -name_server=/usr/sbin/nmbd -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' -dont_convert=-499 -restart_cmd=service smbd restart ; service nmbd restart +smb_conf=/etc/samba/smb.conf samba_server=/usr/sbin/smbd -samba_status_program=/usr/bin/smbstatus -smbgroupedit=/usr/bin/smbgroupedit smb_passwd=/etc/samba/smbpasswd -swat=/usr/sbin/swat +start_cmd=service smbd start ; service nmbd start +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +restart_cmd=service smbd restart ; service nmbd restart sort_mode=0 -net=/usr/bin/net +pdbedit=/usr/bin/pdbedit +samba_password_program=/usr/bin/smbpasswd +name_server=/usr/sbin/nmbd +stop_cmd=service smbd stop ; service nmbd stop diff --git a/webmin/sarg/config b/webmin/sarg/config index e572a9730..75406f229 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 -clear=1 -naked=0 diff --git a/webmin/sendmail/config b/webmin/sendmail/config index 9a2811af2..c4b6ef4ea 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -sort_mode=0 -mail_dir=/var/spool/mail -columns=2 -max_records=200 -sendmail_path=/usr/lib/sendmail -mail_type=0 -sendmail_mc=/etc/mail/sendmail.mc mailq_count=0 -show_to=0 -delete_confirm=1 -mailq_show=Date,From,To,Size,Status -delete_warn=1 -order_mail=0 -prefix_cmts=0 -top_buttons=1 -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -smrsh_dir=/etc/smrsh -show_cmts=0 -makemap_path=makemap -track_read=0 mail_style=0 index_min=1000000 -fwd_mode=0 perpage=20 -sendmail_command=/usr/lib/sendmail -bd -q1h +order_mail=0 +fwd_mode=0 mail_file=mbox -mailq_sort=0 +delete_confirm=1 +track_read=0 +sendmail_command=/usr/lib/sendmail -bd -q1h +sendmail_features=/usr/share/sendmail/cf +show_cmts=0 wrap_width=80 +sort_mode=0 +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +mail_type=0 +columns=2 +top_buttons=1 sendmail_cf=/etc/mail/sendmail.cf -sendmail_features=/usr/share/sendmail/cf +smrsh_dir=/etc/smrsh +mailq_sort=0 +prefix_cmts=0 +show_to=0 +sendmail_mc=/etc/mail/sendmail.mc +sendmail_path=/usr/lib/sendmail +mail_dir=/var/spool/mail +delete_warn=1 +max_records=200 +mailq_show=Date,From,To,Size,Status +makemap_path=makemap diff --git a/webmin/servers/config b/webmin/servers/config index 589a8f84c..22d85a078 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ +show_status=1 resolve=1 -deffast=2 +scan_time=5 +deflink=0 capath=/usr/share/ca-certificates +sort_mode=0 +deffast=2 show_ip=0 max_servers=100 -groups_dir=/etc/cluster/groups -scan_time=5 display_mode=0 -show_status=1 -deflink=0 -sort_mode=0 +groups_dir=/etc/cluster/groups diff --git a/webmin/shell/config b/webmin/shell/config index af7728831..ae2fea776 100644 --- a/webmin/shell/config +++ b/webmin/shell/config @@ -1,3 +1,3 @@ max_runtime=86400 -clear_envs=0 max_output=100000 +clear_envs=0 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 1b475d8a5..733134c02 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 display_zone_descriptions=1 -config_dir=/etc/shorewall shorewall=shorewall +actions=/etc/shorewall/actions /usr/share/shorewall/actions.std +config_dir=/etc/shorewall diff --git a/webmin/smart-status/config b/webmin/smart-status/config index faa2e51d2..fadfec290 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ +smartctl=smartctl ata=0 -mode=1 attribs=1 -smartctl=smartctl +mode=1 diff --git a/webmin/software/config b/webmin/software/config index bf587ee21..9476e6757 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ -package_system=debian -update_system=apt apt_mode=0 +update_system=apt +package_system=debian diff --git a/webmin/spam/config b/webmin/spam/config index 0f2fd8e2a..02960f0b4 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -procmailrc=/etc/procmailrc -restart_cmd=/etc/init.d/spamassassin restart +max_awl=200 call_spam=1 -processes=spamd amavisd -mode=0 -warn_procmail=1 sa_learn=sa-learn -procmail_cmd=* +restart_cmd=/etc/init.d/spamassassin restart local_cf=/etc/spamassassin/local.cf -max_awl=200 -addto=0 +procmail_cmd=* spamassassin=spamassassin +procmailrc=/etc/procmailrc +warn_procmail=1 +addto=0 +processes=spamd amavisd +mode=0 diff --git a/webmin/squid/config b/webmin/squid/config index df3dd948f..0ac6b63e3 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -sync_modify=1 -squid_conf=/etc/squid/squid.conf +sync_create=0 cal_fmt=w +cache_dir=/var/spool/squid cal_all=1 -squid_path=squid -calamaris=calamaris crypt_conf=0 -pid_file=/var/run/squid.pid -cache_dir=/var/spool/squid -cal_max=50000 +squid_conf=/etc/squid/squid.conf +cal_args=-aw +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +log_dir=/var/log/squid squid_restart=service squid reload -restart_pos=0 -sync_create=0 sort_conf=0 +sync_modify=1 squid_stop=service squid stop -squidclient=squidclient -cal_args=-aw -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +cal_max=50000 +calamaris=calamaris +pid_file=/var/run/squid.pid squid_start=service squid start +restart_pos=0 +squid_path=squid sync_delete=0 -log_dir=/var/log/squid +squidclient=squidclient diff --git a/webmin/sshd/config b/webmin/sshd/config index df1b4ba16..d4bfadc9c 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -stop_cmd=service ssh stop sync_pass=0 +sshd_path=/usr/sbin/sshd +sync_auth=1 +sshd_config=/etc/ssh/sshd_config +pid_file=/var/run/sshd.pid client_config=/etc/ssh/ssh_config +stop_cmd=service ssh stop keygen_path=/usr/bin/ssh-keygen sync_create=0 -start_cmd=service ssh start -sync_auth=1 -sshd_config=/etc/ssh/sshd_config sync_gnupg=0 -pid_file=/var/run/sshd.pid -sshd_path=/usr/sbin/sshd +start_cmd=service ssh start diff --git a/webmin/status/config b/webmin/status/config index 38f2e4aad..ad4d44344 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ -sched_offset=0 -output=0 -history_show=50 -subject_mode=0 -sysinfo_users=0 sysinfo=0 -columns=2 -sort_mode=0 -snmp_trap=1.3.6.1.4.1.10000.1.1 -snmp_version=2 index_status=1 +columns=2 +output=0 +sched_offset=0 +sysinfo_users=0 pager_cmd=sms_client +subject_mode=0 +snmp_version=2 +snmp_trap=1.3.6.1.4.1.10000.1.1 +history_show=50 +sort_mode=0 history_purge=30 diff --git a/webmin/stop b/webmin/stop index 98dcd4a57..c0f841769 100755 --- a/webmin/stop +++ b/webmin/stop @@ -4,8 +4,9 @@ pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'` pid=`cat $pidfile` if [ "$pid" != "" ]; then kill $pid || exit 1 + touch /var/webmin/stop-flag if [ "$1" = "--kill" ]; then - sleep 1 + sleep 2 (kill -9 -- -$pid || kill -9 $pid) 2>/dev/null fi exit 0 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index 643ef89e2..0cc8517ef 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -start_cmd=/etc/init.d/syslog-ng start -pid_file=/var/run/syslog-ng.pid lines=20 -syslogng_conf=/etc/syslog-ng/syslog-ng.conf -compressed=1 stop_cmd=/etc/init.d/syslog-ng stop +syslogng_conf=/etc/syslog-ng/syslog-ng.conf syslogng_cmd=syslog-ng +compressed=1 +pid_file=/var/run/syslog-ng.pid +start_cmd=/etc/init.d/syslog-ng start diff --git a/webmin/syslog/config b/webmin/syslog/config index da451a934..05261bf57 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -syslog_conf=/etc/rsyslog.conf -tags=0 -restart_cmd=/usr/sbin/service rsyslog restart -compressed=1 -reverse=0 +socket=0 +pri_dir=1 +signal_cmd=/usr/sbin/service rsyslog restart lines=20 +sync=1 +reverse=0 pid_file=/var/run/rsyslogd.pid +syslog_conf=/etc/rsyslog.conf +facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 +pri_all=1 m4_path= -m4_conf=0 -signal_cmd=/usr/sbin/service rsyslog restart others=1 +restart_cmd=/usr/sbin/service rsyslog restart +tags=0 +m4_conf=0 +pipe=1 start_cmd=/usr/sbin/service rsyslog start -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 syslogd=/usr/sbin/rsyslogd -pri_dir=1 -socket=0 -sync=1 -pipe=1 -pri_all=1 +compressed=1 diff --git a/webmin/system-status/config b/webmin/system-status/config index c627a9fec..b6a7e4155 100644 --- a/webmin/system-status/config +++ b/webmin/system-status/config @@ -1,2 +1,2 @@ -collect_pkgs=1 collect_interval=5 +collect_pkgs=1 diff --git a/webmin/telnet/config b/webmin/telnet/config index 1b658c063..d87524763 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ mode=1 -detach=0 -proxy=0 no_test=0 sizemode=0 +detach=0 +proxy=0 diff --git a/webmin/time/config b/webmin/time/config index ff8b93f92..129e4c6e5 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,5 +1,5 @@ +timeserver_hardware=1 seconds=1 -ntp_only=1 lease=5 -timeserver_hardware=1 zone_style=linux +ntp_only=1 diff --git a/webmin/updown/config b/webmin/updown/config index abd9a9718..2d7e2b876 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ -ddir=/ user=root +ddir=/ duser=root dir=/ diff --git a/webmin/useradmin/config b/webmin/useradmin/config index e86be0f1b..dfd5a42cb 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -selinux_con=user_u:object_r:user_home_dir_t -delete_root=0 -uid_calc=0 -lock_string=* -email_type=0 -random_password=0 +empty_mode=0 base_gid=1000 -passwd_dict=0 -display_max=400 +display_mode=1 +home_style=0 +delete_root=0 shadow_file=/etc/shadow -sort_mode=0 -gid_mode=1 +uid_mode=1 +random_password=0 +base_uid=1000 passwd_file=/etc/passwd +membox=0 +email_type=0 +md5=1 +delete_only=0 extra_real=0 -homedir_perms=0755 -new_user_group=0 +default_group=users +lock_string=* +secmode=0 +user_files=/etc/skel +passwd_dict=0 +passwd_progmode=0 gid_calc=0 -md5=1 -base_uid=1000 -alias_check=0 +gshadow_file=/etc/gshadow +gid_mode=1 +sort_mode=0 last_show=0 +shells=fixed,passwd,shells +selinux_con=user_u:object_r:user_home_dir_t from_files=0 -passwd_stars=0 +passwd_same=0 skip_md5=0 -delete_only=0 -default_group=users -uid_mode=1 -membox=0 -home_style=0 -group_file=/etc/group -gshadow_file=/etc/gshadow default_other=1 -display_mode=1 -secmode=0 +alias_check=0 new_user_gid=0 -empty_mode=0 -shells=fixed,passwd,shells home_base=/home -user_files=/etc/skel -passwd_progmode=0 -passwd_same=0 +passwd_stars=0 +homedir_perms=0755 +group_file=/etc/group +new_user_group=0 +display_max=400 +uid_calc=0 diff --git a/webmin/usermin/config b/webmin/usermin/config index a54fd217e..0ce65ea95 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -update=0 -cron_mode=0 usermin_dir=/etc/usermin -updays=1 upshow=1 -uphour=4 +updays=1 +update=0 upmissing=0 +cron_mode=0 +uphour=4 diff --git a/webmin/version b/webmin/version index fe5ddad68..1dba347a3 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.953 +1.954 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index 5def64eca..d9ce83ec9 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -webalizer=/usr/bin/webalizer naked=0 -webalizer_conf=/etc/webalizer/webalizer.conf -skip_old=0 -alt_conf=/etc/webalizer/webalizer.conf.sample auto=apache,squid,proftpd,wuftpd +alt_conf=/etc/webalizer/webalizer.conf.sample +skip_old=0 +webalizer_conf=/etc/webalizer/webalizer.conf +webalizer=/usr/bin/webalizer diff --git a/webmin/webmin/config b/webmin/webmin/config index 9101a7956..95e8517c9 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ -upshow=1 -warn_days=7 -uphour=23 -last_version_check=1549050668 +upmissing=0 +upmins=47 +update=0 osdn=1 last_version_number=1.900 -upmins=47 -cron_mode=0 +last_version_check=1549050668 updays=1 -upmissing=0 +upshow=1 +uphour=23 +cron_mode=0 +warn_days=7 letsencrypt_dns_wait=10 -update=0 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index 430d531a6..2b19b03da 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ ftpgroups=/etc/wu-ftpd/ftpgroups -ftphosts=/etc/wu-ftpd/ftphosts pid_file=/var/run/ftpd.pids-all +ftphosts=/etc/wu-ftpd/ftphosts ftpusers=/etc/wu-ftpd/ftpusers ftpconversions=/etc/wu-ftpd/ftpconversions -ftpaccess=/etc/wu-ftpd/ftpaccess -ftpd_path=/usr/sbin/wu-ftpd log_file=/var/log/xferlog +ftpd_path=/usr/sbin/wu-ftpd +ftpaccess=/etc/wu-ftpd/ftpaccess diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 5aef351dd..db68ed3e8 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -protocols_file=/etc/protocols +pid_file=/var/run/xinetd.pid xinetd_conf=/etc/xinetd.conf +protocols_file=/etc/protocols lookup_servs=1 -pid_file=/var/run/xinetd.pid start_cmd=/etc/init.d/xinetd start -- 2.43.0