From 305e8625f192321ddd752cc9006033fea3bfb7d3 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Tue, 5 Jul 2022 07:02:22 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.2 amd64 -isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.2 amd64 +isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.3 amd64 +isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.3 amd64 -webmin 1.995 all +webmin 1.996 all --- .etckeeper | 2 + apparmor.d/sbin.dhclient | 6 +++ webmin/.post-install | 2 + webmin/.pre-install | 1 + webmin/acl/config | 2 +- webmin/adsl-client/config | 8 ++-- webmin/ajaxterm/config | 2 +- webmin/apache/config | 30 ++++++------ webmin/at/config | 2 +- webmin/backup-config/config | 2 +- webmin/bacula-backup/config | 18 ++++---- webmin/bandwidth/config | 2 +- webmin/bind8/config | 72 ++++++++++++++--------------- webmin/cluster-passwd/config | 2 +- webmin/cluster-useradmin/config | 12 ++--- webmin/cluster-usermin/config | 2 +- webmin/config | 50 ++++++++++---------- webmin/cpan/config | 6 +-- webmin/cron/config | 38 +++++++-------- webmin/custom/config | 2 +- webmin/dhcpd/config | 24 +++++----- webmin/dovecot/config | 2 +- webmin/exim/config | 8 ++-- webmin/exports/config | 2 +- webmin/fail2ban/config | 4 +- webmin/fetchmail/config | 6 +-- webmin/filter/config | 8 ++-- webmin/firewall/config | 8 ++-- webmin/firewall6/config | 6 +-- webmin/fsdump/config | 8 ++-- webmin/grub/config | 2 +- webmin/heartbeat/config | 18 ++++---- webmin/htaccess-htpasswd/config | 10 ++-- webmin/inetd/config | 20 ++++---- webmin/init/config | 24 +++++----- webmin/ipfilter/config | 10 ++-- webmin/ipfw/config | 6 +-- webmin/ipsec/config | 10 ++-- webmin/iscsi-client/config | 6 +-- webmin/iscsi-server/config | 2 +- webmin/iscsi-target/config | 8 ++-- webmin/iscsi-tgtd/config | 4 +- webmin/jabber/config | 4 +- webmin/ldap-client/config | 2 +- webmin/ldap-server/config | 10 ++-- webmin/ldap-useradmin/config | 30 ++++++------ webmin/logrotate/config | 4 +- webmin/logviewer/config | 2 +- webmin/lpadmin/config | 20 ++++---- webmin/lvm/config | 2 +- webmin/mailboxes/config | 82 ++++++++++++++++----------------- webmin/man/config | 8 ++-- webmin/miniserv.conf | 2 +- webmin/mon/config | 6 +-- webmin/mount/config | 12 ++--- webmin/mysql/config | 34 +++++++------- webmin/nis/config | 4 +- webmin/openslp/config | 4 +- webmin/package-updates/config | 2 +- webmin/pap/config | 8 ++-- webmin/passwd/config | 4 +- webmin/postfix/config | 42 ++++++++--------- webmin/postgresql/config | 34 +++++++------- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 10 ++-- webmin/proc/config | 8 ++-- webmin/procmail/config | 2 +- webmin/proftpd/config | 12 ++--- webmin/qmailadmin/config | 16 +++---- webmin/quota/config | 34 +++++++------- webmin/raid/config | 2 +- webmin/samba/config | 22 ++++----- webmin/sarg/config | 6 +-- webmin/sendmail/config | 44 +++++++++--------- webmin/servers/config | 16 +++---- webmin/shell/config | 2 +- webmin/shorewall/config | 6 +-- webmin/shorewall6/config | 4 +- webmin/smart-status/config | 2 +- webmin/software/config | 2 +- webmin/spam/config | 12 ++--- webmin/squid/config | 28 +++++------ webmin/sshd/config | 10 ++-- webmin/status/config | 16 +++---- webmin/syslog-ng/config | 6 +-- webmin/syslog/config | 26 +++++------ webmin/tcpwrappers/config | 2 +- webmin/telnet/config | 4 +- webmin/time/config | 6 +-- webmin/updown/config | 2 +- webmin/useradmin/config | 62 ++++++++++++------------- webmin/usermin/config | 8 ++-- webmin/version | 2 +- webmin/vgetty/config | 2 +- webmin/webalizer/config | 4 +- webmin/webmin/config | 14 +++--- webmin/wuftpd/config | 10 ++-- webmin/xinetd/config | 4 +- 98 files changed, 597 insertions(+), 586 deletions(-) create mode 100755 webmin/.post-install create mode 100755 webmin/.pre-install diff --git a/.etckeeper b/.etckeeper index e52dbcc34..85f348b0c 100755 --- a/.etckeeper +++ b/.etckeeper @@ -11310,6 +11310,8 @@ maybe chmod 0755 'w3m' maybe chmod 0644 'w3m/config' maybe chmod 0644 'w3m/mailcap' maybe chmod 0755 'webmin' +maybe chmod 0755 'webmin/.post-install' +maybe chmod 0755 'webmin/.pre-install' maybe chmod 0755 'webmin/.reload-init' maybe chmod 0755 'webmin/.restart-by-force-kill-init' maybe chmod 0755 'webmin/.restart-init' diff --git a/apparmor.d/sbin.dhclient b/apparmor.d/sbin.dhclient index b6e2b9dfa..1acc6b92c 100644 --- a/apparmor.d/sbin.dhclient +++ b/apparmor.d/sbin.dhclient @@ -17,6 +17,11 @@ @{PROC}/[0-9]*/net/ r, @{PROC}/[0-9]*/net/** r, + # dhclient wants to update its threads with functional names + # https://gitlab.com/apparmor/apparmor/-/merge_requests/730 + # see LP: #1918410 + owner @{PROC}/@{pid}/task/[0-9]*/comm rw, + /{,usr/}sbin/dhclient mr, # LP: #1197484 and LP: #1202203 - why is this needed? :( /{,usr/}bin/bash mr, @@ -32,6 +37,7 @@ # NetworkManager /{,var/}run/nm*conf r, /{,var/}run/sendsigs.omit.d/network-manager.dhclient*.pid lrw, + /{,var/}run/NetworkManager/dhclient*.pid lrw, /var/lib/NetworkManager/dhclient*.conf lrw, /var/lib/NetworkManager/dhclient*.lease* lrw, signal (receive) peer=/usr/sbin/NetworkManager, diff --git a/webmin/.post-install b/webmin/.post-install new file mode 100755 index 000000000..c60d4caa5 --- /dev/null +++ b/webmin/.post-install @@ -0,0 +1,2 @@ +#!/bin/sh +/bin/systemctl kill --signal=SIGHUP --kill-who=main webmin diff --git a/webmin/.pre-install b/webmin/.pre-install new file mode 100755 index 000000000..1a2485251 --- /dev/null +++ b/webmin/.pre-install @@ -0,0 +1 @@ +#!/bin/sh diff --git a/webmin/acl/config b/webmin/acl/config index c572bfa88..ee9b4c16b 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ +display=1 ssleay=/usr/bin/openssl order=0 -display=1 diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index 7955fec78..150d6fc95 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -pppoe_conf=/etc/ppp/pppoe.conf -pppoe_cmd=pppoe +start_cmd=adsl-start stop_cmd=adsl-stop status_cmd=adsl-status -conf_style=0 -start_cmd=adsl-start pap_file=/etc/ppp/pap-secrets +pppoe_conf=/etc/ppp/pppoe.conf +pppoe_cmd=pppoe +conf_style=0 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 70e74169f..274ede510 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,25 +1,25 @@ -apply_cmd=/usr/sbin/apache2ctl graceful +httpd_path=/usr/sbin/apache2 +start_cmd=/etc/init.d/apache2 start +allow_virtualmin=0 stop_cmd=/etc/init.d/apache2 stop -max_servers=100 +apply_cmd=/usr/sbin/apache2ctl graceful show_names=0 +httpd_dir=/etc/apache2 mime_types=/etc/apache2/mime.types +test_always=0 format_config=1 -test_config=1 -apachectl_path=/usr/sbin/apache2ctl -access_conf=/etc/apache2/access.conf -test_apachectl=1 -auto_mods=1 -httpd_path=/usr/sbin/apache2 -show_order=0 link_dir=/etc/apache2/sites-enabled -test_manual=0 virt_file=/etc/apache2/sites-available +apachectl_path=/usr/sbin/apache2ctl +test_manual=0 +access_conf=/etc/apache2/access.conf httpd_conf=/etc/apache2/apache2.conf +defines_file=/etc/apache2/envvars +max_servers=100 show_list=0 -allow_virtualmin=0 -httpd_dir=/etc/apache2 +test_config=1 +test_apachectl=1 +auto_mods=1 defines_name=APACHE_ARGUMENTS srm_conf=/etc/apache2/srm.conf -start_cmd=/etc/init.d/apache2 start -defines_file=/etc/apache2/envvars -test_always=0 +show_order=0 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 7f0472b86..3bdfb1231 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -apply=1 date_subs=0 +apply=1 webmin_subs=0 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index 4ddad4ba8..176f910de 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -driver=Pg -btape=btape -user=bacula -db=bacula +bacula_dir=/etc/bacula +wait=1 pass= -apply=1 -init_start=0 +bls=bls +btape=btape +driver=Pg bextract=bextract +apply=1 showdirs=0 -wait=1 -bls=bls -bacula_dir=/etc/bacula +db=bacula +user=bacula +init_start=0 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 cffb0b93b..8dc4c94cb 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,46 +1,46 @@ -keygen=dnssec-keygen +allow_long=0 +relative_paths=0 +other_slaves=1 +largezones=0 +forwardzonefilename_format=ZONE.hosts +by_view=0 +named_conf=/etc/bind/named.conf +rev_must=0 +ndc_cmd=ndc force_random=0 -max_zones=50 -rndc_cmd=rndc master_ttl=1 -slave_dir=/var/lib/bind -named_conf=/etc/bind/named.conf -short_names=0 -reversezonefilename_format=ZONE.rev -rndc_conf=/etc/bind/rndc.conf +soa_style=0 +signzone=dnssec-signzone +keygen=dnssec-keygen named_path=/usr/sbin/named -confirm_zone=1 -confirm_rec=0 -ndc_cmd=ndc -by_view=0 -no_chroot=0 -dnssec_info=1 -allow_wild=1 -updserial_on=1 -checkzone=named-checkzone +records_order=0 +rndc_cmd=rndc +no_pid_chroot=0 +support_aaaa=1 +spf_record=0 ipv6_mode=1 -checkconf=named-checkconf +confirm_zone=1 +pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid +max_zones=50 updserial_man=1 -whois_cmd=whois -allow_comments=0 -allow_long=0 -other_slaves=1 -rev_def=0 -soa_start=0 -largezones=0 +show_list=0 updserial_def=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 master_dir=/var/lib/bind -show_list=0 -forwardzonefilename_format=ZONE.hosts -rev_must=0 -spf_record=0 +dnssec_info=1 +allow_comments=0 +slave_dir=/var/lib/bind +confirm_rec=0 +rev_def=0 +checkconf=named-checkconf zones_file=/etc/bind/named.conf.local rndcconf_cmd=rndc-confgen -signzone=dnssec-signzone -relative_paths=0 -soa_style=0 -support_aaaa=1 -no_pid_chroot=0 +checkzone=named-checkzone allow_underscore=1 -records_order=0 +whois_cmd=whois +allow_wild=1 +no_chroot=0 +short_names=0 +updserial_on=1 +rndc_conf=/etc/bind/rndc.conf +reversezonefilename_format=ZONE.rev diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 04110de95..1c1ed801d 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ +sort_mode=0 max_users=200 input_type=0 -sort_mode=0 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index 1e3e7d823..2265b0285 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -table_mode=0 -conf_allow_sync=1 -conf_add_user=1 conf_find_user=1 -conf_allow_refresh=1 -conf_host_links=1 conf_add_group=1 -conf_find_group=1 +conf_allow_refresh=1 sort_mode=0 +conf_find_group=1 +table_mode=0 +conf_host_links=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 b70167756..8c3d94d3e 100644 --- a/webmin/config +++ b/webmin/config @@ -1,33 +1,33 @@ +sysinfo=0 +lang_root=de.UTF-8 +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +real_os_type=Ubuntu Linux +os_type=debian-linux showlogin=0 -hostnamemode=0 -dateformat=dd/mon/yyyy -md5pass=1 +hostnamedisplay= +product=webmin +passwd_pindex=1 +ld_env=LD_LIBRARY_PATH showhost=0 +lang=en.UTF-8 +passwd_file=/etc/shadow +md5pass=0 +passwd_uindex=0 +real_os_version=18.04.1 webprefix= -ld_env=LD_LIBRARY_PATH -nofeedbackcc=0 path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -real_os_version=18.04.1 -passwd_pindex=1 -help_width= -passwd_file=/etc/shadow -feedback_to= -product=webmin -lang=en.UTF-8 -referers_none=1 +hostnamemode=0 +help_height= +theme=authentic-theme os_version=9.0 -passwd_mindex=4 -hostnamedisplay= -sysinfo=0 -real_os_type=Ubuntu Linux -by_view=0 -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -log=1 +feedback_to= passwd_cindex=2 -theme=authentic-theme -lang_root=de.UTF-8 -passwd_uindex=0 -help_height= -os_type=debian-linux +help_width= +nofeedbackcc=0 +log=1 +passwd_mindex=4 +referers_none=1 tempdelete_days=7 +by_view=0 +dateformat=dd/mon/yyyy md5pass=0 diff --git a/webmin/cpan/config b/webmin/cpan/config index 2eb974be6..4e3df3c14 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ save_partial=0 -refresh_days=30 -cpan=http://www.cpan.org/authors/id -packages=http://www.cpan.org/modules/02packages.details.txt.gz incyum=1 incpackages=1 +refresh_days=30 +packages=http://www.cpan.org/modules/02packages.details.txt.gz +cpan=http://www.cpan.org/authors/id diff --git a/webmin/cron/config b/webmin/cron/config index 00ff8a0be..85863bf26 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,26 +1,26 @@ -max_len=80 +cron_deny_all=2 +max_jobs=100 +init_name=cron kill_subs=0 +cron_user_edit_command=crontab -e +show_comment=0 +show_run=0 +cron_get_command=crontab -u USER -l cron_dir=/var/spool/cron/crontabs -init_name=cron +cronfiles_dir=/etc/cron.d +match_mode=0 +cron_edit_command=crontab -u USER -e cron_input=1 -cron_get_command=crontab -u USER -l -run_parts=run-parts -system_crontab=/etc/crontab -cron_deny_all=2 show_next=0 -show_run=0 +hourly_only=0 +show_time=0 +system_crontab=/etc/crontab +cron_deny_file=/var/spool/cron/deny +vixie_cron=1 cron_user_delete_command=crontab -r +run_parts=run-parts +cron_delete_command=crontab -u USER -r +max_len=80 cron_user_get_command=crontab -l -show_time=0 -match_user=1 -cron_edit_command=crontab -u USER -e -hourly_only=0 cron_allow_file=/var/spool/cron/allow -cron_delete_command=crontab -u USER -r -max_jobs=100 -cronfiles_dir=/etc/cron.d -match_mode=0 -cron_user_edit_command=crontab -e -vixie_cron=1 -show_comment=0 -cron_deny_file=/var/spool/cron/deny +match_user=1 diff --git a/webmin/custom/config b/webmin/custom/config index 14aa50381..a4b4fdede 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -display_mode=0 params_file=0 columns=2 params_cmd=0 +display_mode=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index d37d98d9b..e93c74f93 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,17 +1,17 @@ -group_name=0 -dhcpd_conf=/etc/dhcp/dhcpd.conf -start_cmd=service isc-dhcp-server start -restart_cmd=service isc-dhcp-server restart -pid_file=/var/run/dhcpd.pid +lease_sort=0 show_mac=0 -display_max=100 -desc_name=0 -interfaces_type=debian +pid_file=/var/run/dhcpd.pid show_ip=0 lease_file=/var/lib/dhcp/dhcpd.leases -lease_tz=0 -lease_sort=0 dhcpd_path=/usr/sbin/dhcpd -dhcpd_nocols=5 -stop_cmd=service isc-dhcp-server stop +restart_cmd=service isc-dhcp-server restart +display_max=100 +dhcpd_conf=/etc/dhcp/dhcpd.conf lease_vendor=0 +desc_name=0 +lease_tz=0 +stop_cmd=service isc-dhcp-server stop +group_name=0 +dhcpd_nocols=5 +interfaces_type=debian +start_cmd=service isc-dhcp-server start diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 3b7bed0ed..d6e9d8483 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ dovecot_config=/etc/dovecot/dovecot.conf pid_file=/var/run/dovecot/master.pid -init_script=dovecot dovecot=/usr/sbin/dovecot +init_script=dovecot diff --git a/webmin/exim/config b/webmin/exim/config index ef1ee9d12..b26297268 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_dbmfile=/etc/exim4/local_domains +exim_dir=/etc/exim4 exim_addrfile=/etc/exim4/email-addresses exim_virt_dir=/etc/exim4/aliases -exim_dir=/etc/exim4 -exim_aliasfileext= -exim_dbmext=.dbm exim_mail_file=Maildir mail_system=1 +exim_aliasfileext= +exim_dbmext=.dbm +exim_dbmfile=/etc/exim4/local_domains diff --git a/webmin/exports/config b/webmin/exports/config index 8f8b567ee..5a48ca66f 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ -exports_file=/etc/exports apply_cmd=exportfs -r restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi +exports_file=/etc/exports diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index 0d1a71684..38e02282a 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ +client_cmd=/usr/bin/fail2ban-client server_cmd=/usr/bin/fail2ban-server -init_script=fail2ban config_dir=/etc/fail2ban -client_cmd=/usr/bin/fail2ban-client +init_script=fail2ban diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 8009c89b3..d94dbf45b 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ -view_mode=0 -fetchmail_path=fetchmail -config_file= max_users=400 daemon_user=root +fetchmail_path=fetchmail +config_file= +view_mode=0 pid_file=/var/run/fetchmail.pid diff --git a/webmin/filter/config b/webmin/filter/config index a551ef711..c51b83776 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ -reply_force=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 warn_procmail=1 -virtualmin_config=/etc/webmin/virtual-server -alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases +forward_procmail=0 +reply_force=0 diff --git a/webmin/firewall/config b/webmin/firewall/config index dd0788880..e3b0f7d4f 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -force_init=0 -view_condition=1 -cluster_mode=1 +view_comment=0 comment_mod=0 +cluster_mode=1 +view_condition=1 +force_init=0 direct=0 -view_comment=0 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 0dadcf4d4..dd08f55a4 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -cluster_mode=1 direct=0 -comment_mod=0 force_init=0 -view_condition=1 view_comment=0 +view_condition=1 +comment_mod=0 +cluster_mode=1 diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 2d0c473a0..794da0b20 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ date_subs=0 -simple_sched=0 error_email=0 -webmin_subs=0 -nonewtape=0 -run_mode=0 always_tar=0 +run_mode=0 +nonewtape=0 +simple_sched=0 +webmin_subs=0 diff --git a/webmin/grub/config b/webmin/grub/config index 2bb2e4e49..98bdc19a6 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ grub_path=grub -install=(hd0) menu_file=/boot/grub/menu.lst +install=(hd0) diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 71f56c61d..f87828785 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -authkeys= -alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf -ha_cf= -serials=/dev/ttyS* -start_cmd=/etc/init.d/heartbeat start pid_file=/var/run/heartbeat.pid +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf ha_dir=/etc/ha.d -resource_d= +heartbeat=/usr/lib/heartbeat/heartbeat req_resource_cmd=/usr/lib/heartbeat/req_resource alt_haresources=/usr/share/doc/packages/heartbeat/haresources -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys -heartbeat=/usr/lib/heartbeat/heartbeat +stop_cmd=/etc/init.d/heartbeat stop +start_cmd=/etc/init.d/heartbeat start +resource_d= +serials=/dev/ttyS* +ha_cf= +authkeys= apply_cmd=/etc/init.d/heartbeat reload haresources= -stop_cmd=/etc/init.d/heartbeat stop diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index dacc158d0..98e69d4fe 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -md5=1 -extra_directives= -htpasswd=.htpasswd htgroups=.htgroups -htaccess=.htaccess -digest=1 sort=0 sha1=0 +extra_directives= +htaccess=.htaccess +md5=1 +htpasswd=.htpasswd +digest=1 diff --git a/webmin/inetd/config b/webmin/inetd/config index 9d2722284..8f5ca06c5 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -tcpd_path=/usr/sbin/tcpd +qm_mode=0 display_max=100 -rpc_file=/etc/rpc -allow_file=/etc/hosts.allow -rpc_inetd=1 +tcpd_path=/usr/sbin/tcpd services_file=/etc/services +rpc_protocols=tcp udp +rpc_inetd=1 inetd_conf_file=/etc/inetd.conf -sort_mode=0 ipv6=0 +extended_inetd=1 +sort_mode=0 +show_empty=1 +protocols_file=/etc/protocols deny_file=/etc/hosts.deny +rpc_file=/etc/rpc restart_command=killall -HUP inetd -protocols_file=/etc/protocols -qm_mode=0 -show_empty=1 -rpc_protocols=tcp udp -extended_inetd=1 +allow_file=/etc/hosts.allow diff --git a/webmin/init/config b/webmin/init/config index cb4095d8e..4c5b3e88b 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -show_opts=0 -order=0 +desc=1 +init_dir=/etc/init.d +reboot_command=reboot +init_base=/etc/ soft_links=1 -init_info=1 -inittab_id=id atboot_product=webmin -init_base=/etc/ -no_chkconfig=0 -status_check=0 order_digits=2 -init_dir=/etc/init.d -sort_mode=0 -boot_levels=2 3 5 shutdown_command=poweroff -reboot_command=reboot -desc=1 +inittab_id=id +sort_mode=0 +order=0 +init_info=1 expert=0 +status_check=0 +boot_levels=2 3 5 +no_chkconfig=0 +show_opts=0 diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 0c4481112..f1925bca4 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ +ipf=ipf +ipnat_conf=/etc/ipf/ipnat.conf +view_comment=0 +ipnat=ipnat ipfstat=ipfstat +cluster_nat=1 ipf_conf=/etc/ipf/ipf.conf -view_comment=0 -ipnat_conf=/etc/ipf/ipnat.conf -ipf=ipf cluster_mode=0 -ipnat=ipnat view_condition=1 -cluster_nat=1 diff --git a/webmin/ipfw/config b/webmin/ipfw/config index b92066caa..f0d2b384d 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ +cluster_mode=0 +view_condition=1 +ipfw=/sbin/ipfw view_counters=0 version=2 -ipfw=/sbin/ipfw -view_condition=1 view_comment=0 -cluster_mode=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 9b88cffbb..05b53812a 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ -file=/etc/ipsec.conf -secrets=/etc/ipsec.secrets ipsec=/usr/sbin/ipsec -policies_dir=/etc/ipsec.d/policies -stop_cmd=/etc/init.d/ipsec stop -logfile=/var/log/messages restart_cmd=/etc/init.d/ipsec restart +policies_dir=/etc/ipsec.d/policies +file=/etc/ipsec.conf start_cmd=/etc/init.d/ipsec start +secrets=/etc/ipsec.secrets +logfile=/var/log/messages +stop_cmd=/etc/init.d/ipsec stop diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 192a65bef..f06ad41fc 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -iscsiiname=iscsi-iname init_name=open-iscsi -initiator_file=/etc/iscsi/initiatorname.iscsi -iscsiadm=iscsiadm config_file=/etc/iscsi/iscsid.conf +iscsiiname=iscsi-iname ifaces_dir=/var/lib/iscsi/ifaces +initiator_file=/etc/iscsi/initiatorname.iscsi +iscsiadm=iscsiadm diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index ccccd47c8..63f30ee69 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ iscsi_server=/usr/sbin/iscsi-target targets_file=/etc/iscsi/targets -pid_file=/var/run/iscsi-target.pid opts_file=/etc/sysconfig/netbsd-iscsi auths_file=/etc/iscsi/auths init_name=netbsd-iscsi +pid_file=/var/run/iscsi-target.pid diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 7f92b205c..7cac7cdbf 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ +initiators_file=/etc/iet/initiators.allow +opts_file=/etc/default/iscsitarget +init_name=iscsitarget config_file=/etc/iet/ietd.conf -ietadm=ietadm pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid -opts_file=/etc/default/iscsitarget +ietadm=ietadm targets_file=/etc/iet/targets.allow -initiators_file=/etc/iet/initiators.allow -init_name=iscsitarget diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 32ef099ea..90fc5bffd 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ tgtadm=tgtadm init_name=tgtd -tgtd=tgtd -tgtadmin=tgt-admin config_file=/etc/tgt/targets.conf +tgtadmin=tgt-admin +tgtd=tgtd diff --git a/webmin/jabber/config b/webmin/jabber/config index ca2b8b95c..62951c253 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -start_cmd=/etc/init.d/jabberd start -jabber_dir=/var/lib/jabber jabber_daemon=/usr/sbin/jabberd +start_cmd=/etc/init.d/jabberd start jabber_config=/etc/jabber/jabber.xml 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 4460f14f7..55d1e7111 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -auth_ldap=/etc/ldap.conf secret=/etc/ldap.secret init_name=nslcd +auth_ldap=/etc/ldap.conf diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index f947f9b77..32ac2512c 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ +start_cmd=/etc/init.d/slapd start schema_dir=/etc/ldap/schema -config_file=/etc/ldap/slapd.d browse_max=100 +ldap_user=openldap +config_file=/etc/ldap/slapd.d +init_name=slapd attr_count=6 -start_cmd=/etc/init.d/slapd start +slapd=slapd stop_cmd=/etc/init.d/slapd stop -init_name=slapd apply_cmd=/etc/init.d/slapd restart -slapd=slapd -ldap_user=openldap diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 5e7d7c86d..db4272001 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -samba_class=sambaSamAccount -given=0 -membox=0 -shells=fixed,ldap,passwd,shells +quota_support=0 +imap_class=SuSEeMailObject md5=0 +multi_fields=0 +shells=fixed,ldap,passwd,shells +membox=0 imap_folders=old public sent-mail +secmode=0 +imap_def=0 gecos=1 +auth_ldap=/etc/ldap.conf +samba_class=sambaSamAccount +given_order=0 +person=1 mailfmt=0 -imap_foldersep=. -alias_same=0 other_class=inetOrgPerson -secmode=0 samba_gclass=sambaGroup -auth_ldap=/etc/ldap.conf -given_order=0 -imap_class=SuSEeMailObject samba_def=0 -slappasswd=slappasswd -imap_def=0 -quota_support=0 ldap_tls=0 -multi_fields=0 -person=1 +given=0 imap_login=cyrus +slappasswd=slappasswd +imap_foldersep=. +alias_same=0 diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 13d7f4354..62ae7b26d 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -logrotate_conf=/etc/logrotate.conf +add_file=/etc/logrotate.d sort_mode=0 +logrotate_conf=/etc/logrotate.conf logrotate=logrotate -add_file=/etc/logrotate.d diff --git a/webmin/logviewer/config b/webmin/logviewer/config index 0a13fef3d..87bc80f4f 100644 --- a/webmin/logviewer/config +++ b/webmin/logviewer/config @@ -1,3 +1,3 @@ -lines=100 reverse=1 +lines=100 others=1 diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index a3883876d..6f5815c11 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ spool_dir=/var/spool/cups -smbclient_path=smbclient -model_path=/usr/share/foomatic/db /usr/share/ppd -iface_perms=755 +iface_owner=lp:lp driver_style=cups +show_status=0 +gs_lib= +start_cmd=/etc/init.d/cupsys start +iface_perms=755 +print_style=cups stop_cmd=/etc/init.d/cupsys stop display_mode=0 -show_jobs=0 +smbclient_path=smbclient +model_path=/usr/share/foomatic/db /usr/share/ppd sort_mode=0 -print_style=cups -show_status=0 -gs_path=gs +show_jobs=0 gs_fontpath= -iface_owner=lp:lp -gs_lib= +gs_path=gs iface_arg= -start_cmd=/etc/init.d/cupsys start diff --git a/webmin/lvm/config b/webmin/lvm/config index 63b743f61..a5ef0ed4d 100644 --- a/webmin/lvm/config +++ b/webmin/lvm/config @@ -1,2 +1,2 @@ -lvm_conf=/etc/lvm/lvm.conf show_table=0 +lvm_conf=/etc/lvm/lvm.conf diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index d0abe3a4d..248493577 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -top_buttons=2 -sync_modify=1 -show_size_below=0 -delete_warn=y -fwd_mode=0 -wrap_width=80 -mail_system=3 -link_mode=0 -vpopmail_dir=/home/vpopmail +show_sent=0 +show_count=0 +open_mode=0 +maildir_deleted=0 show_mail=0 -show_size=1 -show_delall=0 -no_orig_ip=0 +track_read=0 +mail_dir=Maildir +link_mode=0 +spam_buttons=mail +arrows=1 show_to=0 -spam_report= -show_count=0 -check_mod=1 +sort_mode=1 +noindex_hostname=0 html_edit=0 -no_crlf=0 +show_body=0 +show_size=1 +mail_file=Mailbox +sync_perms=0700 +vpopmail_dir=/home/vpopmail date_fmt=dmy -from_virtualmin=1 -show_unread=0 -mail_dir=Maildir -ignore_users_enabled=0 -mailbox_user=.usermin/mailbox -sync_delete=1 -sort_mode=1 -spam_buttons=mail +perpage=20 +top_buttons=2 +no_orig_ip=0 +sync_create=0 spam_del=0 -open_mode=0 -maildir_deleted=0 -track_read=0 +delete_warn=y +ignore_users= +mailbox_user=.usermin/mailbox +size_mode=1 +show_delall=0 +from_virtualmin=1 +fwd_mode=0 +log_read=0 max_records=200 no_mailer=0 view_html=0 -perpage=20 -log_read=0 -show_body=0 -html_quote=0 column_count=4 -mail_usermin=mail +mail_system=3 +no_crlf=0 +sig_file=* auto=1 -sync_perms=0700 -sync_create=0 -show_sent=0 -size_mode=1 -arrows=1 -noindex_hostname=0 +wrap_width=80 +spam_report= +mail_usermin=mail +sync_delete=1 +check_mod=1 +sync_modify=1 +ignore_users_enabled=0 +html_quote=0 +show_size_below=0 +show_unread=0 mail_style=0 -mail_file=Mailbox -sig_file=* -ignore_users= diff --git a/webmin/man/config b/webmin/man/config index bb0375975..fcf80888d 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -man_cmd=man PAGE +list_cmd_sect=man -w SECTION PAGE +man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man man_cmd_sect=man SECTION PAGE man2html_path=man2html -kernel_dir=/usr/src/linux/Documentation doc_dir=/usr/share/doc -list_cmd_sect=man -w SECTION PAGE search_cmd=man -k PAGE +kernel_dir=/usr/src/linux/Documentation +man_cmd=man PAGE list_cmd=man -w 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 ca55960ae..70ec9e25c 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.995 +server=MiniServ/1.996 diff --git a/webmin/mon/config b/webmin/mon/config index 36e33c561..b86608a66 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ pid_file=/var/run/mon.pid -restart_cmd=/etc/init.d/mon restart -start_cmd=/etc/init.d/mon start -cfbasedir=/etc/mon monshow=/usr/bin/monshow stop_cmd=/etc/init.d/mon stop +start_cmd=/etc/init.d/mon start +restart_cmd=/etc/init.d/mon restart mon_cgi=/var/www/cgi-bin/mon.cgi +cfbasedir=/etc/mon diff --git a/webmin/mount/config b/webmin/mount/config index 4aa74d305..0fb5df5a7 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -long_fstypes=1 -sysinfo=1 -nmblookup_path=nmblookup -auto_file=/etc/am-utils/amd.conf fstab_file=/etc/fstab -autofs_file=/etc/auto.master +auto_file=/etc/am-utils/amd.conf +long_fstypes=1 +smbclient_path=smbclient show_used=1 nfs_check=1 sort_mode=2 -smbclient_path=smbclient +autofs_file=/etc/auto.master +sysinfo=1 +nmblookup_path=nmblookup diff --git a/webmin/mysql/config b/webmin/mysql/config index cbc913633..103ae0d0e 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -mysqldump=/usr/bin/mysqldump +login=root +webmin_subs=0 nopwd=0 +mysql_data=/var/lib/mysql +nodbi=0 +mysqlimport=/usr/bin/mysqlimport +date_subs=0 +mysql_libs=/usr/local/mysql/lib max_dbs=50 -mysqlshow=/usr/bin/mysqlshow -perpage=25 mysql=/usr/bin/mysql -start_cmd=service mysql start -add_mode=1 -nodbi=0 -blob_mode=0 +mysqladmin=/usr/bin/mysqladmin +style=0 +passwd_mode=0 +perpage=25 max_text=1000 -login=root +access=*: * +blob_mode=0 +add_mode=1 my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf stop_cmd=service mysql stop -webmin_subs=0 -date_subs=0 -mysqlimport=/usr/bin/mysqlimport -mysql_data=/var/lib/mysql -passwd_mode=0 -access=*: * -mysqladmin=/usr/bin/mysqladmin -mysql_libs=/usr/local/mysql/lib -style=0 +mysqldump=/usr/bin/mysqldump +mysqlshow=/usr/bin/mysqlshow +start_cmd=service mysql start diff --git a/webmin/nis/config b/webmin/nis/config index e646d3aea..6dd3e9498 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ +manual_build=0 +max_size=100 nsswitch_conf=/etc/nsswitch.conf client_conf=/etc/yp.conf securenets=/etc/ypserv.securenets -max_size=100 -manual_build=0 diff --git a/webmin/openslp/config b/webmin/openslp/config index d5b561a8c..e817b10eb 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ slpd_conf=/etc/slp.conf slpd_pid=/var/run/slpd.pid -slpd_reg=/etc/slp.reg -slpd_log=/var/log/slpd.log 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/pap/config b/webmin/pap/config index 660b0a595..9662322bb 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -login_config=/etc/mgetty+sendfax/login.config mgetty=mgetty -ppp_options=/etc/ppp/options dialin_config=/etc/mgetty+sendfax/dialin.config -encrypt_pass=0 -serials=/dev/ttyS[0-9]* pap_file=/etc/ppp/pap-secrets +login_config=/etc/mgetty+sendfax/login.config +encrypt_pass=0 pppd=pppd +serials=/dev/ttyS[0-9]* +ppp_options=/etc/ppp/options diff --git a/webmin/passwd/config b/webmin/passwd/config index 294c79b71..2ab4c6af1 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -max_users=200 -sort_mode=0 input_type=0 +sort_mode=0 +max_users=200 diff --git a/webmin/postfix/config b/webmin/postfix/config index bde43bcef..6fa80ba49 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ -postfix_master=/etc/postfix/master.cf -sort_mode=0 -delete_confirm=1 -mailq_sort=0 -mailq_count=0 +perpage=20 +max_maps=100 mailq_cmd=postqueue -p -ldap_doms=0 +delete_warn=1 +show_cmts=0 +columns=2 +top_buttons=1 +postfix_super_command=/usr/sbin/postsuper +postfix_newaliases_command=/usr/bin/newaliases +prefix_cmts=0 +mailq_count=0 +postfix_config_command=/usr/sbin/postconf +wrap_width=80 postfix_aliases_table_command=/usr/sbin/postalias +mailq_sort=0 +sort_mode=0 +postfix_master=/etc/postfix/master.cf +check_config=1 index_check=1 -max_maps=100 -postfix_super_command=/usr/sbin/postsuper +delete_confirm=1 +postfix_lookup_table_command=/usr/sbin/postmap mailq_dir=/var/spool/postfix postfix_control_command=/usr/sbin/postfix postfix_config_file=/etc/postfix/main.cf -prefix_cmts=0 -postfix_config_command=/usr/sbin/postconf -perpage=20 -postcat_cmd=/usr/sbin/postcat -show_cmts=0 -columns=2 -postfix_lookup_table_command=/usr/sbin/postmap -delete_warn=1 -wrap_width=80 -postfix_queue_command=postqueue fwd_mode=0 -postfix_newaliases_command=/usr/bin/newaliases -check_config=1 -top_buttons=1 +ldap_doms=0 max_records=200 +postcat_cmd=/usr/sbin/postcat +postfix_queue_command=postqueue diff --git a/webmin/postgresql/config b/webmin/postgresql/config index add92b298..b248bdb9f 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -perpage=25 -pid_file=/var/run/postmaster.pid -start_cmd=/etc/init.d/postgresql* start -add_mode=1 -simple_sched=0 -blob_mode=0 -nodbi=0 -rstr_cmd=/usr/bin/pg_restore -max_text=1000 -login=postgres -max_dbs=50 -dump_cmd=/usr/bin/pg_dump -pass= +webmin_subs=0 plib= +basedb=template1 +login=postgres +nodbi=0 hba_conf=/etc/postgresql/*/main/pg_hba.conf +dump_cmd=/usr/bin/pg_dump +date_subs=0 sameunix=1 -basedb=template1 +max_dbs=50 +perpage=25 +rstr_cmd=/usr/bin/pg_restore style=0 -stop_cmd=/etc/init.d/postgresql* stop -webmin_subs=0 -date_subs=0 +pid_file=/var/run/postmaster.pid +blob_mode=0 access_own=0 +simple_sched=0 +pass= psql=/usr/bin/psql +add_mode=1 access=*: * +max_text=1000 +start_cmd=/etc/init.d/postgresql* start +stop_cmd=/etc/init.d/postgresql* stop diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 6525162d6..e9a9bd08c 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -pap_file=/etc/ppp/chap-secrets pptp=pptp -timeout=30 pptp_options=/etc/ppp/options.pptp +timeout=30 peers_dir=/etc/ppp/peers +pap_file=/etc/ppp/chap-secrets diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index b4bc0bd31..7dc0f5c41 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ +pid_file=/var/run/pptpd.pid +stop_cmd=/etc/init.d/pptpd stop +start_cmd=/etc/init.d/pptpd start +log_file=/var/log/messages +ppp_options=/etc/ppp/options pptp_ppp_options=/etc/ppp/pptpd-options file=/etc/pptpd.conf pap_file=/etc/ppp/chap-secrets -ppp_options=/etc/ppp/options pptpd=pptpd -stop_cmd=/etc/init.d/pptpd stop -log_file=/var/log/messages -start_cmd=/etc/init.d/pptpd start -pid_file=/var/run/pptpd.pid diff --git a/webmin/proc/config b/webmin/proc/config index 3743d078f..215df79d2 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -trace_java=0 -hide_self=1 -cut_length=80 base_ppid=1 -default_mode=last ps_style=linux +cut_length=80 +hide_self=1 +default_mode=last +trace_java=0 diff --git a/webmin/procmail/config b/webmin/procmail/config index d5df94749..5b184fd7c 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -includes=0 procmailrc=/etc/procmailrc +includes=0 procmail=procmail diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 7745c8c4d..0d5aca438 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ +proftpd_conf=/etc/proftpd/proftpd.conf test_manual=0 -stop_cmd=/etc/init.d/proftpd stop -ftpusers=/etc/ftpusers +test_config=1 +proftpd_path=/usr/sbin/proftpd start_cmd=/etc/init.d/proftpd start -pid_file=/var/run/proftpd.pid test_always=0 -proftpd_path=/usr/sbin/proftpd -test_config=1 -proftpd_conf=/etc/proftpd/proftpd.conf +ftpusers=/etc/ftpusers +stop_cmd=/etc/init.d/proftpd stop +pid_file=/var/run/proftpd.pid diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index da1b17541..5a1f6b904 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -mailq_sort=0 +index_min=1000000 +delete_warn=1 sort_mode=0 +columns=2 mail_file=Mailbox +mailq_sort=0 mail_dir= -index_min=1000000 -mail_system=1 -mail_dir_qmail=Maildir -qmail_dir=/var/qmail -mailq_count=0 perpage=20 +mailq_count=0 +qmail_dir=/var/qmail fwd_mode=0 -columns=2 -delete_warn=1 max_records=200 +mail_system=1 +mail_dir_qmail=Maildir diff --git a/webmin/quota/config b/webmin/quota/config index d0c2eaf2f..fb384daa2 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -group_quotaon_command=quotaon -g -user_edquota_command=edquota -u -display_max=100 -group_grace_command=edquota -g -t -user_grace_command=edquota -u -t -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_setquota_command=setquota -u -group_repquota_command=repquota -g -v user_quotaoff_command=quotaoff -u -user_repquota_command=repquota -u -v -user_copy_command=edquota -u -p +group_quotaoff_command=quotaoff -g +display_max=100 +pc_show=1 +show_grace=1 user_quotaon_command=quotaon -u group_edquota_command=edquota -g group_setquota_command=setquota -g +user_setquota_command=setquota -u user_quota_command=quota -v -u -block_mode=1 -block_size=1024 -group_quota_command=quota -v -g -pc_show=1 quotacheck_command=quotacheck -u -g -hide_uids=0 -group_quotaoff_command=quotaoff -g sort_mode=0 +group_quotaon_command=quotaon -g +user_grace_command=edquota -u -t +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_copy_command=edquota -g -p -show_grace=1 +group_repquota_command=repquota -g -v +block_size=1024 +user_repquota_command=repquota -u -v +group_quota_command=quota -v -g +group_grace_command=edquota -g -t +block_mode=1 +hide_uids=0 +user_edquota_command=edquota -u +user_copy_command=edquota -u -p diff --git a/webmin/raid/config b/webmin/raid/config index 7e973e1af..c4849915b 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ -raidtab=/etc/raidtab mdstat=/proc/mdstat mdadm=/etc/mdadm/mdadm.conf +raidtab=/etc/raidtab diff --git a/webmin/samba/config b/webmin/samba/config index e2a27a0d6..f67c79355 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -samba_password_program=/usr/bin/smbpasswd -sort_mode=0 +run_from_inetd=0 pdbedit=/usr/bin/pdbedit -name_server=/usr/sbin/nmbd swat=/usr/sbin/swat -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' -samba_server=/usr/sbin/smbd +smb_conf=/etc/samba/smb.conf text_lists=0 -restart_cmd=service smbd restart ; service nmbd restart +dont_convert=-499 +name_server=/usr/sbin/nmbd +samba_server=/usr/sbin/smbd +sort_mode=0 +samba_status_program=/usr/bin/smbstatus start_cmd=service smbd start ; service nmbd start -run_from_inetd=0 smbgroupedit=/usr/bin/smbgroupedit -samba_status_program=/usr/bin/smbstatus -net=/usr/bin/net -dont_convert=-499 -smb_conf=/etc/samba/smb.conf +samba_password_program=/usr/bin/smbpasswd stop_cmd=service smbd stop ; service nmbd stop +net=/usr/bin/net smb_passwd=/etc/samba/smbpasswd +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +restart_cmd=service smbd restart ; service nmbd restart diff --git a/webmin/sarg/config b/webmin/sarg/config index 2afcf8310..01e5d4b6f 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -sarg_conf=/etc/sarg/sarg.conf -naked=0 -sarg=sarg clear=1 +sarg=sarg +naked=0 +sarg_conf=/etc/sarg/sarg.conf diff --git a/webmin/sendmail/config b/webmin/sendmail/config index 47bb253a3..27ac05d06 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -delete_confirm=1 -mailq_sort=0 -mail_file=mbox sort_mode=0 -smrsh_dir=/etc/smrsh -mail_dir=/var/spool/mail -mail_style=0 index_min=1000000 -mailq_count=0 -sendmail_path=/usr/lib/sendmail -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -makemap_path=makemap -sendmail_cf=/etc/mail/sendmail.cf -sendmail_command=/usr/lib/sendmail -bd -q1h show_to=0 mail_type=0 -sendmail_features=/usr/share/sendmail/cf -show_cmts=0 -prefix_cmts=0 -order_mail=0 -mailq_show=Date,From,To,Size,Status -perpage=20 +mailq_sort=0 +mail_dir=/var/spool/mail fwd_mode=0 -wrap_width=80 -columns=2 -delete_warn=1 +sendmail_path=/usr/lib/sendmail +track_read=0 max_records=200 +sendmail_cf=/etc/mail/sendmail.cf +delete_confirm=1 +makemap_path=makemap +delete_warn=1 +columns=2 +mail_style=0 +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +show_cmts=0 sendmail_mc=/etc/mail/sendmail.mc top_buttons=1 -track_read=0 +mailq_show=Date,From,To,Size,Status +sendmail_features=/usr/share/sendmail/cf +smrsh_dir=/etc/smrsh +perpage=20 +mail_file=mbox +sendmail_command=/usr/lib/sendmail -bd -q1h +mailq_count=0 +wrap_width=80 +prefix_cmts=0 +order_mail=0 diff --git a/webmin/servers/config b/webmin/servers/config index 83ead12c0..ec43319ce 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -show_ip=0 -deffast=2 -capath=/usr/share/ca-certificates +resolve=1 +groups_dir=/etc/cluster/groups display_mode=0 max_servers=100 -scan_time=5 -deflink=0 -resolve=1 -sort_mode=0 +capath=/usr/share/ca-certificates show_status=1 -groups_dir=/etc/cluster/groups +show_ip=0 +sort_mode=0 +deflink=0 +scan_time=5 +deffast=2 diff --git a/webmin/shell/config b/webmin/shell/config index 044e158ce..4b3e40b52 100644 --- a/webmin/shell/config +++ b/webmin/shell/config @@ -1,3 +1,3 @@ -clear_envs=0 max_output=100000 max_runtime=86400 +clear_envs=0 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index c7f719b0e..dc238f69f 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -macros=/usr/share/shorewall +shorewall=shorewall display_zone_descriptions=1 -actions=/etc/shorewall/actions /usr/share/shorewall/actions.std +macros=/usr/share/shorewall config_dir=/etc/shorewall -shorewall=shorewall +actions=/etc/shorewall/actions /usr/share/shorewall/actions.std diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index 96f657a01..6d612cc2a 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ +shorewall6=shorewall6 macros=/usr/share/shorewall6 -display_zone_descriptions=1 config_dir=/etc/shorewall6 actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -shorewall6=shorewall6 +display_zone_descriptions=1 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index d018e42e0..1c8af5754 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ +attribs=1 smartctl=smartctl mode=1 ata=0 -attribs=1 diff --git a/webmin/software/config b/webmin/software/config index bf587ee21..037d899f3 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ -package_system=debian update_system=apt apt_mode=0 +package_system=debian diff --git a/webmin/spam/config b/webmin/spam/config index bde53ec28..63b5ca663 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -processes=spamd amavisd +procmail_cmd=* local_cf=/etc/spamassassin/local.cf -restart_cmd=/etc/init.d/spamassassin restart +procmailrc=/etc/procmailrc +mode=0 +processes=spamd amavisd call_spam=1 -procmail_cmd=* +sa_learn=sa-learn spamassassin=spamassassin max_awl=200 -mode=0 -sa_learn=sa-learn -procmailrc=/etc/procmailrc warn_procmail=1 addto=0 +restart_cmd=/etc/init.d/spamassassin restart diff --git a/webmin/squid/config b/webmin/squid/config index a8d5fb8db..19e293f32 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -sort_conf=0 -sync_delete=0 -cal_args=-aw -calamaris=calamaris -cal_max=50000 restart_pos=0 -pid_file=/var/run/squid.pid -squid_restart=service squid reload -squid_conf=/etc/squid/squid.conf -cal_all=1 -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi cache_dir=/var/spool/squid -squid_start=service squid start +sync_modify=1 +sync_delete=0 cal_fmt=w +pid_file=/var/run/squid.pid +log_dir=/var/log/squid +sort_conf=0 sync_create=0 +squid_restart=service squid reload +squid_start=service squid start squidclient=squidclient -sync_modify=1 +squid_path=squid +squid_conf=/etc/squid/squid.conf crypt_conf=0 -log_dir=/var/log/squid +calamaris=calamaris +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +cal_max=50000 +cal_all=1 +cal_args=-aw squid_stop=service squid stop -squid_path=squid diff --git a/webmin/sshd/config b/webmin/sshd/config index 817a6a025..0cfe4ace8 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -sshd_path=/usr/sbin/sshd -sync_auth=1 pid_file=/var/run/sshd.pid -start_cmd=service ssh start sync_pass=0 -stop_cmd=service ssh stop +client_config=/etc/ssh/ssh_config keygen_path=/usr/bin/ssh-keygen sync_create=0 +sync_auth=1 +sshd_path=/usr/sbin/sshd +stop_cmd=service ssh stop +start_cmd=service ssh start sshd_config=/etc/ssh/sshd_config sync_gnupg=0 -client_config=/etc/ssh/ssh_config diff --git a/webmin/status/config b/webmin/status/config index ae1fa3bad..53cac72f9 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,14 +1,14 @@ -sysinfo=0 +history_purge=30 +index_status=1 +subject_mode=0 +pinger=linux +history_show=50 snmp_version=2 -sched_offset=0 sysinfo_users=0 +sched_offset=0 output=0 -history_show=50 -sort_mode=0 -subject_mode=0 snmp_trap=1.3.6.1.4.1.10000.1.1 -index_status=1 +sysinfo=0 pager_cmd=sms_client -history_purge=30 +sort_mode=0 columns=2 -pinger=linux diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index b2856685d..5844016b7 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 -stop_cmd=/etc/init.d/syslog-ng stop -lines=20 syslogng_conf=/etc/syslog-ng/syslog-ng.conf +pid_file=/var/run/syslog-ng.pid compressed=1 +stop_cmd=/etc/init.d/syslog-ng stop syslogng_cmd=syslog-ng +lines=20 diff --git a/webmin/syslog/config b/webmin/syslog/config index dcb5b15d1..5527b640d 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -pipe=1 -m4_path= -tags=0 -reverse=0 -others=1 -sync=1 start_cmd=/usr/sbin/service rsyslog start -restart_cmd=/usr/sbin/service rsyslog restart -pid_file=/var/run/rsyslogd.pid -signal_cmd=/usr/sbin/service rsyslog restart -syslog_conf=/etc/rsyslog.conf -pri_all=1 +syslogd=/usr/sbin/rsyslogd compressed=1 +others=1 +syslog_conf=/etc/rsyslog.conf +restart_cmd=/usr/sbin/service rsyslog restart +sync=1 lines=20 -syslogd=/usr/sbin/rsyslogd +pipe=1 +m4_conf=0 +pri_all=1 +pid_file=/var/run/rsyslogd.pid +reverse=0 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 +m4_path= socket=0 -m4_conf=0 pri_dir=1 +tags=0 +signal_cmd=/usr/sbin/service rsyslog restart diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config index 9539a8514..161d92a01 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ +hosts_allow=/etc/hosts.allow hosts_deny=/etc/hosts.deny inetd_services=0 -hosts_allow=/etc/hosts.allow diff --git a/webmin/telnet/config b/webmin/telnet/config index a1751326a..69808889a 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ -detach=0 sizemode=0 -proxy=0 no_test=0 +proxy=0 +detach=0 mode=1 diff --git a/webmin/time/config b/webmin/time/config index 49e693e7b..819c29f65 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ +timeserver=0.pool.ntp.org seconds=1 ntp_only=1 -timeserver_hardware=1 -zone_style=linux lease=5 -timeserver=0.pool.ntp.org +zone_style=linux +timeserver_hardware=1 diff --git a/webmin/updown/config b/webmin/updown/config index 1f8745078..ca80dbe9b 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ -user=root dir=/ +user=root ddir=/ duser=root diff --git a/webmin/useradmin/config b/webmin/useradmin/config index 2b13dbc9c..661a389f0 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -gid_mode=1 -membox=0 +gid_calc=0 +passwd_stars=0 +gshadow_file=/etc/gshadow passwd_file=/etc/passwd -shells=fixed,passwd,shells -sort_mode=0 +default_group=users +email_type=0 +new_user_group=0 +shadow_file=/etc/shadow +delete_root=0 +user_files=/etc/skel +display_mode=1 home_style=0 -alias_check=0 passwd_dict=0 -md5=1 -random_password=0 -default_other=1 -delete_root=0 -default_group=users -uid_calc=0 -new_user_gid=0 extra_real=0 -empty_mode=0 -email_type=0 +new_user_gid=0 +base_gid=1000 +selinux_con=user_u:object_r:user_home_dir_t +alias_check=0 +gid_mode=1 base_uid=1000 +passwd_same=0 +default_other=1 +uid_calc=0 skip_md5=0 -from_files=0 -homedir_perms=0755 +display_max=400 passwd_progmode=0 -uid_mode=1 +group_file=/etc/group +md5=1 +last_show=0 +homedir_perms=0755 +sort_mode=0 +membox=0 secmode=0 -passwd_stars=0 -user_files=/etc/skel -display_mode=1 lock_string=* -home_base=/home -selinux_con=user_u:object_r:user_home_dir_t -shadow_file=/etc/shadow -last_show=0 -gshadow_file=/etc/gshadow -passwd_same=0 -new_user_group=0 +shells=fixed,passwd,shells delete_only=0 -display_max=400 -base_gid=1000 -gid_calc=0 -group_file=/etc/group +from_files=0 +uid_mode=1 +random_password=0 +home_base=/home +empty_mode=0 diff --git a/webmin/usermin/config b/webmin/usermin/config index 47ae3413f..36f06907c 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ -upmissing=0 -updays=1 -uphour=4 -cron_mode=0 upshow=1 +uphour=4 usermin_dir=/etc/usermin update=0 +updays=1 +upmissing=0 +cron_mode=0 diff --git a/webmin/version b/webmin/version index edb5242b5..1f83d6797 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.995 +1.996 diff --git a/webmin/vgetty/config b/webmin/vgetty/config index bb4eec4d2..00f79ad34 100644 --- a/webmin/vgetty/config +++ b/webmin/vgetty/config @@ -1,2 +1,2 @@ -vgetty_cmd=vgetty vgetty_config=/etc/mgetty+sendfax/voice.conf +vgetty_cmd=vgetty diff --git a/webmin/webalizer/config b/webmin/webalizer/config index 5480b3db4..fd3d0245a 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -auto=apache,squid,proftpd,wuftpd -alt_conf=/etc/webalizer/webalizer.conf.sample webalizer=/usr/bin/webalizer webalizer_conf=/etc/webalizer/webalizer.conf +auto=apache,squid,proftpd,wuftpd +alt_conf=/etc/webalizer/webalizer.conf.sample naked=0 skip_old=0 diff --git a/webmin/webmin/config b/webmin/webmin/config index 520e56c8b..cb939b82a 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ -uphour=23 -last_version_check=1549050668 cron_mode=0 -upshow=1 -update=0 +upmissing=0 upmins=47 +last_version_check=1549050668 +update=0 +warn_days=7 letsencrypt_dns_wait=10 +osdn=1 updays=1 -upmissing=0 +upshow=1 last_version_number=1.900 -warn_days=7 -osdn=1 +uphour=23 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index c613b3cc8..8ba082df5 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftpd_path=/usr/sbin/wu-ftpd -ftpconversions=/etc/wu-ftpd/ftpconversions -ftphosts=/etc/wu-ftpd/ftphosts -pid_file=/var/run/ftpd.pids-all log_file=/var/log/xferlog ftpaccess=/etc/wu-ftpd/ftpaccess -ftpgroups=/etc/wu-ftpd/ftpgroups +ftpconversions=/etc/wu-ftpd/ftpconversions +pid_file=/var/run/ftpd.pids-all ftpusers=/etc/wu-ftpd/ftpusers +ftpd_path=/usr/sbin/wu-ftpd +ftpgroups=/etc/wu-ftpd/ftpgroups +ftphosts=/etc/wu-ftpd/ftphosts diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 915498a30..d24bd2f52 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -lookup_servs=1 +start_cmd=/etc/init.d/xinetd start xinetd_conf=/etc/xinetd.conf pid_file=/var/run/xinetd.pid -start_cmd=/etc/init.d/xinetd start +lookup_servs=1 protocols_file=/etc/protocols -- 2.43.0