From: mhoellein Date: Sun, 7 Mar 2021 20:55:07 +0000 (+0100) Subject: committing changes in /etc made by "apt-get upgrade" X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=0a8c57249709fb03134bba3991609ba5be3a61d6;p=vserver committing changes in /etc made by "apt-get upgrade" Package changes: -libbrotli1 1.0.7-6ubuntu0.1 amd64 +libbrotli1 1.0.9-2+ubuntu20.04.1+deb.sury.org+1 amd64 -python3-update-manager 1:20.04.10.5 all +python3-update-manager 1:20.04.10.6 all -update-manager-core 1:20.04.10.5 all +update-manager-core 1:20.04.10.6 all -webmin 1.972 all +webmin 1.973 all --- diff --git a/init.d/webmin b/init.d/webmin index 988bb44be..b3ed40ce5 100755 --- a/init.d/webmin +++ b/init.d/webmin @@ -1,29 +1,77 @@ #!/bin/sh +# chkconfig: 235 99 10 +# description: web-based administration interface for Unix systems +# ### BEGIN INIT INFO -# Provides: webmin -# Required-Start: $network $syslog -# Required-Stop: $network -# Default-Start: 2 3 5 -# Default-Stop: -# Description: Webmin +# Provides: webmin +# Required-Start: $local_fs $network $syslog +# Required-Stop: $local_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: web-based administration interface for Unix systems +# Description: Webmin is a web-based interface for system administration +# for Unix. Using Webmin you can configure DNS, Samba, NFS, +# local/remote filesystems and more using your web browser. ### END INIT INFO +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="web-based administration interface for Unix systems" +NAME=Webmin +PIDFILE=/var/webmin/miniserv.pid +SCRIPTNAME=/etc/init.d/$NAME +START=/etc/webmin/start +STOP=/etc/webmin/stop +RELOAD=/etc/webmin/reload +LOCKFILE=/var/lock/subsys/webmin +CONFFILE=/etc/webmin/miniserv.conf + case "$1" in -'start') - /etc/webmin/start +start) + $START >/dev/null 2>&1 /dev/null 2>&1 + fi ;; -'stop') - /etc/webmin/stop +stop) + $STOP RETVAL=$? + if [ "$RETVAL" = "0" ]; then + rm -f $LOCKFILE + fi + ;; +status) + pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'` + if [ "$pidfile" = "" ]; then + pidfile=$PIDFILE + fi + if [ -s $pidfile ]; then + pid=`cat $pidfile` + kill -0 $pid >/dev/null 2>&1 + if [ "$?" = "0" ]; then + echo "$NAME (pid $pid) is running" + RETVAL=0 + else + echo "$NAME is stopped" + RETVAL=1 + fi + else + echo "$NAME is stopped" + RETVAL=1 + fi ;; -'restart') - $0 stop ; $0 start +restart) + $STOP ; $START + RETVAL=$? + ;; +reload|force-reload) + $RELOAD RETVAL=$? ;; *) - echo "Usage: $0 { start | stop }" + echo "Usage: $0 {start|stop|restart|reload|force-reload|status}" >&2 RETVAL=1 ;; esac exit $RETVAL + diff --git a/webmin/acl/config b/webmin/acl/config index ee9b4c16b..c572bfa88 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 afc9b3ab0..dc7653271 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -status_cmd=adsl-status -stop_cmd=adsl-stop -pppoe_cmd=pppoe start_cmd=adsl-start -pap_file=/etc/ppp/pap-secrets +pppoe_cmd=pppoe pppoe_conf=/etc/ppp/pppoe.conf +status_cmd=adsl-status +stop_cmd=adsl-stop conf_style=0 +pap_file=/etc/ppp/pap-secrets diff --git a/webmin/apache/config b/webmin/apache/config index 0a266b22c..ce91c6e97 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -httpd_dir=/etc/apache2 -httpd_conf=/etc/apache2/apache2.conf -defines_file=/etc/apache2/envvars -show_order=0 -start_cmd=/etc/init.d/apache2 start defines_name=APACHE_ARGUMENTS -max_servers=100 +stop_cmd=/etc/init.d/apache2 stop +httpd_dir=/etc/apache2 allow_virtualmin=0 -show_names=0 +show_list=0 +httpd_conf=/etc/apache2/apache2.conf httpd_path=/usr/sbin/apache2 +access_conf=/etc/apache2/access.conf +test_manual=0 +test_always=0 virt_file=/etc/apache2/sites-available -show_list=0 -apply_cmd=/usr/sbin/apache2ctl graceful -test_config=1 apachectl_path=/usr/sbin/apache2ctl -test_always=0 -srm_conf=/etc/apache2/srm.conf -stop_cmd=/etc/init.d/apache2 stop auto_mods=1 -test_manual=0 -link_dir=/etc/apache2/sites-enabled +show_order=0 +start_cmd=/etc/init.d/apache2 start mime_types=/etc/apache2/mime.types +defines_file=/etc/apache2/envvars +apply_cmd=/usr/sbin/apache2ctl graceful +show_names=0 +link_dir=/etc/apache2/sites-enabled test_apachectl=1 -access_conf=/etc/apache2/access.conf +test_config=1 +max_servers=100 +srm_conf=/etc/apache2/srm.conf diff --git a/webmin/at/config b/webmin/at/config index abf2f6455..6f83c111c 100644 --- a/webmin/at/config +++ b/webmin/at/config @@ -1,2 +1,2 @@ -at_dir=/var/spool/cron/atjobs at_style=linux +at_dir=/var/spool/cron/atjobs diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index a8a326da4..999c5f3d2 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -wait=1 -bextract=bextract -showdirs=0 -driver=Pg -pass= +user=bacula btape=btape -bacula_dir=/etc/bacula apply=1 -user=bacula -db=bacula -init_start=0 +bacula_dir=/etc/bacula +bextract=bextract +pass= bls=bls +wait=1 +driver=Pg +init_start=0 +db=bacula +showdirs=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 992cd8d0e..020dc7d6c 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,45 +1,45 @@ -whois_cmd=whois -updserial_man=1 -no_chroot=0 -master_ttl=1 -checkzone=named-checkzone -allow_comments=0 +slave_dir=/var/lib/bind +signzone=dnssec-signzone confirm_zone=1 -zones_file=/etc/bind/named.conf.local -spf_record=0 -allow_underscore=1 -records_order=0 +other_slaves=1 +updserial_man=1 +support_aaaa=1 +soa_start=0 +whois_cmd=whois forwardzonefilename_format=ZONE.hosts -rndc_conf=/etc/bind/rndc.conf -rev_must=0 -keygen=dnssec-keygen -by_view=0 allow_wild=1 -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 -master_dir=/var/lib/bind -named_path=/usr/sbin/named -rndc_cmd=rndc -named_conf=/etc/bind/named.conf -largezones=0 -rev_def=0 -rndcconf_cmd=rndc-confgen -force_random=0 -max_zones=50 -slave_dir=/var/lib/bind -support_aaaa=1 -no_pid_chroot=0 -updserial_on=1 short_names=0 +updserial_on=1 soa_style=0 -other_slaves=1 -signzone=dnssec-signzone +master_dir=/var/lib/bind checkconf=named-checkconf -relative_paths=0 -allow_long=0 -soa_start=0 +rndcconf_cmd=rndc-confgen reversezonefilename_format=ZONE.rev -confirm_rec=0 -ndc_cmd=ndc +allow_long=0 show_list=0 +master_ttl=1 +allow_underscore=1 +rev_must=0 +max_zones=50 +ndc_cmd=ndc +updserial_def=0 +rev_def=0 +named_conf=/etc/bind/named.conf +named_path=/usr/sbin/named +force_random=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 +by_view=0 +allow_comments=0 +rndc_cmd=rndc +records_order=0 +confirm_rec=0 ipv6_mode=1 +keygen=dnssec-keygen +checkzone=named-checkzone +no_pid_chroot=0 +relative_paths=0 +no_chroot=0 +zones_file=/etc/bind/named.conf.local +rndc_conf=/etc/bind/rndc.conf +largezones=0 +spf_record=0 diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config index fd788cb1e..470eaee86 100644 --- a/webmin/cluster-software/config +++ b/webmin/cluster-software/config @@ -1,2 +1,2 @@ -table_mode=0 sort_mode=0 +table_mode=0 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index 18e19dc83..5e53fb9d2 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ +conf_allow_refresh=1 conf_host_links=1 conf_add_user=1 +conf_find_group=1 conf_add_group=1 -table_mode=0 conf_find_user=1 -conf_allow_sync=1 -conf_allow_refresh=1 sort_mode=0 -conf_find_group=1 +conf_allow_sync=1 +table_mode=0 diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config index fd788cb1e..470eaee86 100644 --- a/webmin/cluster-webmin/config +++ b/webmin/cluster-webmin/config @@ -1,2 +1,2 @@ -table_mode=0 sort_mode=0 +table_mode=0 diff --git a/webmin/config b/webmin/config index 6867983b7..9b942be76 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -hostnamedisplay= -by_view=0 -nofeedbackcc=0 -passwd_cindex=2 -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +help_width= +passwd_file=/etc/shadow referers_none=1 -passwd_uindex=0 -passwd_mindex=4 +hostnamedisplay= hostnamemode=0 -passwd_file=/etc/shadow -tempdelete_days=7 -help_width= +passwd_pindex=1 +os_type=debian-linux +help_height= +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' feedback_to= -sysinfo=0 +nofeedbackcc=0 theme=authentic-theme +passwd_cindex=2 +real_os_version=18.04.1 lang_root=de.UTF-8 -os_type=debian-linux -passwd_pindex=1 -webprefix= -showhost=0 -help_height= lang=en.UTF-8 +dateformat=dd/mon/yyyy +sysinfo=0 showlogin=0 -real_os_type=Ubuntu Linux -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -real_os_version=18.04.1 -log=1 -ld_env=LD_LIBRARY_PATH -product=webmin +showhost=0 +by_view=0 os_version=9.0 -dateformat=dd/mon/yyyy md5pass=1 +webprefix= +passwd_mindex=4 +ld_env=LD_LIBRARY_PATH +log=1 +product=webmin +real_os_type=Ubuntu Linux +tempdelete_days=7 +passwd_uindex=0 diff --git a/webmin/cpan/config b/webmin/cpan/config index 75c93f1c9..03d91d7f2 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ save_partial=0 -refresh_days=30 -packages=http://www.cpan.org/modules/02packages.details.txt.gz incyum=1 +refresh_days=30 cpan=http://www.cpan.org/authors/id incpackages=1 +packages=http://www.cpan.org/modules/02packages.details.txt.gz diff --git a/webmin/cron/config b/webmin/cron/config index cf04d1a3c..1cc00cf01 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ -show_comment=0 -cron_delete_command=crontab -u USER -r -cron_dir=/var/spool/cron/crontabs +kill_subs=0 max_len=80 -show_run=0 +cron_get_command=crontab -u USER -l cron_user_delete_command=crontab -r -cron_edit_command=crontab -u USER -e -cron_allow_file=/var/spool/cron/allow -cron_user_get_command=crontab -l +cron_dir=/var/spool/cron/crontabs cron_user_edit_command=crontab -e -show_next=0 +vixie_cron=1 max_jobs=100 -system_crontab=/etc/crontab -hourly_only=0 +cron_deny_file=/var/spool/cron/deny +match_mode=0 match_user=1 -kill_subs=0 -show_time=0 -run_parts=run-parts -vixie_cron=1 -cron_input=1 +cron_allow_file=/var/spool/cron/allow +show_next=0 cron_deny_all=2 -match_mode=0 +system_crontab=/etc/crontab +show_comment=0 +show_run=0 +cron_edit_command=crontab -u USER -e +run_parts=run-parts +cron_delete_command=crontab -u USER -r +show_time=0 cronfiles_dir=/etc/cron.d -cron_get_command=crontab -u USER -l -cron_deny_file=/var/spool/cron/deny +cron_input=1 +cron_user_get_command=crontab -l +hourly_only=0 diff --git a/webmin/custom/config b/webmin/custom/config index dec7928fb..acfbdcae2 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -params_cmd=0 params_file=0 -columns=2 display_mode=0 +columns=2 +params_cmd=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index c04f38ddb..be65b9704 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,17 +1,17 @@ -dhcpd_nocols=5 -show_ip=0 -stop_cmd=service isc-dhcp-server stop -lease_sort=0 dhcpd_path=/usr/sbin/dhcpd -lease_tz=0 -group_name=0 -lease_vendor=0 -restart_cmd=service isc-dhcp-server restart -lease_file=/var/lib/dhcp/dhcpd.leases -desc_name=0 pid_file=/var/run/dhcpd.pid dhcpd_conf=/etc/dhcp/dhcpd.conf -display_max=100 -start_cmd=service isc-dhcp-server start +restart_cmd=service isc-dhcp-server restart +lease_vendor=0 +lease_sort=0 +show_ip=0 +desc_name=0 show_mac=0 +lease_file=/var/lib/dhcp/dhcpd.leases +group_name=0 +dhcpd_nocols=5 +stop_cmd=service isc-dhcp-server stop +start_cmd=service isc-dhcp-server start +display_max=100 +lease_tz=0 interfaces_type=debian diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 139214874..d5adf84fb 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ -init_script=dovecot pid_file=/var/run/dovecot/master.pid -dovecot=/usr/sbin/dovecot +init_script=dovecot dovecot_config=/etc/dovecot/dovecot.conf +dovecot=/usr/sbin/dovecot diff --git a/webmin/exim/config b/webmin/exim/config index b96c9da4a..b09c023a2 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_addrfile=/etc/exim4/email-addresses -exim_aliasfileext= -exim_dbmfile=/etc/exim4/local_domains -exim_dir=/etc/exim4 exim_mail_file=Maildir -mail_system=1 +exim_addrfile=/etc/exim4/email-addresses exim_dbmext=.dbm +exim_dir=/etc/exim4 exim_virt_dir=/etc/exim4/aliases +exim_aliasfileext= +mail_system=1 +exim_dbmfile=/etc/exim4/local_domains diff --git a/webmin/exports/config b/webmin/exports/config index 78081f81c..7d1a41d0a 100644 --- a/webmin/exports/config +++ b/webmin/exports/config @@ -1,3 +1,3 @@ +restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi apply_cmd=exportfs -r 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 diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index 620ac7aa2..f5889114d 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ -view_mode=0 -daemon_user=root max_users=400 config_file= +daemon_user=root fetchmail_path=fetchmail +view_mode=0 pid_file=/var/run/fetchmail.pid diff --git a/webmin/filter/config b/webmin/filter/config index 6b456aa04..61b9b361f 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ warn_procmail=1 -virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl forward_procmail=0 virtualmin_config=/etc/webmin/virtual-server -reply_force=0 +virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases +reply_force=0 diff --git a/webmin/firewall/config b/webmin/firewall/config index cb5940517..5303507cc 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ cluster_mode=1 -comment_mod=0 -view_comment=0 direct=0 +view_comment=0 view_condition=1 +comment_mod=0 force_init=0 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 6af3be516..41105d5fc 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -force_init=0 direct=0 view_comment=0 -view_condition=1 cluster_mode=1 comment_mod=0 +force_init=0 +view_condition=1 diff --git a/webmin/firewalld/config b/webmin/firewalld/config index 0aae64fac..ff329a00d 100644 --- a/webmin/firewalld/config +++ b/webmin/firewalld/config @@ -1,2 +1,2 @@ -init_name=firewalld firewall_cmd=firewall-cmd +init_name=firewalld diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 5ba78efc2..cc4eea258 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ +error_email=0 +always_tar=0 date_subs=0 nonewtape=0 -always_tar=0 +run_mode=0 simple_sched=0 webmin_subs=0 -error_email=0 -run_mode=0 diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 53e4828c4..3dd0f16e0 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -haresources= -ha_cf= -ha_dir=/etc/ha.d -req_resource_cmd=/usr/lib/heartbeat/req_resource -apply_cmd=/etc/init.d/heartbeat reload +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf resource_d= +heartbeat=/usr/lib/heartbeat/heartbeat +apply_cmd=/etc/init.d/heartbeat reload authkeys= -alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf -stop_cmd=/etc/init.d/heartbeat stop -start_cmd=/etc/init.d/heartbeat start +pid_file=/var/run/heartbeat.pid alt_haresources=/usr/share/doc/packages/heartbeat/haresources -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +ha_cf= serials=/dev/ttyS* -pid_file=/var/run/heartbeat.pid -heartbeat=/usr/lib/heartbeat/heartbeat +req_resource_cmd=/usr/lib/heartbeat/req_resource +haresources= +ha_dir=/etc/ha.d +start_cmd=/etc/init.d/heartbeat start +stop_cmd=/etc/init.d/heartbeat stop +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index 78f336829..2ad874c35 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -extra_directives= +htaccess=.htaccess +digest=1 htpasswd=.htpasswd -sort=0 htgroups=.htgroups -sha1=0 md5=1 -htaccess=.htaccess -digest=1 +sha1=0 +extra_directives= +sort=0 diff --git a/webmin/idmapd/config b/webmin/idmapd/config index bbb774e0d..d6cd4227f 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ idmapd_conf=/etc/idmapd.conf -idmapd_path=/usr/sbin/rpc.idmapd restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi +idmapd_path=/usr/sbin/rpc.idmapd diff --git a/webmin/inetd/config b/webmin/inetd/config index 4a1795d77..e8ca3902b 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -sort_mode=0 -services_file=/etc/services -inetd_conf_file=/etc/inetd.conf -restart_command=killall -HUP inetd -qm_mode=0 -ipv6=0 -show_empty=1 rpc_protocols=tcp udp +display_max=100 +show_empty=1 +extended_inetd=1 +services_file=/etc/services rpc_inetd=1 +qm_mode=0 +inetd_conf_file=/etc/inetd.conf deny_file=/etc/hosts.deny +sort_mode=0 +restart_command=killall -HUP inetd rpc_file=/etc/rpc -extended_inetd=1 -allow_file=/etc/hosts.allow +ipv6=0 tcpd_path=/usr/sbin/tcpd +allow_file=/etc/hosts.allow protocols_file=/etc/protocols -display_max=100 diff --git a/webmin/init/config b/webmin/init/config index f3666c79c..1a738a8a1 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ +order_digits=2 +inittab_id=id +atboot_product=webmin +order=0 soft_links=1 -status_check=0 init_base=/etc/ -desc=1 -no_chkconfig=0 -init_dir=/etc/init.d -boot_levels=2 3 5 -reboot_command=reboot -sort_mode=0 init_info=1 -inittab_id=id -order=0 -atboot_product=webmin show_opts=0 -order_digits=2 +init_dir=/etc/init.d +boot_levels=2 3 5 +no_chkconfig=0 +desc=1 shutdown_command=poweroff +status_check=0 expert=0 +sort_mode=0 +reboot_command=reboot diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 79665cb81..738c3f269 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ -ipfstat=ipfstat +view_comment=0 +ipnat=ipnat cluster_mode=0 -ipf=ipf -ipnat_conf=/etc/ipf/ipnat.conf +ipfstat=ipfstat ipf_conf=/etc/ipf/ipf.conf -cluster_nat=1 -view_comment=0 view_condition=1 -ipnat=ipnat +cluster_nat=1 +ipnat_conf=/etc/ipf/ipnat.conf +ipf=ipf diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 39a1c607f..68acae5c4 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -cluster_mode=0 -version=2 -view_counters=0 view_condition=1 view_comment=0 +view_counters=0 +version=2 ipfw=/sbin/ipfw +cluster_mode=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index e83c07059..9f44fe7d2 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ -restart_cmd=/etc/init.d/ipsec restart -file=/etc/ipsec.conf -stop_cmd=/etc/init.d/ipsec stop logfile=/var/log/messages start_cmd=/etc/init.d/ipsec start policies_dir=/etc/ipsec.d/policies +file=/etc/ipsec.conf secrets=/etc/ipsec.secrets +restart_cmd=/etc/init.d/ipsec restart ipsec=/usr/sbin/ipsec +stop_cmd=/etc/init.d/ipsec stop diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index c2f26a372..34c3a6b2a 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ +config_file=/etc/iscsi/iscsid.conf iscsiiname=iscsi-iname initiator_file=/etc/iscsi/initiatorname.iscsi +ifaces_dir=/var/lib/iscsi/ifaces iscsiadm=iscsiadm init_name=open-iscsi -ifaces_dir=/var/lib/iscsi/ifaces -config_file=/etc/iscsi/iscsid.conf diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 04896656a..4c0b5bf55 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -init_name=netbsd-iscsi iscsi_server=/usr/sbin/iscsi-target +targets_file=/etc/iscsi/targets +init_name=netbsd-iscsi +auths_file=/etc/iscsi/auths opts_file=/etc/sysconfig/netbsd-iscsi pid_file=/var/run/iscsi-target.pid -auths_file=/etc/iscsi/auths -targets_file=/etc/iscsi/targets diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 81e03b4c1..1e9d0a928 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ -initiators_file=/etc/iet/initiators.allow -config_file=/etc/iet/ietd.conf ietadm=ietadm -init_name=iscsitarget -opts_file=/etc/default/iscsitarget -pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid +config_file=/etc/iet/ietd.conf targets_file=/etc/iet/targets.allow +pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid +opts_file=/etc/default/iscsitarget +initiators_file=/etc/iet/initiators.allow +init_name=iscsitarget diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index e55f742ea..655370a52 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ -tgtd=tgtd -tgtadm=tgtadm -config_file=/etc/tgt/targets.conf init_name=tgtd +tgtadm=tgtadm +tgtd=tgtd tgtadmin=tgt-admin +config_file=/etc/tgt/targets.conf diff --git a/webmin/jabber/config b/webmin/jabber/config index ca2b8b95c..f9d2c09aa 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 jabber_config=/etc/jabber/jabber.xml stop_cmd=/etc/init.d/jabberd stop +jabber_daemon=/usr/sbin/jabberd +jabber_dir=/var/lib/jabber +start_cmd=/etc/init.d/jabberd start diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 0f578e5fb..4587ce571 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -init_name=nslcd auth_ldap=/etc/ldap.conf +init_name=nslcd secret=/etc/ldap.secret diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index e17c9df10..262d606cf 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ -apply_cmd=/etc/init.d/slapd restart +slapd=slapd start_cmd=/etc/init.d/slapd start -attr_count=6 -config_file=/etc/ldap/slapd.d browse_max=100 -ldap_user=openldap +stop_cmd=/etc/init.d/slapd stop +apply_cmd=/etc/init.d/slapd restart +config_file=/etc/ldap/slapd.d init_name=slapd +attr_count=6 +ldap_user=openldap schema_dir=/etc/ldap/schema -slapd=slapd -stop_cmd=/etc/init.d/slapd stop diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index da073f014..565a787e7 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -imap_foldersep=. +given=0 membox=0 -samba_gclass=sambaGroup +quota_support=0 +person=1 +mailfmt=0 imap_folders=old public sent-mail -imap_def=0 -imap_login=cyrus -multi_fields=0 gecos=1 md5=0 -given=0 -slappasswd=slappasswd +samba_gclass=sambaGroup imap_class=SuSEeMailObject -samba_class=sambaSamAccount -samba_def=0 +alias_same=0 +imap_def=0 secmode=0 -person=1 other_class=inetOrgPerson -shells=fixed,ldap,passwd,shells -ldap_tls=0 auth_ldap=/etc/ldap.conf -quota_support=0 -alias_same=0 +samba_def=0 +slappasswd=slappasswd +imap_login=cyrus given_order=0 -mailfmt=0 +imap_foldersep=. +ldap_tls=0 +samba_class=sambaSamAccount +multi_fields=0 +shells=fixed,ldap,passwd,shells diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 1cb5ad4da..89a1a0d84 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ sort_mode=0 -logrotate_conf=/etc/logrotate.conf logrotate=logrotate add_file=/etc/logrotate.d +logrotate_conf=/etc/logrotate.conf diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index bf38d43b7..3cdeb94f0 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -gs_fontpath= -start_cmd=/etc/init.d/cupsys start -display_mode=0 -iface_arg= -iface_perms=755 -smbclient_path=smbclient iface_owner=lp:lp -model_path=/usr/share/foomatic/db /usr/share/ppd -spool_dir=/var/spool/cups +gs_lib= +print_style=cups sort_mode=0 +stop_cmd=/etc/init.d/cupsys stop gs_path=gs -show_jobs=0 +iface_arg= +gs_fontpath= +start_cmd=/etc/init.d/cupsys start show_status=0 -print_style=cups -stop_cmd=/etc/init.d/cupsys stop -gs_lib= +show_jobs=0 +display_mode=0 +spool_dir=/var/spool/cups +model_path=/usr/share/foomatic/db /usr/share/ppd +iface_perms=755 driver_style=cups +smbclient_path=smbclient 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 889d60bfb..813d044fc 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -link_mode=0 -auto=1 -perpage=20 +ignore_users_enabled=0 +mail_dir=Maildir +mail_usermin=mail +size_mode=1 +show_mail=0 +no_crlf=0 +spam_report= mailbox_user=.usermin/mailbox -show_body=0 -sig_file=* -html_quote=0 -open_mode=0 -sync_perms=0700 -no_orig_ip=0 fwd_mode=0 -log_read=0 -sync_create=0 -mail_style=0 +show_body=0 +vpopmail_dir=/home/vpopmail html_edit=0 -sync_delete=1 -noindex_hostname=0 +show_sent=0 +date_fmt=dmy +maildir_deleted=0 +track_read=0 +mail_style=0 +perpage=20 +ignore_users= +link_mode=0 show_count=0 +open_mode=0 +sync_delete=1 +spam_del=0 +show_unread=0 +max_records=200 +no_mailer=0 +sync_modify=1 sort_mode=1 -wrap_width=80 -date_fmt=dmy -column_count=4 -arrows=1 -show_mail=0 -from_virtualmin=1 mail_file=Mailbox -ignore_users_enabled=0 -vpopmail_dir=/home/vpopmail -top_buttons=2 -check_mod=1 +arrows=1 +wrap_width=80 +log_read=0 +mail_system=3 delete_warn=y -spam_report= -mail_usermin=mail -show_unread=0 +no_orig_ip=0 +check_mod=1 spam_buttons=mail -mail_system=3 -show_sent=0 -no_mailer=0 -size_mode=1 +noindex_hostname=0 show_delall=0 -maildir_deleted=0 -no_crlf=0 -spam_del=0 +top_buttons=2 +view_html=0 +html_quote=0 +sig_file=* +from_virtualmin=1 +sync_create=0 +column_count=4 +sync_perms=0700 show_size_below=0 show_to=0 -track_read=0 -ignore_users= -max_records=200 +auto=1 show_size=1 -sync_modify=1 -mail_dir=Maildir -view_html=0 diff --git a/webmin/man/config b/webmin/man/config index 3e4dbb0f6..8f6209df6 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ -kernel_dir=/usr/src/linux/Documentation +man_cmd=man PAGE +man_cmd_sect=man SECTION PAGE +list_cmd_sect=man -w SECTION PAGE list_cmd=man -w PAGE search_cmd=man -k PAGE -list_cmd_sect=man -w SECTION PAGE doc_dir=/usr/share/doc -man_cmd=man PAGE man2html_path=man2html -man_cmd_sect=man SECTION PAGE +kernel_dir=/usr/src/linux/Documentation 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 93a797c83..1ebbcfa09 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.972 +server=MiniServ/1.973 diff --git a/webmin/mon/config b/webmin/mon/config index 50f8a60b8..e29a42e57 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -start_cmd=/etc/init.d/mon start -mon_cgi=/var/www/cgi-bin/mon.cgi -cfbasedir=/etc/mon +pid_file=/var/run/mon.pid restart_cmd=/etc/init.d/mon restart +mon_cgi=/var/www/cgi-bin/mon.cgi monshow=/usr/bin/monshow -pid_file=/var/run/mon.pid stop_cmd=/etc/init.d/mon stop +start_cmd=/etc/init.d/mon start +cfbasedir=/etc/mon diff --git a/webmin/mount/config b/webmin/mount/config index c8933ba8a..afb363083 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ +fstab_file=/etc/fstab +sysinfo=1 +nfs_check=1 +autofs_file=/etc/auto.master show_used=1 +long_fstypes=1 +nmblookup_path=nmblookup auto_file=/etc/am-utils/amd.conf -autofs_file=/etc/auto.master -nfs_check=1 -sysinfo=1 sort_mode=2 -nmblookup_path=nmblookup -long_fstypes=1 -fstab_file=/etc/fstab smbclient_path=smbclient diff --git a/webmin/mysql/config b/webmin/mysql/config index 2ef027e87..57f5328fb 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ +mysqlshow=/usr/bin/mysqlshow +mysqlimport=/usr/bin/mysqlimport +perpage=25 +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf +max_text=1000 mysql_libs=/usr/local/mysql/lib -access=*: * mysqladmin=/usr/bin/mysqladmin -max_text=1000 -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -mysqlshow=/usr/bin/mysqlshow -login=root +passwd_mode=0 +webmin_subs=0 +nopwd=0 date_subs=0 -start_cmd=service mysql start +style=0 +mysql=/usr/bin/mysql nodbi=0 -webmin_subs=0 -perpage=25 -add_mode=1 stop_cmd=service mysql stop -mysqldump=/usr/bin/mysqldump +mysql_data=/var/lib/mysql blob_mode=0 -mysqlimport=/usr/bin/mysqlimport -mysql=/usr/bin/mysql -style=0 +login=root max_dbs=50 -mysql_data=/var/lib/mysql -passwd_mode=0 -nopwd=0 +start_cmd=service mysql start +mysqldump=/usr/bin/mysqldump +access=*: * +add_mode=1 diff --git a/webmin/net/config b/webmin/net/config index 04c0295d5..56c61c18e 100644 --- a/webmin/net/config +++ b/webmin/net/config @@ -1,2 +1,2 @@ -def_netmask=255.255.255.0 hosts_file=/etc/hosts +def_netmask=255.255.255.0 diff --git a/webmin/nis/config b/webmin/nis/config index 51b4fbca0..77c6c89c7 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ +client_conf=/etc/yp.conf max_size=100 -manual_build=0 -securenets=/etc/ypserv.securenets nsswitch_conf=/etc/nsswitch.conf -client_conf=/etc/yp.conf +securenets=/etc/ypserv.securenets +manual_build=0 diff --git a/webmin/openslp/config b/webmin/openslp/config index 2084e85ec..60230b9c6 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ +slpd_conf=/etc/slp.conf slpd_log=/var/log/slpd.log -slpd=/usr/sbin/slpd slpd_pid=/var/run/slpd.pid -slpd_conf=/etc/slp.conf +slpd=/usr/sbin/slpd slpd_reg=/etc/slp.reg diff --git a/webmin/package-updates/config b/webmin/package-updates/config index 195d872e7..226c127d1 100644 --- a/webmin/package-updates/config +++ b/webmin/package-updates/config @@ -1,2 +1,2 @@ -update_multiple=1 cache_time=6 +update_multiple=1 diff --git a/webmin/pam/config b/webmin/pam/config index 4287bf606..9e8b1cc3c 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ -lib_dirs=/lib/security /lib/*/security +ignore=README 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 pam_dir=/etc/pam.d -ignore=README diff --git a/webmin/pap/config b/webmin/pap/config index 79685d300..fcdb2d609 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ +login_config=/etc/mgetty+sendfax/login.config +mgetty=mgetty +dialin_config=/etc/mgetty+sendfax/dialin.config encrypt_pass=0 +pap_file=/etc/ppp/pap-secrets serials=/dev/ttyS[0-9]* pppd=pppd -dialin_config=/etc/mgetty+sendfax/dialin.config ppp_options=/etc/ppp/options -login_config=/etc/mgetty+sendfax/login.config -pap_file=/etc/ppp/pap-secrets -mgetty=mgetty diff --git a/webmin/postfix/config b/webmin/postfix/config index b9f356822..9eadf9da8 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ check_config=1 -postfix_config_command=/usr/sbin/postconf -postfix_super_command=/usr/sbin/postsuper -postfix_master=/etc/postfix/master.cf -mailq_count=0 +prefix_cmts=0 fwd_mode=0 -columns=2 -ldap_doms=0 +wrap_width=80 delete_warn=1 -top_buttons=1 -perpage=20 postcat_cmd=/usr/sbin/postcat -index_check=1 +columns=2 +postfix_newaliases_command=/usr/bin/newaliases +postfix_config_file=/etc/postfix/main.cf max_maps=100 -show_cmts=0 +delete_confirm=1 max_records=200 +mailq_count=0 +sort_mode=0 +postfix_config_command=/usr/sbin/postconf postfix_lookup_table_command=/usr/sbin/postmap -mailq_cmd=postqueue -p +index_check=1 postfix_aliases_table_command=/usr/sbin/postalias -postfix_config_file=/etc/postfix/main.cf -mailq_dir=/var/spool/postfix +postfix_master=/etc/postfix/master.cf +ldap_doms=0 +show_cmts=0 mailq_sort=0 -delete_confirm=1 -postfix_control_command=/usr/sbin/postfix -prefix_cmts=0 -postfix_newaliases_command=/usr/bin/newaliases postfix_queue_command=postqueue -wrap_width=80 -sort_mode=0 +mailq_dir=/var/spool/postfix +top_buttons=1 +postfix_super_command=/usr/sbin/postsuper +mailq_cmd=postqueue -p +postfix_control_command=/usr/sbin/postfix +perpage=20 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 732f974fe..fe65d6bc3 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -simple_sched=0 -plib= -access=*: * -dump_cmd=/usr/bin/pg_dump -perpage=25 -sameunix=1 -webmin_subs=0 stop_cmd=/etc/init.d/postgresql* stop +access=*: * add_mode=1 -psql=/usr/bin/psql -nodbi=0 -login=postgres max_dbs=50 start_cmd=/etc/init.d/postgresql* start +login=postgres +blob_mode=0 +style=0 date_subs=0 +access_own=0 +psql=/usr/bin/psql +nodbi=0 +plib= hba_conf=/etc/postgresql/*/main/pg_hba.conf max_text=1000 -rstr_cmd=/usr/bin/pg_restore -blob_mode=0 +perpage=25 +sameunix=1 +webmin_subs=0 +pass= pid_file=/var/run/postmaster.pid basedb=template1 -pass= -access_own=0 -style=0 +simple_sched=0 +dump_cmd=/usr/bin/pg_dump +rstr_cmd=/usr/bin/pg_restore diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 5a8393949..187ad8bca 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -timeout=30 -pptp=pptp peers_dir=/etc/ppp/peers pptp_options=/etc/ppp/options.pptp +pptp=pptp pap_file=/etc/ppp/chap-secrets +timeout=30 diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index 7c7a4be15..2d2458d3f 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ stop_cmd=/etc/init.d/pptpd stop +pptpd=pptpd +pap_file=/etc/ppp/chap-secrets +pid_file=/var/run/pptpd.pid log_file=/var/log/messages file=/etc/pptpd.conf -pid_file=/var/run/pptpd.pid -ppp_options=/etc/ppp/options -pptpd=pptpd pptp_ppp_options=/etc/ppp/pptpd-options -pap_file=/etc/ppp/chap-secrets +ppp_options=/etc/ppp/options start_cmd=/etc/init.d/pptpd start diff --git a/webmin/proc/config b/webmin/proc/config index 098b97543..fb255f92f 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -hide_self=1 cut_length=80 -base_ppid=1 -ps_style=linux trace_java=0 +ps_style=linux +hide_self=1 default_mode=last +base_ppid=1 diff --git a/webmin/procmail/config b/webmin/procmail/config index 71541070b..ff60bb0d1 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -includes=0 -procmail=procmail procmailrc=/etc/procmailrc +procmail=procmail +includes=0 diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 6e591d68b..60a36e88a 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ +proftpd_path=/usr/sbin/proftpd test_always=0 -start_cmd=/etc/init.d/proftpd start +proftpd_conf=/etc/proftpd/proftpd.conf test_config=1 +start_cmd=/etc/init.d/proftpd start ftpusers=/etc/ftpusers -test_manual=0 -proftpd_path=/usr/sbin/proftpd stop_cmd=/etc/init.d/proftpd stop -proftpd_conf=/etc/proftpd/proftpd.conf +test_manual=0 pid_file=/var/run/proftpd.pid diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index b0f16c6f7..6d1a05323 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -qmail_dir=/var/qmail +mailq_count=0 sort_mode=0 -columns=2 -mail_dir_qmail=Maildir -delete_warn=1 -mailq_sort=0 perpage=20 -mail_dir= -mail_system=1 index_min=1000000 -mailq_count=0 mail_file=Mailbox -fwd_mode=0 +qmail_dir=/var/qmail +mail_dir= max_records=200 +columns=2 +mail_dir_qmail=Maildir +mailq_sort=0 +fwd_mode=0 +mail_system=1 +delete_warn=1 diff --git a/webmin/quota/config b/webmin/quota/config index 16511538b..264ac7f6d 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -group_quota_command=quota -v -g -block_mode=1 -group_grace_command=edquota -g -t +user_setquota_command=setquota -u +group_quotaoff_command=quotaoff -g +group_copy_command=edquota -g -p +group_edquota_command=edquota -g +group_quotaon_command=quotaon -g user_repquota_command=repquota -u -v +email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the allowed quota. ${USED} of disk space is being used, out of a maximum of ${QUOTA}. +group_grace_command=edquota -g -t user_quotaon_command=quotaon -u -group_quotaon_command=quotaon -g user_edquota_command=edquota -u -user_copy_command=edquota -u -p -user_quotaoff_command=quotaoff -u -group_edquota_command=edquota -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_quotaoff_command=quotaoff -g -user_setquota_command=setquota -u -quotacheck_command=quotacheck -u -g +block_size=1024 +block_mode=1 show_grace=1 +quotacheck_command=quotacheck -u -g group_repquota_command=repquota -g -v -sort_mode=0 -group_setquota_command=setquota -g user_quota_command=quota -v -u +user_quotaoff_command=quotaoff -u display_max=100 -block_size=1024 user_grace_command=edquota -u -t -group_copy_command=edquota -g -p -pc_show=1 hide_uids=0 +sort_mode=0 +group_quota_command=quota -v -g +pc_show=1 +user_copy_command=edquota -u -p +group_setquota_command=setquota -g diff --git a/webmin/samba/config b/webmin/samba/config index b18a90e39..b681f13ce 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -swat=/usr/sbin/swat -smbgroupedit=/usr/bin/smbgroupedit +dont_convert=-499 +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' restart_cmd=service smbd restart ; service nmbd restart -smb_passwd=/etc/samba/smbpasswd +smb_conf=/etc/samba/smb.conf +samba_status_program=/usr/bin/smbstatus +swat=/usr/sbin/swat +name_server=/usr/sbin/nmbd samba_server=/usr/sbin/smbd net=/usr/bin/net -run_from_inetd=0 text_lists=0 -start_cmd=service smbd start ; service nmbd start -samba_status_program=/usr/bin/smbstatus -name_server=/usr/sbin/nmbd -dont_convert=-499 -stop_cmd=service smbd stop ; service nmbd stop -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +run_from_inetd=0 samba_password_program=/usr/bin/smbpasswd -smb_conf=/etc/samba/smb.conf +smb_passwd=/etc/samba/smbpasswd sort_mode=0 +stop_cmd=service smbd stop ; service nmbd stop +start_cmd=service smbd start ; service nmbd start +smbgroupedit=/usr/bin/smbgroupedit pdbedit=/usr/bin/pdbedit diff --git a/webmin/sarg/config b/webmin/sarg/config index e572a9730..a8477b752 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -sarg=sarg -sarg_conf=/etc/sarg/sarg.conf clear=1 +sarg_conf=/etc/sarg/sarg.conf naked=0 +sarg=sarg diff --git a/webmin/sendmail/config b/webmin/sendmail/config index 616a9321d..d0206c197 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ perpage=20 -top_buttons=1 -delete_warn=1 -sendmail_features=/usr/share/sendmail/cf -columns=2 -sendmail_mc=/etc/mail/sendmail.mc sendmail_path=/usr/lib/sendmail -smrsh_dir=/etc/smrsh -fwd_mode=0 +sendmail_command=/usr/lib/sendmail -bd -q1h +sendmail_features=/usr/share/sendmail/cf +sendmail_cf=/etc/mail/sendmail.cf +top_buttons=1 mail_style=0 -mailq_count=0 -mailq_show=Date,From,To,Size,Status +track_read=0 mailq_sort=0 -sort_mode=0 -wrap_width=80 -prefix_cmts=0 -order_mail=0 -delete_confirm=1 -max_records=200 show_cmts=0 -sendmail_command=/usr/lib/sendmail -bd -q1h -show_to=0 -track_read=0 +sendmail_mc=/etc/mail/sendmail.mc mail_type=0 -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -mail_file=mbox +smrsh_dir=/etc/smrsh +show_to=0 makemap_path=makemap -sendmail_cf=/etc/mail/sendmail.cf +order_mail=0 index_min=1000000 +mail_file=mbox +sort_mode=0 +mailq_count=0 +mailq_show=Date,From,To,Size,Status +max_records=200 +delete_confirm=1 mail_dir=/var/spool/mail +columns=2 +delete_warn=1 +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +wrap_width=80 +prefix_cmts=0 +fwd_mode=0 diff --git a/webmin/servers/config b/webmin/servers/config index f5250dffe..9ca79bfa9 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -resolve=1 -display_mode=0 -deflink=0 +groups_dir=/etc/cluster/groups sort_mode=0 +resolve=1 +max_servers=100 deffast=2 show_ip=0 -max_servers=100 -show_status=1 -groups_dir=/etc/cluster/groups +deflink=0 capath=/usr/share/ca-certificates scan_time=5 +display_mode=0 +show_status=1 diff --git a/webmin/shell/config b/webmin/shell/config index af7728831..044e158ce 100644 --- a/webmin/shell/config +++ b/webmin/shell/config @@ -1,3 +1,3 @@ -max_runtime=86400 clear_envs=0 max_output=100000 +max_runtime=86400 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 5da058a58..ed0dababb 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -config_dir=/etc/shorewall -display_zone_descriptions=1 +shorewall=shorewall actions=/etc/shorewall/actions /usr/share/shorewall/actions.std +display_zone_descriptions=1 +config_dir=/etc/shorewall macros=/usr/share/shorewall -shorewall=shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index a04080f0a..10a2651bb 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ -shorewall6=shorewall6 -macros=/usr/share/shorewall6 actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -config_dir=/etc/shorewall6 +shorewall6=shorewall6 display_zone_descriptions=1 +config_dir=/etc/shorewall6 +macros=/usr/share/shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index 8da23caa9..8537d1b9b 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ +mode=1 smartctl=smartctl -attribs=1 ata=0 -mode=1 +attribs=1 diff --git a/webmin/software/config b/webmin/software/config index 037d899f3..bf587ee21 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 0267c7bc4..14341cef1 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ +procmail_cmd=* sa_learn=sa-learn -warn_procmail=1 -local_cf=/etc/spamassassin/local.cf +max_awl=200 +mode=0 +processes=spamd amavisd spamassassin=spamassassin procmailrc=/etc/procmailrc +local_cf=/etc/spamassassin/local.cf +restart_cmd=/etc/init.d/spamassassin restart call_spam=1 +warn_procmail=1 addto=0 -mode=0 -restart_cmd=/etc/init.d/spamassassin restart -processes=spamd amavisd -procmail_cmd=* -max_awl=200 diff --git a/webmin/squid/config b/webmin/squid/config index 85c025f7a..848fd162b 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -squid_stop=service squid stop -pid_file=/var/run/squid.pid +log_dir=/var/log/squid cal_args=-aw -sort_conf=0 -cache_dir=/var/spool/squid -cal_all=1 -sync_delete=0 +pid_file=/var/run/squid.pid crypt_conf=0 +sort_conf=0 cal_fmt=w -squid_conf=/etc/squid/squid.conf -sync_create=0 squid_start=service squid start -sync_modify=1 -cal_max=50000 -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi -squid_restart=service squid reload +squidclient=squidclient +squid_stop=service squid stop calamaris=calamaris -squid_path=squid -log_dir=/var/log/squid +cal_max=50000 +cache_dir=/var/spool/squid +sync_modify=1 +sync_create=0 restart_pos=0 -squidclient=squidclient +sync_delete=0 +squid_path=squid +squid_conf=/etc/squid/squid.conf +cal_all=1 +squid_restart=service squid reload +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi diff --git a/webmin/sshd/config b/webmin/sshd/config index 6c46efb78..d214957eb 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -client_config=/etc/ssh/ssh_config -stop_cmd=service ssh stop -sshd_config=/etc/ssh/sshd_config -sync_gnupg=0 -sync_auth=1 -keygen_path=/usr/bin/ssh-keygen -pid_file=/var/run/sshd.pid sync_pass=0 +pid_file=/var/run/sshd.pid +client_config=/etc/ssh/ssh_config sshd_path=/usr/sbin/sshd -start_cmd=service ssh start +keygen_path=/usr/bin/ssh-keygen +sshd_config=/etc/ssh/sshd_config +stop_cmd=service ssh stop sync_create=0 +start_cmd=service ssh start +sync_auth=1 +sync_gnupg=0 diff --git a/webmin/status/config b/webmin/status/config index a4e800fb3..a7ff8b8d5 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ +history_show=50 +snmp_version=2 +subject_mode=0 +sched_offset=0 +sort_mode=0 +history_purge=30 pager_cmd=sms_client index_status=1 +output=0 +sysinfo=0 snmp_trap=1.3.6.1.4.1.10000.1.1 sysinfo_users=0 -output=0 -snmp_version=2 -sched_offset=0 columns=2 -history_show=50 -sysinfo=0 -sort_mode=0 -subject_mode=0 -history_purge=30 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index 6b4b7b5f1..c565166d1 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ pid_file=/var/run/syslog-ng.pid -syslogng_conf=/etc/syslog-ng/syslog-ng.conf +lines=20 stop_cmd=/etc/init.d/syslog-ng stop +syslogng_conf=/etc/syslog-ng/syslog-ng.conf start_cmd=/etc/init.d/syslog-ng start syslogng_cmd=syslog-ng -lines=20 compressed=1 diff --git a/webmin/syslog/config b/webmin/syslog/config index 01a1f651b..7cbc860ff 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -pri_dir=1 -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -pipe=1 -m4_conf=0 -signal_cmd=/usr/sbin/service rsyslog restart -restart_cmd=/usr/sbin/service rsyslog restart -pid_file=/var/run/rsyslogd.pid -syslogd=/usr/sbin/rsyslogd -m4_path= -pri_all=1 tags=0 start_cmd=/usr/sbin/service rsyslog start -syslog_conf=/etc/rsyslog.conf others=1 +m4_conf=0 +facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 +pri_dir=1 +syslog_conf=/etc/rsyslog.conf +reverse=0 +syslogd=/usr/sbin/rsyslogd +pipe=1 +m4_path= socket=0 -sync=1 +pri_all=1 compressed=1 -reverse=0 lines=20 +restart_cmd=/usr/sbin/service rsyslog restart +pid_file=/var/run/rsyslogd.pid +signal_cmd=/usr/sbin/service rsyslog restart +sync=1 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 ddc301405..10eceba4d 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ +hosts_deny=/etc/hosts.deny hosts_allow=/etc/hosts.allow inetd_services=0 -hosts_deny=/etc/hosts.deny diff --git a/webmin/telnet/config b/webmin/telnet/config index 15a13d538..b5cbb0cf2 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ -no_test=0 -proxy=0 sizemode=0 detach=0 +proxy=0 +no_test=0 mode=1 diff --git a/webmin/time/config b/webmin/time/config index 92f68fae6..71ef6c203 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ -timeserver_hardware=1 +lease=5 zone_style=linux -ntp_only=1 +timeserver_hardware=1 timeserver=0.pool.ntp.org -lease=5 seconds=1 +ntp_only=1 diff --git a/webmin/updown/config b/webmin/updown/config index aba856c09..c0df4bf3b 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ -ddir=/ -duser=root dir=/ +ddir=/ user=root +duser=root diff --git a/webmin/useradmin/config b/webmin/useradmin/config index a7d884149..b87309727 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -homedir_perms=0755 -gid_mode=1 -new_user_group=0 -default_group=users -membox=0 -delete_only=0 -uid_mode=1 -passwd_same=0 -selinux_con=user_u:object_r:user_home_dir_t +shadow_file=/etc/shadow +display_max=400 random_password=0 +group_file=/etc/group +secmode=0 user_files=/etc/skel -passwd_stars=0 -email_type=0 -gshadow_file=/etc/gshadow -md5=1 new_user_gid=0 +new_user_group=0 +gid_mode=1 +delete_only=0 +sort_mode=0 +from_files=0 +base_uid=1000 +passwd_same=0 home_base=/home -home_style=0 +membox=0 +empty_mode=0 passwd_file=/etc/passwd default_other=1 -shells=fixed,passwd,shells +default_group=users display_mode=1 -base_uid=1000 -group_file=/etc/group -skip_md5=0 -display_max=400 -base_gid=1000 +uid_mode=1 +md5=1 +homedir_perms=0755 alias_check=0 -secmode=0 +base_gid=1000 delete_root=0 -extra_real=0 last_show=0 -from_files=0 uid_calc=0 -sort_mode=0 -passwd_progmode=0 -gid_calc=0 -shadow_file=/etc/shadow +home_style=0 +shells=fixed,passwd,shells passwd_dict=0 +extra_real=0 lock_string=* -empty_mode=0 +gshadow_file=/etc/gshadow +passwd_progmode=0 +passwd_stars=0 +gid_calc=0 +email_type=0 +skip_md5=0 +selinux_con=user_u:object_r:user_home_dir_t diff --git a/webmin/usermin/config b/webmin/usermin/config index cc127b695..5c9ee6d7f 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ +uphour=4 upshow=1 cron_mode=0 -usermin_dir=/etc/usermin -update=0 upmissing=0 +update=0 updays=1 -uphour=4 +usermin_dir=/etc/usermin diff --git a/webmin/version b/webmin/version index 00c94413f..63c3f6c70 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.972 +1.973 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 259e50467..f1a176042 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -naked=0 -alt_conf=/etc/webalizer/webalizer.conf.sample skip_old=0 -webalizer=/usr/bin/webalizer webalizer_conf=/etc/webalizer/webalizer.conf +webalizer=/usr/bin/webalizer +alt_conf=/etc/webalizer/webalizer.conf.sample +naked=0 auto=apache,squid,proftpd,wuftpd diff --git a/webmin/webmin/config b/webmin/webmin/config index 13feb36a4..f769fc453 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ -cron_mode=0 -last_version_check=1549050668 -upshow=1 letsencrypt_dns_wait=10 +update=0 +upmissing=0 +last_version_check=1549050668 warn_days=7 -osdn=1 -uphour=23 upmins=47 -updays=1 -upmissing=0 +upshow=1 +uphour=23 last_version_number=1.900 -update=0 +cron_mode=0 +osdn=1 +updays=1 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index c1c69aaa3..e5126088e 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ +ftpgroups=/etc/wu-ftpd/ftpgroups ftphosts=/etc/wu-ftpd/ftphosts pid_file=/var/run/ftpd.pids-all -log_file=/var/log/xferlog ftpconversions=/etc/wu-ftpd/ftpconversions -ftpgroups=/etc/wu-ftpd/ftpgroups +log_file=/var/log/xferlog ftpusers=/etc/wu-ftpd/ftpusers ftpaccess=/etc/wu-ftpd/ftpaccess ftpd_path=/usr/sbin/wu-ftpd diff --git a/webmin/xinetd/config b/webmin/xinetd/config index bcac73097..dd1583869 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -start_cmd=/etc/init.d/xinetd start -pid_file=/var/run/xinetd.pid protocols_file=/etc/protocols -lookup_servs=1 xinetd_conf=/etc/xinetd.conf +pid_file=/var/run/xinetd.pid +lookup_servs=1 +start_cmd=/etc/init.d/xinetd start