From 84838ca58524a4b05d61f8c4fd52c45b079c6e37 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Sun, 23 Aug 2020 21:35:53 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -bind9 1:9.16.1-0ubuntu2.2 amd64 -bind9-dnsutils 1:9.16.1-0ubuntu2.2 amd64 -bind9-host 1:9.16.1-0ubuntu2.2 amd64 -bind9-libs 1:9.16.1-0ubuntu2.2 amd64 -bind9-utils 1:9.16.1-0ubuntu2.2 amd64 +bind9 1:9.16.1-0ubuntu2.3 amd64 +bind9-dnsutils 1:9.16.1-0ubuntu2.3 amd64 +bind9-host 1:9.16.1-0ubuntu2.3 amd64 +bind9-libs 1:9.16.1-0ubuntu2.3 amd64 +bind9-utils 1:9.16.1-0ubuntu2.3 amd64 -dnsutils 1:9.16.1-0ubuntu2.2 all +dnsutils 1:9.16.1-0ubuntu2.3 all -webmin 1.954 all +webmin 1.955 all --- webmin/acl/config | 2 +- webmin/adsl-client/config | 8 ++-- webmin/ajaxterm/config | 2 +- webmin/apache/config | 32 ++++++------- webmin/apache/httpd-info | 4 +- webmin/backup-config/config | 2 +- webmin/bacula-backup/config | 14 +++--- webmin/bandwidth/config | 2 +- webmin/bind8/config | 68 ++++++++++++++-------------- webmin/cluster-passwd/config | 2 +- webmin/cluster-software/config | 2 +- webmin/cluster-useradmin/config | 8 ++-- webmin/config | 46 +++++++++---------- webmin/cpan/config | 6 +-- webmin/cron/config | 38 ++++++++-------- webmin/custom/config | 2 +- webmin/dhcpd/config | 18 ++++---- webmin/dovecot/config | 4 +- webmin/exim/config | 10 ++--- webmin/exports/config | 2 +- webmin/fail2ban/config | 2 +- webmin/fetchmail/config | 4 +- webmin/filter/config | 8 ++-- webmin/firewall/config | 6 +-- webmin/firewall6/config | 6 +-- webmin/firewalld/config | 2 +- webmin/fsdump/config | 6 +-- webmin/heartbeat/config | 20 ++++----- webmin/htaccess-htpasswd/config | 8 ++-- webmin/idmapd/config | 4 +- webmin/inetd/config | 24 +++++----- webmin/init/config | 22 ++++----- webmin/inittab/config | 2 +- webmin/ipfilter/config | 8 ++-- webmin/ipfw/config | 6 +-- webmin/ipsec/config | 10 ++--- webmin/iscsi-client/config | 6 +-- webmin/iscsi-server/config | 6 +-- webmin/iscsi-target/config | 8 ++-- webmin/iscsi-tgtd/config | 2 +- webmin/jabber/config | 4 +- webmin/ldap-client/config | 2 +- webmin/ldap-server/config | 14 +++--- webmin/ldap-useradmin/config | 32 ++++++------- webmin/logrotate/config | 2 +- webmin/lpadmin/config | 22 ++++----- webmin/lvm/config | 2 +- webmin/mailboxes/config | 80 ++++++++++++++++----------------- webmin/man/config | 8 ++-- webmin/miniserv.conf | 2 +- webmin/mon/config | 10 ++--- webmin/mount/config | 14 +++--- webmin/mysql/config | 32 ++++++------- webmin/net/config | 2 +- webmin/nis/config | 6 +-- webmin/openslp/config | 6 +-- webmin/pam/config | 4 +- webmin/pap/config | 8 ++-- webmin/passwd/config | 2 +- webmin/postfix/config | 42 ++++++++--------- webmin/postgresql/config | 34 +++++++------- webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 12 ++--- webmin/proc/config | 6 +-- webmin/proftpd/config | 10 ++--- webmin/qmailadmin/config | 16 +++---- webmin/quota/config | 32 ++++++------- webmin/raid/config | 2 +- webmin/samba/config | 22 ++++----- webmin/sarg/config | 4 +- webmin/sendmail/config | 44 +++++++++--------- webmin/servers/config | 12 ++--- webmin/shell/config | 4 +- webmin/shorewall/config | 4 +- webmin/shorewall6/config | 4 +- webmin/smart-status/config | 2 +- webmin/software/config | 2 +- webmin/spam/config | 16 +++---- webmin/squid/config | 26 +++++------ webmin/sshd/config | 12 ++--- webmin/status/config | 14 +++--- webmin/syslog-ng/config | 8 ++-- webmin/syslog/config | 24 +++++----- webmin/system-status/config | 2 +- webmin/tcpwrappers/config | 4 +- webmin/telnet/config | 4 +- webmin/time/config | 2 +- webmin/useradmin/config | 64 +++++++++++++------------- webmin/usermin/config | 10 ++--- webmin/version | 2 +- webmin/webalizer/config | 6 +-- webmin/webmin/config | 14 +++--- webmin/wuftpd/config | 8 ++-- webmin/xinetd/config | 2 +- 95 files changed, 580 insertions(+), 580 deletions(-) diff --git a/webmin/acl/config b/webmin/acl/config index ad7d02089..017dd0405 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ +order=0 ssleay=/usr/bin/openssl display=1 -order=0 diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index 0c4c7062b..5d3064c5c 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 -pap_file=/etc/ppp/pap-secrets -pppoe_cmd=pppoe stop_cmd=adsl-stop +pppoe_cmd=pppoe +start_cmd=adsl-start conf_style=0 +pap_file=/etc/ppp/pap-secrets +status_cmd=adsl-status diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config index a31edabcb..003ebb11c 100644 --- a/webmin/ajaxterm/config +++ b/webmin/ajaxterm/config @@ -1,2 +1,2 @@ -autologin=0 timeout=120 +autologin=0 diff --git a/webmin/apache/config b/webmin/apache/config index bd73e19b8..5c54d34b4 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -link_dir=/etc/apache2/sites-enabled -mime_types=/etc/apache2/mime.types -test_always=0 -httpd_conf=/etc/apache2/apache2.conf -test_manual=0 -allow_virtualmin=0 +virt_file=/etc/apache2/sites-available max_servers=100 +httpd_conf=/etc/apache2/apache2.conf +srm_conf=/etc/apache2/srm.conf test_config=1 access_conf=/etc/apache2/access.conf -defines_file=/etc/apache2/envvars show_list=0 -srm_conf=/etc/apache2/srm.conf +link_dir=/etc/apache2/sites-enabled +httpd_path=/usr/sbin/apache2 +test_always=0 stop_cmd=/etc/init.d/apache2 stop -show_order=0 -auto_mods=1 -apply_cmd=/usr/sbin/apache2ctl graceful +defines_name=APACHE_ARGUMENTS +show_names=0 httpd_dir=/etc/apache2 -test_apachectl=1 -virt_file=/etc/apache2/sites-available apachectl_path=/usr/sbin/apache2ctl +auto_mods=1 +test_apachectl=1 +mime_types=/etc/apache2/mime.types +show_order=0 +allow_virtualmin=0 +test_manual=0 start_cmd=/etc/init.d/apache2 start -defines_name=APACHE_ARGUMENTS -show_names=0 -httpd_path=/usr/sbin/apache2 +defines_file=/etc/apache2/envvars +apply_cmd=/usr/sbin/apache2ctl graceful diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index 6f24290e2..973f72c89 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,4 +1,4 @@ -time=1587659947 +time=1597062733 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd -version=2.443 +version=2.446 diff --git a/webmin/backup-config/config b/webmin/backup-config/config index c13b50ad6..5d1c57e87 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ +date_subs=0 webmin_subs=0 apply=1 -date_subs=0 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index 9aacce74f..e732b1163 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ +showdirs=0 bls=bls pass= -db=bacula -wait=1 -bextract=bextract -init_start=0 -bacula_dir=/etc/bacula driver=Pg -showdirs=0 +bacula_dir=/etc/bacula +init_start=0 +apply=1 +db=bacula btape=btape user=bacula -apply=1 +wait=1 +bextract=bextract 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 bed082cf8..20fdfda27 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 -soa_start=0 other_slaves=1 -rev_must=0 allow_underscore=1 +allow_long=0 +named_path=/usr/sbin/named +soa_start=0 +updserial_man=1 +zones_file=/etc/bind/named.conf.local +allow_comments=0 +support_aaaa=1 +checkzone=named-checkzone +rndc_conf=/etc/bind/rndc.conf +ipv6_mode=1 +updserial_def=0 +ndc_cmd=ndc +forwardzonefilename_format=ZONE.hosts +no_chroot=0 +short_names=0 checkconf=named-checkconf -named_conf=/etc/bind/named.conf -slave_dir=/var/lib/bind signzone=dnssec-signzone -ipv6_mode=1 -largezones=0 -records_order=0 +rndcconf_cmd=rndc-confgen whois_cmd=whois -no_chroot=0 show_list=0 -by_view=0 -short_names=0 +records_order=0 +reversezonefilename_format=ZONE.rev +confirm_zone=1 max_zones=50 -rndcconf_cmd=rndc-confgen +pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid +no_pid_chroot=0 soa_style=0 -rev_def=0 -rndc_cmd=rndc -allow_wild=1 -master_ttl=1 +by_view=0 master_dir=/var/lib/bind -named_path=/usr/sbin/named -reversezonefilename_format=ZONE.rev -allow_long=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 +named_conf=/etc/bind/named.conf +allow_wild=1 keygen=dnssec-keygen +rndc_cmd=rndc +rev_def=0 +updserial_on=1 +largezones=0 +slave_dir=/var/lib/bind +master_ttl=1 +rev_must=0 +force_random=0 +spf_record=0 +relative_paths=0 diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 04110de95..2ab4c6af1 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ -max_users=200 input_type=0 sort_mode=0 +max_users=200 diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-software/config +++ b/webmin/cluster-software/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index 5ec81d4e2..e607f8821 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 -conf_add_group=1 +conf_host_links=1 conf_find_group=1 -table_mode=0 conf_find_user=1 +conf_allow_refresh=1 conf_allow_sync=1 +table_mode=0 +conf_add_group=1 diff --git a/webmin/config b/webmin/config index 07125f9d8..7319cc75e 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -real_os_type=Ubuntu Linux -sysinfo=0 -dateformat=dd/mon/yyyy -passwd_cindex=2 -help_width= tempdelete_days=7 -hostnamedisplay= -lang=en.UTF-8 +passwd_file=/etc/shadow +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +help_height= +webprefix= nofeedbackcc=0 +os_version=9.0 +lang_root=de.UTF-8 os_type=debian-linux -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_cindex=2 passwd_pindex=1 -showlogin=0 -referers_none=1 -passwd_mindex=4 -feedback_to= +help_width= passwd_uindex=0 +referers_none=1 +real_os_type=Ubuntu Linux 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 +lang=en.UTF-8 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +sysinfo=0 log=1 -lang_root=de.UTF-8 +feedback_to= product=webmin +passwd_mindex=4 real_os_version=18.04.1 +ld_env=LD_LIBRARY_PATH +hostnamedisplay= +dateformat=dd/mon/yyyy +by_view=0 +md5pass=1 +showlogin=0 +showhost=0 +hostnamemode=0 diff --git a/webmin/cpan/config b/webmin/cpan/config index f25633443..067bac10d 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -incyum=1 +packages=http://www.cpan.org/modules/02packages.details.txt.gz +refresh_days=30 save_partial=0 cpan=http://www.cpan.org/authors/id -packages=http://www.cpan.org/modules/02packages.details.txt.gz +incyum=1 incpackages=1 -refresh_days=30 diff --git a/webmin/cron/config b/webmin/cron/config index 447e463ab..d338522f3 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ -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 +kill_subs=0 system_crontab=/etc/crontab -cron_deny_file=/var/spool/cron/deny -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 +max_jobs=100 +cron_allow_file=/var/spool/cron/allow +max_len=80 +hourly_only=0 +cron_input=1 +vixie_cron=1 run_parts=run-parts -match_mode=0 +show_comment=0 +cron_deny_all=2 +cron_edit_command=crontab -u USER -e cron_user_get_command=crontab -l -vixie_cron=1 cron_user_delete_command=crontab -r -cron_edit_command=crontab -u USER -e -kill_subs=0 -cron_input=1 +cron_get_command=crontab -u USER -l +match_mode=0 cron_delete_command=crontab -u USER -r +cron_dir=/var/spool/cron/crontabs +cron_deny_file=/var/spool/cron/deny +show_next=0 +show_run=0 +show_time=0 +cronfiles_dir=/etc/cron.d +match_user=1 diff --git a/webmin/custom/config b/webmin/custom/config index 9d7bae50a..6c90eac06 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -display_mode=0 params_cmd=0 params_file=0 +display_mode=0 columns=2 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index 803837531..fc44163b8 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,16 +1,16 @@ group_name=0 -restart_cmd=service isc-dhcp-server restart -dhcpd_path=/usr/sbin/dhcpd interfaces_type=debian -show_ip=0 -lease_tz=0 -lease_file=/var/lib/dhcp/dhcpd.leases -desc_name=0 -stop_cmd=service isc-dhcp-server stop +dhcpd_path=/usr/sbin/dhcpd start_cmd=service isc-dhcp-server start display_max=100 +show_mac=0 dhcpd_conf=/etc/dhcp/dhcpd.conf -pid_file=/var/run/dhcpd.pid +desc_name=0 dhcpd_nocols=5 +lease_tz=0 +restart_cmd=service isc-dhcp-server restart +pid_file=/var/run/dhcpd.pid +show_ip=0 +stop_cmd=service isc-dhcp-server stop lease_sort=0 -show_mac=0 +lease_file=/var/lib/dhcp/dhcpd.leases diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 689a1ad8a..658fb103e 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 +init_script=dovecot +pid_file=/var/run/dovecot/master.pid diff --git a/webmin/exim/config b/webmin/exim/config index 6fc541c17..2c8c074e4 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -mail_system=1 -exim_dir=/etc/exim4 -exim_dbmext=.dbm -exim_addrfile=/etc/exim4/email-addresses +exim_mail_file=Maildir exim_virt_dir=/etc/exim4/aliases +exim_dbmext=.dbm +mail_system=1 exim_aliasfileext= -exim_mail_file=Maildir exim_dbmfile=/etc/exim4/local_domains +exim_addrfile=/etc/exim4/email-addresses +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 3733143b5..424dbf2b0 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ config_dir=/etc/fail2ban +server_cmd=/usr/bin/fail2ban-server 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 29af4eb26..426ba29d2 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ max_users=400 -view_mode=0 fetchmail_path=fetchmail pid_file=/var/run/fetchmail.pid -daemon_user=root config_file= +view_mode=0 +daemon_user=root diff --git a/webmin/filter/config b/webmin/filter/config index dedf35ce1..85010a1ca 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ -reply_force=0 -warn_procmail=1 +forward_procmail=0 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 +virtualmin_config=/etc/webmin/virtual-server +reply_force=0 +warn_procmail=1 diff --git a/webmin/firewall/config b/webmin/firewall/config index e2b36c045..f15543bd7 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ +view_comment=0 +cluster_mode=1 force_init=0 +direct=0 comment_mod=0 -view_comment=0 view_condition=1 -direct=0 -cluster_mode=1 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index b9519db9e..7b215dd2e 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -direct=0 -cluster_mode=1 -view_condition=1 comment_mod=0 +view_condition=1 +direct=0 view_comment=0 +cluster_mode=1 force_init=0 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 e2569aa79..c607c2717 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ error_email=0 -nonewtape=0 -simple_sched=0 -date_subs=0 always_tar=0 +date_subs=0 +simple_sched=0 webmin_subs=0 run_mode=0 +nonewtape=0 diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 414ae3c79..0ed3d6613 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -start_cmd=/etc/init.d/heartbeat start -alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +stop_cmd=/etc/init.d/heartbeat stop authkeys= -ha_cf= alt_haresources=/usr/share/doc/packages/heartbeat/haresources -stop_cmd=/etc/init.d/heartbeat stop -resource_d= -heartbeat=/usr/lib/heartbeat/heartbeat -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys -haresources= +ha_cf= +start_cmd=/etc/init.d/heartbeat start +ha_dir=/etc/ha.d +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf apply_cmd=/etc/init.d/heartbeat reload +haresources= +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +heartbeat=/usr/lib/heartbeat/heartbeat +req_resource_cmd=/usr/lib/heartbeat/req_resource serials=/dev/ttyS* +resource_d= 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 6513eb92c..01aab39d0 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -sha1=0 digest=1 +md5=1 +extra_directives= +sha1=0 htpasswd=.htpasswd htaccess=.htaccess -htgroups=.htgroups -extra_directives= sort=0 -md5=1 +htgroups=.htgroups diff --git a/webmin/idmapd/config b/webmin/idmapd/config index f32798d4d..f25eeba97 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ -idmapd_path=/usr/sbin/rpc.idmapd -idmapd_conf=/etc/idmapd.conf restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi +idmapd_conf=/etc/idmapd.conf +idmapd_path=/usr/sbin/rpc.idmapd diff --git a/webmin/inetd/config b/webmin/inetd/config index ae17754eb..a96972689 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -restart_command=killall -HUP inetd -rpc_inetd=1 -rpc_file=/etc/rpc -show_empty=1 -services_file=/etc/services -tcpd_path=/usr/sbin/tcpd -ipv6=0 -display_max=100 -qm_mode=0 -allow_file=/etc/hosts.allow +deny_file=/etc/hosts.deny inetd_conf_file=/etc/inetd.conf -rpc_protocols=tcp udp sort_mode=0 -deny_file=/etc/hosts.deny +ipv6=0 +services_file=/etc/services extended_inetd=1 +show_empty=1 protocols_file=/etc/protocols +restart_command=killall -HUP inetd +tcpd_path=/usr/sbin/tcpd +qm_mode=0 +rpc_inetd=1 +rpc_protocols=tcp udp +allow_file=/etc/hosts.allow +display_max=100 +rpc_file=/etc/rpc diff --git a/webmin/init/config b/webmin/init/config index 94bc0b8a7..8be0fd6bb 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ atboot_product=webmin -init_dir=/etc/init.d -soft_links=1 -order_digits=2 -status_check=0 inittab_id=id -init_base=/etc/ order=0 -init_info=1 -no_chkconfig=0 -expert=0 -sort_mode=0 +init_base=/etc/ boot_levels=2 3 5 -desc=1 -shutdown_command=poweroff +order_digits=2 +init_info=1 +status_check=0 reboot_command=reboot +desc=1 +expert=0 show_opts=0 +soft_links=1 +init_dir=/etc/init.d +shutdown_command=poweroff +sort_mode=0 +no_chkconfig=0 diff --git a/webmin/inittab/config b/webmin/inittab/config index 31db3e7b1..c2b25728b 100644 --- a/webmin/inittab/config +++ b/webmin/inittab/config @@ -1,2 +1,2 @@ -inittab_file=/etc/inittab telinit=telinit +inittab_file=/etc/inittab diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 66dbafb6c..97e88868e 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ ipnat=ipnat -cluster_nat=1 -ipfstat=ipfstat +cluster_mode=0 view_comment=0 -ipf=ipf ipnat_conf=/etc/ipf/ipnat.conf +ipfstat=ipfstat ipf_conf=/etc/ipf/ipf.conf +cluster_nat=1 view_condition=1 -cluster_mode=0 +ipf=ipf diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 940f2b732..be8721812 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 +version=2 +cluster_mode=0 +view_comment=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index b9125fe9f..5efedb9e2 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ 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 policies_dir=/etc/ipsec.d/policies +file=/etc/ipsec.conf +start_cmd=/etc/init.d/ipsec start +restart_cmd=/etc/init.d/ipsec restart +ipsec=/usr/sbin/ipsec diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index ff5acd59c..8942864f9 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -iscsiadm=iscsiadm -ifaces_dir=/var/lib/iscsi/ifaces config_file=/etc/iscsi/iscsid.conf -initiator_file=/etc/iscsi/initiatorname.iscsi +ifaces_dir=/var/lib/iscsi/ifaces +iscsiadm=iscsiadm iscsiiname=iscsi-iname +initiator_file=/etc/iscsi/initiatorname.iscsi init_name=open-iscsi diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index e61268735..29510081c 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -opts_file=/etc/sysconfig/netbsd-iscsi -pid_file=/var/run/iscsi-target.pid -init_name=netbsd-iscsi iscsi_server=/usr/sbin/iscsi-target +pid_file=/var/run/iscsi-target.pid targets_file=/etc/iscsi/targets auths_file=/etc/iscsi/auths +opts_file=/etc/sysconfig/netbsd-iscsi +init_name=netbsd-iscsi diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 0b41f186e..ea884f963 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ +init_name=iscsitarget 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 +initiators_file=/etc/iet/initiators.allow +ietadm=ietadm +config_file=/etc/iet/ietd.conf diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index abe96e5c5..a1adcd7d6 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ -config_file=/etc/tgt/targets.conf tgtd=tgtd init_name=tgtd tgtadmin=tgt-admin tgtadm=tgtadm +config_file=/etc/tgt/targets.conf diff --git a/webmin/jabber/config b/webmin/jabber/config index e4df9009d..2d3456223 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ jabber_config=/etc/jabber/jabber.xml -jabber_dir=/var/lib/jabber +stop_cmd=/etc/init.d/jabberd stop 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 41ce77d5e..0f578e5fb 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ init_name=nslcd -secret=/etc/ldap.secret auth_ldap=/etc/ldap.conf +secret=/etc/ldap.secret diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index 4e6f990db..a63de2a7c 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 -attr_count=6 +config_file=/etc/ldap/slapd.d ldap_user=openldap +slapd=slapd +schema_dir=/etc/ldap/schema stop_cmd=/etc/init.d/slapd stop +start_cmd=/etc/init.d/slapd start init_name=slapd -slapd=slapd -config_file=/etc/ldap/slapd.d +browse_max=100 +apply_cmd=/etc/init.d/slapd restart +attr_count=6 diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 193f6d99c..66dc15566 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -given_order=0 -slappasswd=slappasswd -multi_fields=0 -alias_same=0 -shells=fixed,ldap,passwd,shells -given=0 quota_support=0 +membox=0 +shells=fixed,ldap,passwd,shells +alias_same=0 +other_class=inetOrgPerson auth_ldap=/etc/ldap.conf -samba_gclass=sambaGroup -ldap_tls=0 -samba_class=sambaSamAccount -imap_login=cyrus -gecos=1 samba_def=0 -imap_foldersep=. -person=1 -membox=0 imap_class=SuSEeMailObject -md5=0 -other_class=inetOrgPerson mailfmt=0 +imap_foldersep=. secmode=0 +person=1 +multi_fields=0 +samba_class=sambaSamAccount +given=0 imap_def=0 +ldap_tls=0 +gecos=1 +md5=0 +imap_login=cyrus imap_folders=old public sent-mail +slappasswd=slappasswd +samba_gclass=sambaGroup +given_order=0 diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 2b038f64c..89a1a0d84 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ sort_mode=0 logrotate=logrotate -logrotate_conf=/etc/logrotate.conf add_file=/etc/logrotate.d +logrotate_conf=/etc/logrotate.conf diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index 7524c24a1..60d9f2dab 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -gs_fontpath= -stop_cmd=/etc/init.d/cupsys stop -iface_arg= -model_path=/usr/share/foomatic/db /usr/share/ppd -sort_mode=0 -display_mode=0 +show_jobs=0 +iface_perms=755 start_cmd=/etc/init.d/cupsys start +iface_owner=lp:lp +display_mode=0 gs_path=gs -gs_lib= +spool_dir=/var/spool/cups driver_style=cups +gs_fontpath= smbclient_path=smbclient +stop_cmd=/etc/init.d/cupsys stop print_style=cups +iface_arg= +gs_lib= show_status=0 -iface_perms=755 -iface_owner=lp:lp -show_jobs=0 -spool_dir=/var/spool/cups +sort_mode=0 +model_path=/usr/share/foomatic/db /usr/share/ppd diff --git a/webmin/lvm/config b/webmin/lvm/config index a5ef0ed4d..63b743f61 100644 --- a/webmin/lvm/config +++ b/webmin/lvm/config @@ -1,2 +1,2 @@ -show_table=0 lvm_conf=/etc/lvm/lvm.conf +show_table=0 diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index db10c31cd..253fb778e 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -mail_dir=Maildir -column_count=4 -max_records=200 -ignore_users= -show_mail=0 -check_mod=1 no_mailer=0 -spam_buttons=mail -show_sent=0 -sync_modify=1 date_fmt=dmy -no_orig_ip=0 -sync_delete=1 -spam_del=0 -link_mode=0 -sort_mode=1 -sig_file=* -ignore_users_enabled=0 +noindex_hostname=0 +mail_style=0 +size_mode=1 +log_read=0 +perpage=20 +fwd_mode=0 +from_virtualmin=1 +show_delall=0 +top_buttons=2 spam_report= sync_perms=0700 -log_read=0 show_size=1 -fwd_mode=0 -no_crlf=0 -view_html=0 -show_count=0 -mail_style=0 -delete_warn=y -html_edit=0 -mailbox_user=.usermin/mailbox +mail_usermin=mail +vpopmail_dir=/home/vpopmail +mail_dir=Maildir +show_size_below=0 +link_mode=0 +sig_file=* +sync_create=0 +no_orig_ip=0 +auto=1 +ignore_users= open_mode=0 -show_delall=0 +max_records=200 arrows=1 -show_body=0 +mailbox_user=.usermin/mailbox +delete_warn=y show_to=0 -vpopmail_dir=/home/vpopmail -auto=1 -noindex_hostname=0 +sort_mode=1 maildir_deleted=0 -top_buttons=2 -sync_create=0 -mail_usermin=mail -wrap_width=80 +html_edit=0 +spam_buttons=mail +sync_delete=1 +show_body=0 +column_count=4 +mail_system=3 +show_mail=0 +mail_file=Mailbox +show_count=0 +view_html=0 html_quote=0 track_read=0 -size_mode=1 -mail_file=Mailbox -show_size_below=0 -mail_system=3 -perpage=20 +ignore_users_enabled=0 +no_crlf=0 show_unread=0 -from_virtualmin=1 +show_sent=0 +wrap_width=80 +sync_modify=1 +spam_del=0 +check_mod=1 diff --git a/webmin/man/config b/webmin/man/config index 9e5cf01e9..b5349529c 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 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_sect=man SECTION PAGE man2html_path=man2html +man_cmd_sect=man SECTION PAGE +doc_dir=/usr/share/doc +search_cmd=man -k PAGE +man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index f916b3537..4d70615d9 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.954 +server=MiniServ/1.955 diff --git a/webmin/mon/config b/webmin/mon/config index ffc3c1a82..fd476aa39 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -mon_cgi=/var/www/cgi-bin/mon.cgi -pid_file=/var/run/mon.pid -monshow=/usr/bin/monshow +cfbasedir=/etc/mon start_cmd=/etc/init.d/mon start -restart_cmd=/etc/init.d/mon restart stop_cmd=/etc/init.d/mon stop -cfbasedir=/etc/mon +mon_cgi=/var/www/cgi-bin/mon.cgi +restart_cmd=/etc/init.d/mon restart +monshow=/usr/bin/monshow +pid_file=/var/run/mon.pid diff --git a/webmin/mount/config b/webmin/mount/config index 6e41b9103..f6a58616a 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -sort_mode=2 -auto_file=/etc/am-utils/amd.conf -autofs_file=/etc/auto.master -fstab_file=/etc/fstab nfs_check=1 show_used=1 -smbclient_path=smbclient -long_fstypes=1 -nmblookup_path=nmblookup sysinfo=1 +sort_mode=2 +fstab_file=/etc/fstab +autofs_file=/etc/auto.master +nmblookup_path=nmblookup +auto_file=/etc/am-utils/amd.conf +long_fstypes=1 +smbclient_path=smbclient diff --git a/webmin/mysql/config b/webmin/mysql/config index 58347a62e..cf4a6418a 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ +perpage=25 +blob_mode=0 +webmin_subs=0 +date_subs=0 +style=0 +mysqlshow=/usr/bin/mysqlshow +mysql=/usr/bin/mysql +add_mode=1 +stop_cmd=service mysql stop +access=*: * mysql_libs=/usr/local/mysql/lib -max_dbs=50 +nopwd=0 +mysqldump=/usr/bin/mysqldump +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf +passwd_mode=0 mysqlimport=/usr/bin/mysqlimport start_cmd=service mysql start -date_subs=0 -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf nodbi=0 +max_text=1000 login=root -nopwd=0 -perpage=25 +max_dbs=50 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 -passwd_mode=0 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 141abbd3c..404597009 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ -securenets=/etc/ypserv.securenets -nsswitch_conf=/etc/nsswitch.conf -client_conf=/etc/yp.conf manual_build=0 +nsswitch_conf=/etc/nsswitch.conf max_size=100 +client_conf=/etc/yp.conf +securenets=/etc/ypserv.securenets diff --git a/webmin/openslp/config b/webmin/openslp/config index 8cb03a131..e737f7c44 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd_pid=/var/run/slpd.pid -slpd_conf=/etc/slp.conf -slpd=/usr/sbin/slpd slpd_log=/var/log/slpd.log +slpd_pid=/var/run/slpd.pid slpd_reg=/etc/slp.reg +slpd=/usr/sbin/slpd +slpd_conf=/etc/slp.conf diff --git a/webmin/pam/config b/webmin/pam/config index 02a4dd593..a434b0919 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ 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 +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 diff --git a/webmin/pap/config b/webmin/pap/config index 838685a6e..6da254097 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 mgetty=mgetty ppp_options=/etc/ppp/options -pap_file=/etc/ppp/pap-secrets +login_config=/etc/mgetty+sendfax/login.config +encrypt_pass=0 pppd=pppd +pap_file=/etc/ppp/pap-secrets serials=/dev/ttyS[0-9]* -encrypt_pass=0 -dialin_config=/etc/mgetty+sendfax/dialin.config diff --git a/webmin/passwd/config b/webmin/passwd/config index 75e5ffcde..04110de95 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -input_type=0 max_users=200 +input_type=0 sort_mode=0 diff --git a/webmin/postfix/config b/webmin/postfix/config index 2b6de6a35..70e22c7a9 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ postfix_aliases_table_command=/usr/sbin/postalias +postfix_master=/etc/postfix/master.cf +postcat_cmd=/usr/sbin/postcat +top_buttons=1 +mailq_dir=/var/spool/postfix +mailq_sort=0 +postfix_config_command=/usr/sbin/postconf 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 +wrap_width=80 index_check=1 +prefix_cmts=0 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 -postfix_master=/etc/postfix/master.cf -mailq_dir=/var/spool/postfix -delete_warn=1 max_records=200 -postfix_lookup_table_command=/usr/sbin/postmap -max_maps=100 -check_config=1 -top_buttons=1 +postfix_config_file=/etc/postfix/main.cf +mailq_count=0 columns=2 -postfix_super_command=/usr/sbin/postsuper -prefix_cmts=0 mailq_cmd=postqueue -p -mailq_sort=0 +delete_warn=1 +check_config=1 +ldap_doms=0 +postfix_queue_command=postqueue +sort_mode=0 +perpage=20 +max_maps=100 +postfix_lookup_table_command=/usr/sbin/postmap +delete_confirm=1 +postfix_super_command=/usr/sbin/postsuper +fwd_mode=0 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index afb264fb0..98b97ba9a 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -nodbi=0 +access_own=0 +access=*: * +stop_cmd=/etc/init.d/postgresql* stop +dump_cmd=/usr/bin/pg_dump +max_text=1000 login=postgres -date_subs=0 +sameunix=1 +simple_sched=0 +plib= +max_dbs=50 +nodbi=0 +start_cmd=/etc/init.d/postgresql* start perpage=25 hba_conf=/etc/postgresql/*/main/pg_hba.conf -access_own=0 -start_cmd=/etc/init.d/postgresql* start +webmin_subs=0 basedb=template1 -max_dbs=50 +date_subs=0 blob_mode=0 -plib= -pass= -add_mode=1 -style=0 -simple_sched=0 -dump_cmd=/usr/bin/pg_dump -pid_file=/var/run/postmaster.pid -sameunix=1 -stop_cmd=/etc/init.d/postgresql* stop rstr_cmd=/usr/bin/pg_restore -max_text=1000 +pid_file=/var/run/postmaster.pid +add_mode=1 psql=/usr/bin/psql -access=*: * -webmin_subs=0 +style=0 +pass= diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 54849d0a2..5fd0f800c 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ wvdialconf=wvdialconf -wvdial=wvdial file=/etc/wvdial.conf +wvdial=wvdial diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index c838e9e3c..5c102211b 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ timeout=30 +peers_dir=/etc/ppp/peers +pptp_options=/etc/ppp/options.pptp pap_file=/etc/ppp/chap-secrets pptp=pptp -pptp_options=/etc/ppp/options.pptp -peers_dir=/etc/ppp/peers diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index 1707907fa..4f303d196 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -ppp_options=/etc/ppp/options -stop_cmd=/etc/init.d/pptpd stop +log_file=/var/log/messages +pid_file=/var/run/pptpd.pid pap_file=/etc/ppp/chap-secrets -pptp_ppp_options=/etc/ppp/pptpd-options +stop_cmd=/etc/init.d/pptpd stop +start_cmd=/etc/init.d/pptpd start file=/etc/pptpd.conf +pptp_ppp_options=/etc/ppp/pptpd-options +ppp_options=/etc/ppp/options pptpd=pptpd -pid_file=/var/run/pptpd.pid -log_file=/var/log/messages -start_cmd=/etc/init.d/pptpd start diff --git a/webmin/proc/config b/webmin/proc/config index 6e69a6bac..017b35cf2 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -hide_self=1 +trace_java=0 +base_ppid=1 default_mode=last cut_length=80 ps_style=linux -base_ppid=1 -trace_java=0 +hide_self=1 diff --git a/webmin/proftpd/config b/webmin/proftpd/config index ea8c68997..cce531967 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ +ftpusers=/etc/ftpusers +stop_cmd=/etc/init.d/proftpd stop test_manual=0 +start_cmd=/etc/init.d/proftpd start +pid_file=/var/run/proftpd.pid +proftpd_conf=/etc/proftpd/proftpd.conf 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 -ftpusers=/etc/ftpusers -start_cmd=/etc/init.d/proftpd start test_config=1 diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index ec36562a7..79b3eca05 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ +mailq_sort=0 +mail_dir_qmail=Maildir mail_dir= delete_warn=1 -max_records=200 -sort_mode=0 -qmail_dir=/var/qmail mail_file=Mailbox -fwd_mode=0 -mailq_sort=0 -perpage=20 mail_system=1 -mail_dir_qmail=Maildir columns=2 -index_min=1000000 mailq_count=0 +qmail_dir=/var/qmail +max_records=200 +fwd_mode=0 +index_min=1000000 +perpage=20 +sort_mode=0 diff --git a/webmin/quota/config b/webmin/quota/config index 23a814ea8..c356925fb 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ block_size=1024 -user_copy_command=edquota -u -p -group_edquota_command=edquota -g -show_grace=1 -group_copy_command=edquota -g -p -user_grace_command=edquota -u -t -pc_show=1 -quotacheck_command=quotacheck -u -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}. group_quotaon_command=quotaon -g user_repquota_command=repquota -u -v user_quotaon_command=quotaon -u +user_quotaoff_command=quotaoff -u +hide_uids=0 +group_repquota_command=repquota -g -v +sort_mode=0 group_grace_command=edquota -g -t -display_max=100 +user_copy_command=edquota -u -p +pc_show=1 group_quota_command=quota -v -g -group_repquota_command=repquota -g -v +quotacheck_command=quotacheck -u -g +user_quota_command=quota -v -u user_setquota_command=setquota -u +show_grace=1 group_quotaoff_command=quotaoff -g -group_setquota_command=setquota -g -user_quota_command=quota -v -u -user_edquota_command=edquota -u -sort_mode=0 -hide_uids=0 -user_quotaoff_command=quotaoff -u +user_grace_command=edquota -u -t +group_copy_command=edquota -g -p +email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the allowed quota. ${USED} of disk space is being used, out of a maximum of ${QUOTA}. +display_max=100 +group_edquota_command=edquota -g block_mode=1 +user_edquota_command=edquota -u +group_setquota_command=setquota -g diff --git a/webmin/raid/config b/webmin/raid/config index 8ffe6d468..4bd2da90e 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ -mdadm=/etc/mdadm/mdadm.conf mdstat=/proc/mdstat raidtab=/etc/raidtab +mdadm=/etc/mdadm/mdadm.conf diff --git a/webmin/samba/config b/webmin/samba/config index b60e6dc23..f3b8ab8cf 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -swat=/usr/sbin/swat net=/usr/bin/net -smbgroupedit=/usr/bin/smbgroupedit -samba_status_program=/usr/bin/smbstatus -dont_convert=-499 -text_lists=0 -run_from_inetd=0 +restart_cmd=service smbd restart ; service nmbd restart smb_conf=/etc/samba/smb.conf -samba_server=/usr/sbin/smbd +text_lists=0 smb_passwd=/etc/samba/smbpasswd +run_from_inetd=0 +name_server=/usr/sbin/nmbd +samba_password_program=/usr/bin/smbpasswd 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 +samba_server=/usr/sbin/smbd +smbgroupedit=/usr/bin/smbgroupedit sort_mode=0 +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' pdbedit=/usr/bin/pdbedit -samba_password_program=/usr/bin/smbpasswd -name_server=/usr/sbin/nmbd +samba_status_program=/usr/bin/smbstatus stop_cmd=service smbd stop ; service nmbd stop +swat=/usr/sbin/swat +dont_convert=-499 diff --git a/webmin/sarg/config b/webmin/sarg/config index 75406f229..972712fc6 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -naked=0 clear=1 -sarg=sarg +naked=0 sarg_conf=/etc/sarg/sarg.conf +sarg=sarg diff --git a/webmin/sendmail/config b/webmin/sendmail/config index c4b6ef4ea..895718025 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -mailq_count=0 -mail_style=0 -index_min=1000000 -perpage=20 -order_mail=0 -fwd_mode=0 -mail_file=mbox -delete_confirm=1 -track_read=0 -sendmail_command=/usr/lib/sendmail -bd -q1h -sendmail_features=/usr/share/sendmail/cf -show_cmts=0 +smrsh_dir=/etc/smrsh wrap_width=80 -sort_mode=0 -sendmail_pid=/var/run/sendmail/mta/sendmail.pid +show_cmts=0 +prefix_cmts=0 +index_min=1000000 +makemap_path=makemap mail_type=0 -columns=2 +max_records=200 top_buttons=1 sendmail_cf=/etc/mail/sendmail.cf -smrsh_dir=/etc/smrsh +mail_file=mbox +mail_dir=/var/spool/mail mailq_sort=0 -prefix_cmts=0 -show_to=0 -sendmail_mc=/etc/mail/sendmail.mc +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +track_read=0 +sort_mode=0 sendmail_path=/usr/lib/sendmail -mail_dir=/var/spool/mail +perpage=20 +delete_confirm=1 +fwd_mode=0 +sendmail_command=/usr/lib/sendmail -bd -q1h +columns=2 +mailq_count=0 +order_mail=0 +sendmail_features=/usr/share/sendmail/cf +show_to=0 delete_warn=1 -max_records=200 +sendmail_mc=/etc/mail/sendmail.mc mailq_show=Date,From,To,Size,Status -makemap_path=makemap +mail_style=0 diff --git a/webmin/servers/config b/webmin/servers/config index 22d85a078..f28855fb0 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -show_status=1 -resolve=1 scan_time=5 -deflink=0 -capath=/usr/share/ca-certificates sort_mode=0 +max_servers=100 +show_status=1 deffast=2 +groups_dir=/etc/cluster/groups show_ip=0 -max_servers=100 display_mode=0 -groups_dir=/etc/cluster/groups +deflink=0 +capath=/usr/share/ca-certificates +resolve=1 diff --git a/webmin/shell/config b/webmin/shell/config index ae2fea776..044e158ce 100644 --- a/webmin/shell/config +++ b/webmin/shell/config @@ -1,3 +1,3 @@ -max_runtime=86400 -max_output=100000 clear_envs=0 +max_output=100000 +max_runtime=86400 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 733134c02..65ed270b9 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -macros=/usr/share/shorewall display_zone_descriptions=1 +config_dir=/etc/shorewall shorewall=shorewall +macros=/usr/share/shorewall actions=/etc/shorewall/actions /usr/share/shorewall/actions.std -config_dir=/etc/shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index c23fc47f1..a9434ece0 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ +actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std macros=/usr/share/shorewall6 +config_dir=/etc/shorewall6 shorewall6=shorewall6 display_zone_descriptions=1 -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -config_dir=/etc/shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index fadfec290..80a802176 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ -smartctl=smartctl ata=0 attribs=1 mode=1 +smartctl=smartctl diff --git a/webmin/software/config b/webmin/software/config index 9476e6757..c93f3edb6 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ -apt_mode=0 update_system=apt package_system=debian +apt_mode=0 diff --git a/webmin/spam/config b/webmin/spam/config index 02960f0b4..a36a07aa9 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -max_awl=200 -call_spam=1 -sa_learn=sa-learn -restart_cmd=/etc/init.d/spamassassin restart local_cf=/etc/spamassassin/local.cf -procmail_cmd=* +addto=0 +warn_procmail=1 spamassassin=spamassassin procmailrc=/etc/procmailrc -warn_procmail=1 -addto=0 -processes=spamd amavisd mode=0 +max_awl=200 +processes=spamd amavisd +procmail_cmd=* +sa_learn=sa-learn +call_spam=1 +restart_cmd=/etc/init.d/spamassassin restart diff --git a/webmin/squid/config b/webmin/squid/config index 0ac6b63e3..e9d27eb1f 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ +sort_conf=0 +sync_delete=0 sync_create=0 -cal_fmt=w +sync_modify=1 +cal_max=50000 +squid_start=service squid start cache_dir=/var/spool/squid -cal_all=1 -crypt_conf=0 -squid_conf=/etc/squid/squid.conf -cal_args=-aw -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +squid_stop=service squid stop log_dir=/var/log/squid +cal_args=-aw +crypt_conf=0 squid_restart=service squid reload -sort_conf=0 -sync_modify=1 -squid_stop=service squid stop -cal_max=50000 +squidclient=squidclient calamaris=calamaris pid_file=/var/run/squid.pid -squid_start=service squid start +squid_conf=/etc/squid/squid.conf restart_pos=0 +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi squid_path=squid -sync_delete=0 -squidclient=squidclient +cal_all=1 +cal_fmt=w diff --git a/webmin/sshd/config b/webmin/sshd/config index d4bfadc9c..5bfac3bd4 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -sync_pass=0 -sshd_path=/usr/sbin/sshd -sync_auth=1 +sync_create=0 sshd_config=/etc/ssh/sshd_config +stop_cmd=service ssh stop +sync_auth=1 +sync_pass=0 +sync_gnupg=0 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 -sync_gnupg=0 +sshd_path=/usr/sbin/sshd start_cmd=service ssh start diff --git a/webmin/status/config b/webmin/status/config index ad4d44344..8193d3e2c 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ -sysinfo=0 -index_status=1 columns=2 -output=0 +subject_mode=0 sched_offset=0 +sysinfo=0 +output=0 +index_status=1 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 +snmp_version=2 sort_mode=0 +snmp_trap=1.3.6.1.4.1.10000.1.1 history_purge=30 +pager_cmd=sms_client diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index 0cc8517ef..a4bcc547f 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -lines=20 -stop_cmd=/etc/init.d/syslog-ng stop +pid_file=/var/run/syslog-ng.pid +compressed=1 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 +lines=20 +stop_cmd=/etc/init.d/syslog-ng stop diff --git a/webmin/syslog/config b/webmin/syslog/config index 05261bf57..040208af4 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -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= -others=1 restart_cmd=/usr/sbin/service rsyslog restart +others=1 +pri_all=1 tags=0 +facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 m4_conf=0 -pipe=1 +m4_path= +reverse=0 start_cmd=/usr/sbin/service rsyslog start +pri_dir=1 syslogd=/usr/sbin/rsyslogd +signal_cmd=/usr/sbin/service rsyslog restart +pipe=1 +sync=1 +socket=0 compressed=1 +syslog_conf=/etc/rsyslog.conf +lines=20 diff --git a/webmin/system-status/config b/webmin/system-status/config index b6a7e4155..c627a9fec 100644 --- a/webmin/system-status/config +++ b/webmin/system-status/config @@ -1,2 +1,2 @@ -collect_interval=5 collect_pkgs=1 +collect_interval=5 diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config index 10eceba4d..bfd2d19d4 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_allow=/etc/hosts.allow +hosts_deny=/etc/hosts.deny diff --git a/webmin/telnet/config b/webmin/telnet/config index d87524763..1c000fc6a 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ +detach=0 mode=1 -no_test=0 sizemode=0 -detach=0 proxy=0 +no_test=0 diff --git a/webmin/time/config b/webmin/time/config index 129e4c6e5..79b40be2b 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,5 +1,5 @@ timeserver_hardware=1 seconds=1 +ntp_only=1 lease=5 zone_style=linux -ntp_only=1 diff --git a/webmin/useradmin/config b/webmin/useradmin/config index dfd5a42cb..891d73cec 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -empty_mode=0 -base_gid=1000 -display_mode=1 -home_style=0 -delete_root=0 -shadow_file=/etc/shadow -uid_mode=1 -random_password=0 -base_uid=1000 -passwd_file=/etc/passwd -membox=0 +selinux_con=user_u:object_r:user_home_dir_t email_type=0 -md5=1 -delete_only=0 -extra_real=0 default_group=users -lock_string=* -secmode=0 +homedir_perms=0755 user_files=/etc/skel -passwd_dict=0 -passwd_progmode=0 -gid_calc=0 -gshadow_file=/etc/gshadow +default_other=1 gid_mode=1 -sort_mode=0 -last_show=0 -shells=fixed,passwd,shells -selinux_con=user_u:object_r:user_home_dir_t +delete_only=0 +lock_string=* from_files=0 -passwd_same=0 -skip_md5=0 -default_other=1 +passwd_file=/etc/passwd +base_uid=1000 +last_show=0 +md5=1 +sort_mode=0 +delete_root=0 +random_password=0 alias_check=0 -new_user_gid=0 home_base=/home +passwd_same=0 +gid_calc=0 +display_mode=1 +home_style=0 +secmode=0 +uid_calc=0 +display_max=400 +gshadow_file=/etc/gshadow +new_user_group=0 +empty_mode=0 passwd_stars=0 -homedir_perms=0755 +skip_md5=0 +new_user_gid=0 +shadow_file=/etc/shadow +shells=fixed,passwd,shells +membox=0 +passwd_progmode=0 +uid_mode=1 group_file=/etc/group -new_user_group=0 -display_max=400 -uid_calc=0 +passwd_dict=0 +extra_real=0 +base_gid=1000 diff --git a/webmin/usermin/config b/webmin/usermin/config index 0ce65ea95..94d19cb4d 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -usermin_dir=/etc/usermin -upshow=1 -updays=1 -update=0 upmissing=0 -cron_mode=0 +update=0 +updays=1 uphour=4 +upshow=1 +usermin_dir=/etc/usermin +cron_mode=0 diff --git a/webmin/version b/webmin/version index 1dba347a3..35d5b07dc 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.954 +1.955 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index d9ce83ec9..544233141 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ +webalizer_conf=/etc/webalizer/webalizer.conf naked=0 -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 +auto=apache,squid,proftpd,wuftpd +skip_old=0 diff --git a/webmin/webmin/config b/webmin/webmin/config index 95e8517c9..23d041b96 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ -upmissing=0 upmins=47 +cron_mode=0 update=0 -osdn=1 -last_version_number=1.900 -last_version_check=1549050668 updays=1 -upshow=1 -uphour=23 -cron_mode=0 +last_version_number=1.900 +upmissing=0 warn_days=7 letsencrypt_dns_wait=10 +osdn=1 +upshow=1 +last_version_check=1549050668 +uphour=23 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index 2b19b03da..ebd746c3c 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ ftpgroups=/etc/wu-ftpd/ftpgroups -pid_file=/var/run/ftpd.pids-all -ftphosts=/etc/wu-ftpd/ftphosts ftpusers=/etc/wu-ftpd/ftpusers -ftpconversions=/etc/wu-ftpd/ftpconversions -log_file=/var/log/xferlog ftpd_path=/usr/sbin/wu-ftpd +pid_file=/var/run/ftpd.pids-all +log_file=/var/log/xferlog +ftpconversions=/etc/wu-ftpd/ftpconversions ftpaccess=/etc/wu-ftpd/ftpaccess +ftphosts=/etc/wu-ftpd/ftphosts diff --git a/webmin/xinetd/config b/webmin/xinetd/config index db68ed3e8..709f2b49e 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ pid_file=/var/run/xinetd.pid xinetd_conf=/etc/xinetd.conf -protocols_file=/etc/protocols lookup_servs=1 start_cmd=/etc/init.d/xinetd start +protocols_file=/etc/protocols -- 2.43.0