From: mhoellein Date: Fri, 7 May 2021 07:47:09 +0000 (+0200) Subject: committing changes in /etc made by "apt-get upgrade" X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=d8e84934019c98334bc3e6d87c4305b988f32bb2;p=vserver committing changes in /etc made by "apt-get upgrade" Package changes: -alsa-ucm-conf 1.2.2-1ubuntu0.6 all +alsa-ucm-conf 1.2.2-1ubuntu0.7 all -code-brand 6.4-12 all -collaboraoffice6.4 6.4.10.36-36 amd64 -collaboraoffice6.4-ure 6.4.10.36-36 amd64 +code-brand 6.4-14 all +collaboraoffice6.4 6.4.10.37-37 amd64 +collaboraoffice6.4-ure 6.4.10.37-37 amd64 -collaboraofficebasis6.4-calc 6.4.10.36-36 amd64 -collaboraofficebasis6.4-core 6.4.10.36-36 amd64 -collaboraofficebasis6.4-draw 6.4.10.36-36 amd64 -collaboraofficebasis6.4-en-us 6.4.10.36-36 amd64 -collaboraofficebasis6.4-extension-pdf-import 6.4.10.36-36 amd64 -collaboraofficebasis6.4-graphicfilter 6.4.10.36-36 amd64 -collaboraofficebasis6.4-images 6.4.10.36-36 amd64 -collaboraofficebasis6.4-impress 6.4.10.36-36 amd64 -collaboraofficebasis6.4-ooofonts 6.4.10.36-36 amd64 -collaboraofficebasis6.4-ooolinguistic 6.4.10.36-36 amd64 -collaboraofficebasis6.4-writer 6.4.10.36-36 amd64 +collaboraofficebasis6.4-calc 6.4.10.37-37 amd64 +collaboraofficebasis6.4-core 6.4.10.37-37 amd64 +collaboraofficebasis6.4-draw 6.4.10.37-37 amd64 +collaboraofficebasis6.4-en-us 6.4.10.37-37 amd64 +collaboraofficebasis6.4-extension-pdf-import 6.4.10.37-37 amd64 +collaboraofficebasis6.4-graphicfilter 6.4.10.37-37 amd64 +collaboraofficebasis6.4-images 6.4.10.37-37 amd64 +collaboraofficebasis6.4-impress 6.4.10.37-37 amd64 +collaboraofficebasis6.4-ooofonts 6.4.10.37-37 amd64 +collaboraofficebasis6.4-ooolinguistic 6.4.10.37-37 amd64 +collaboraofficebasis6.4-writer 6.4.10.37-37 amd64 -libasound2 1.2.2-2.1ubuntu2.3 amd64 -libasound2-data 1.2.2-2.1ubuntu2.3 all +libasound2 1.2.2-2.1ubuntu2.4 amd64 +libasound2-data 1.2.2-2.1ubuntu2.4 all -libunbound8 1.9.4-2ubuntu1.1 amd64 +libunbound8 1.9.4-2ubuntu1.2 amd64 -linux-firmware 1.187.11 all +linux-firmware 1.187.12 all -loolwsd 6.4.8-1 amd64 +loolwsd 6.4.8-4 amd64 -python3-django 2:2.2.12-1ubuntu0.5 all +python3-django 2:2.2.12-1ubuntu0.6 all -python3-update-manager 1:20.04.10.6 all +python3-update-manager 1:20.04.10.7 all -update-manager-core 1:20.04.10.6 all +update-manager-core 1:20.04.10.7 all -webmin 1.973 all +webmin 1.974 all --- diff --git a/.etckeeper b/.etckeeper index ab3159d3f..ccc921971 100755 --- a/.etckeeper +++ b/.etckeeper @@ -8272,6 +8272,7 @@ maybe chgrp 'bin' 'webmin/mysql' maybe chmod 0711 'webmin/mysql' maybe chgrp 'bin' 'webmin/mysql/config' maybe chmod 0600 'webmin/mysql/config' +maybe chmod 0644 'webmin/mysql/module.info.override' maybe chmod 0644 'webmin/mysql/version' maybe chgrp 'bin' 'webmin/net' maybe chmod 0711 'webmin/net' diff --git a/init.d/webmin b/init.d/webmin index b3ed40ce5..cdb64699e 100755 --- a/init.d/webmin +++ b/init.d/webmin @@ -38,6 +38,11 @@ stop) RETVAL=$? if [ "$RETVAL" = "0" ]; then rm -f $LOCKFILE + pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'` + if [ "$pidfile" = "" ]; then + pidfile=$PIDFILE + fi + rm -f $pidfile fi ;; status) diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu index b5c946a2d..86696a886 100644 --- a/loolwsd/loolkitconfig.xcu +++ b/loolwsd/loolkitconfig.xcu @@ -31,7 +31,8 @@ 2 - + +false false false diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index dc7653271..5e183f2af 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ +pap_file=/etc/ppp/pap-secrets start_cmd=adsl-start -pppoe_cmd=pppoe +stop_cmd=adsl-stop pppoe_conf=/etc/ppp/pppoe.conf +pppoe_cmd=pppoe status_cmd=adsl-status -stop_cmd=adsl-stop conf_style=0 -pap_file=/etc/ppp/pap-secrets diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config index a31edabcb..003ebb11c 100644 --- a/webmin/ajaxterm/config +++ b/webmin/ajaxterm/config @@ -1,2 +1,2 @@ -autologin=0 timeout=120 +autologin=0 diff --git a/webmin/apache/config b/webmin/apache/config index ce91c6e97..b64d5913d 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,24 +1,24 @@ -defines_name=APACHE_ARGUMENTS stop_cmd=/etc/init.d/apache2 stop +defines_name=APACHE_ARGUMENTS +link_dir=/etc/apache2/sites-enabled +apachectl_path=/usr/sbin/apache2ctl httpd_dir=/etc/apache2 +test_always=0 +defines_file=/etc/apache2/envvars +test_config=1 +max_servers=100 +srm_conf=/etc/apache2/srm.conf +auto_mods=1 allow_virtualmin=0 +test_apachectl=1 +show_order=0 +access_conf=/etc/apache2/access.conf 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 +show_names=0 +httpd_conf=/etc/apache2/apache2.conf virt_file=/etc/apache2/sites-available -apachectl_path=/usr/sbin/apache2ctl -auto_mods=1 -show_order=0 start_cmd=/etc/init.d/apache2 start +test_manual=0 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 -test_config=1 -max_servers=100 -srm_conf=/etc/apache2/srm.conf diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index 973f72c89..f3ba49775 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,4 +1,4 @@ -time=1597062733 +time=1615648121 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd version=2.446 diff --git a/webmin/backup-config/config b/webmin/backup-config/config index 3bdfb1231..c6694b382 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ +webmin_subs=0 date_subs=0 apply=1 -webmin_subs=0 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index 999c5f3d2..984f7d99b 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ user=bacula -btape=btape -apply=1 -bacula_dir=/etc/bacula -bextract=bextract +init_start=0 pass= -bls=bls +db=bacula wait=1 +bls=bls +bextract=bextract +btape=btape driver=Pg -init_start=0 -db=bacula +bacula_dir=/etc/bacula showdirs=0 +apply=1 diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config index da72c415d..db38d7751 100644 --- a/webmin/bandwidth/config +++ b/webmin/bandwidth/config @@ -1,2 +1,2 @@ -bandwidth_log=/var/log/bandwidth firewall_system=firewall +bandwidth_log=/var/log/bandwidth diff --git a/webmin/bind8/config b/webmin/bind8/config index 020dc7d6c..be8d0ff2c 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,45 +1,46 @@ -slave_dir=/var/lib/bind -signzone=dnssec-signzone +ipv6_mode=1 +by_view=0 +checkzone=named-checkzone +allow_comments=0 +rndc_cmd=rndc +no_pid_chroot=0 +soa_style=0 +confirm_rec=0 +allow_long=0 +force_random=0 confirm_zone=1 +reversezonefilename_format=ZONE.rev +dnssec_info=1 +rndcconf_cmd=rndc-confgen +forwardzonefilename_format=ZONE.hosts +rev_def=0 +updserial_def=0 +slave_dir=/var/lib/bind +largezones=0 other_slaves=1 +no_chroot=0 +records_order=0 +relative_paths=0 +checkconf=named-checkconf +rndc_conf=/etc/bind/rndc.conf +rev_must=0 updserial_man=1 -support_aaaa=1 -soa_start=0 -whois_cmd=whois -forwardzonefilename_format=ZONE.hosts +allow_underscore=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 +signzone=dnssec-signzone allow_wild=1 -short_names=0 -updserial_on=1 -soa_style=0 -master_dir=/var/lib/bind -checkconf=named-checkconf -rndcconf_cmd=rndc-confgen -reversezonefilename_format=ZONE.rev -allow_long=0 -show_list=0 +spf_record=0 +zones_file=/etc/bind/named.conf.local master_ttl=1 -allow_underscore=1 -rev_must=0 +support_aaaa=1 max_zones=50 -ndc_cmd=ndc -updserial_def=0 -rev_def=0 -named_conf=/etc/bind/named.conf +short_names=0 +master_dir=/var/lib/bind 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 +ndc_cmd=ndc +updserial_on=1 +show_list=0 +soa_start=0 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 +named_conf=/etc/bind/named.conf +whois_cmd=whois diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 75e5ffcde..2ab4c6af1 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ input_type=0 -max_users=200 sort_mode=0 +max_users=200 diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-software/config +++ b/webmin/cluster-software/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index 5e53fb9d2..5c5784fc6 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ +table_mode=0 +conf_find_user=1 +conf_find_group=1 conf_allow_refresh=1 -conf_host_links=1 +conf_allow_sync=1 conf_add_user=1 -conf_find_group=1 -conf_add_group=1 -conf_find_user=1 sort_mode=0 -conf_allow_sync=1 -table_mode=0 +conf_add_group=1 +conf_host_links=1 diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-webmin/config +++ b/webmin/cluster-webmin/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/config b/webmin/config index 9b942be76..022504ed4 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -help_width= -passwd_file=/etc/shadow +os_version=9.0 +lang_root=de.UTF-8 +ld_env=LD_LIBRARY_PATH referers_none=1 -hostnamedisplay= -hostnamemode=0 -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= -nofeedbackcc=0 -theme=authentic-theme passwd_cindex=2 -real_os_version=18.04.1 -lang_root=de.UTF-8 -lang=en.UTF-8 -dateformat=dd/mon/yyyy -sysinfo=0 +product=webmin showlogin=0 -showhost=0 -by_view=0 -os_version=9.0 +lang=en.UTF-8 +real_os_type=Ubuntu Linux +help_height= md5pass=1 +by_view=0 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +nofeedbackcc=0 webprefix= passwd_mindex=4 -ld_env=LD_LIBRARY_PATH -log=1 -product=webmin -real_os_type=Ubuntu Linux -tempdelete_days=7 +real_os_version=18.04.1 +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +passwd_file=/etc/shadow +theme=authentic-theme +dateformat=dd/mon/yyyy passwd_uindex=0 +tempdelete_days=7 +log=1 +sysinfo=0 +hostnamemode=0 +passwd_pindex=1 +showhost=0 +hostnamedisplay= +help_width= +os_type=debian-linux diff --git a/webmin/cpan/config b/webmin/cpan/config index 03d91d7f2..201970d3f 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -save_partial=0 incyum=1 +save_partial=0 +packages=http://www.cpan.org/modules/02packages.details.txt.gz refresh_days=30 -cpan=http://www.cpan.org/authors/id incpackages=1 -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 1cc00cf01..b0a0004fa 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,25 +1,25 @@ -kill_subs=0 -max_len=80 -cron_get_command=crontab -u USER -l -cron_user_delete_command=crontab -r -cron_dir=/var/spool/cron/crontabs -cron_user_edit_command=crontab -e -vixie_cron=1 +match_user=1 max_jobs=100 +cron_deny_all=2 cron_deny_file=/var/spool/cron/deny +cron_input=1 +cron_user_edit_command=crontab -e +show_time=0 +cron_user_delete_command=crontab -r +max_len=80 +cronfiles_dir=/etc/cron.d +hourly_only=0 +cron_delete_command=crontab -u USER -r +vixie_cron=1 match_mode=0 -match_user=1 -cron_allow_file=/var/spool/cron/allow -show_next=0 -cron_deny_all=2 -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_input=1 cron_user_get_command=crontab -l -hourly_only=0 +cron_dir=/var/spool/cron/crontabs +system_crontab=/etc/crontab +cron_allow_file=/var/spool/cron/allow +cron_get_command=crontab -u USER -l +show_run=0 +kill_subs=0 +show_next=0 +run_parts=run-parts diff --git a/webmin/custom/config b/webmin/custom/config index acfbdcae2..b0d710c45 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -params_file=0 +params_cmd=0 display_mode=0 columns=2 -params_cmd=0 +params_file=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index be65b9704..bd51b3012 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,17 +1,17 @@ -dhcpd_path=/usr/sbin/dhcpd -pid_file=/var/run/dhcpd.pid +desc_name=0 +lease_sort=0 +stop_cmd=service isc-dhcp-server stop +lease_vendor=0 +group_name=0 dhcpd_conf=/etc/dhcp/dhcpd.conf +display_max=100 restart_cmd=service isc-dhcp-server restart -lease_vendor=0 -lease_sort=0 -show_ip=0 -desc_name=0 +pid_file=/var/run/dhcpd.pid show_mac=0 lease_file=/var/lib/dhcp/dhcpd.leases -group_name=0 dhcpd_nocols=5 -stop_cmd=service isc-dhcp-server stop +show_ip=0 start_cmd=service isc-dhcp-server start -display_max=100 -lease_tz=0 interfaces_type=debian +lease_tz=0 +dhcpd_path=/usr/sbin/dhcpd diff --git a/webmin/dovecot/config b/webmin/dovecot/config index d5adf84fb..658fb103e 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ -pid_file=/var/run/dovecot/master.pid -init_script=dovecot -dovecot_config=/etc/dovecot/dovecot.conf dovecot=/usr/sbin/dovecot +dovecot_config=/etc/dovecot/dovecot.conf +init_script=dovecot +pid_file=/var/run/dovecot/master.pid diff --git a/webmin/exim/config b/webmin/exim/config index b09c023a2..038c2c1e3 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ exim_mail_file=Maildir exim_addrfile=/etc/exim4/email-addresses -exim_dbmext=.dbm +mail_system=1 exim_dir=/etc/exim4 -exim_virt_dir=/etc/exim4/aliases +exim_dbmext=.dbm exim_aliasfileext= -mail_system=1 +exim_virt_dir=/etc/exim4/aliases exim_dbmfile=/etc/exim4/local_domains diff --git a/webmin/exports/config b/webmin/exports/config index 7d1a41d0a..78081f81c 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/fail2ban/config b/webmin/fail2ban/config index 38e02282a..aebf23ff0 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 config_dir=/etc/fail2ban +server_cmd=/usr/bin/fail2ban-server init_script=fail2ban diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index f5889114d..99ab0f6f8 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ max_users=400 config_file= -daemon_user=root +pid_file=/var/run/fetchmail.pid fetchmail_path=fetchmail view_mode=0 -pid_file=/var/run/fetchmail.pid +daemon_user=root diff --git a/webmin/filter/config b/webmin/filter/config index 61b9b361f..935c86bc6 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ -warn_procmail=1 forward_procmail=0 +alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases +warn_procmail=1 virtualmin_config=/etc/webmin/virtual-server 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 5303507cc..76fed521d 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -cluster_mode=1 -direct=0 +comment_mod=0 view_comment=0 +cluster_mode=1 view_condition=1 -comment_mod=0 force_init=0 +direct=0 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 41105d5fc..82939db86 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ +force_init=0 direct=0 +comment_mod=0 view_comment=0 cluster_mode=1 -comment_mod=0 -force_init=0 view_condition=1 diff --git a/webmin/fsdump/config b/webmin/fsdump/config index cc4eea258..a6930596b 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -error_email=0 +webmin_subs=0 +run_mode=0 always_tar=0 date_subs=0 +error_email=0 nonewtape=0 -run_mode=0 simple_sched=0 -webmin_subs=0 diff --git a/webmin/grub/config b/webmin/grub/config index f6464eb2a..084704907 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ install=(hd0) -grub_path=grub menu_file=/boot/grub/menu.lst +grub_path=grub diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 3dd0f16e0..958a6ed12 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf -resource_d= -heartbeat=/usr/lib/heartbeat/heartbeat -apply_cmd=/etc/init.d/heartbeat reload +serials=/dev/ttyS* +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +ha_cf= authkeys= -pid_file=/var/run/heartbeat.pid +heartbeat=/usr/lib/heartbeat/heartbeat alt_haresources=/usr/share/doc/packages/heartbeat/haresources -ha_cf= -serials=/dev/ttyS* -req_resource_cmd=/usr/lib/heartbeat/req_resource +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +apply_cmd=/etc/init.d/heartbeat reload haresources= -ha_dir=/etc/ha.d start_cmd=/etc/init.d/heartbeat start +req_resource_cmd=/usr/lib/heartbeat/req_resource +ha_dir=/etc/ha.d stop_cmd=/etc/init.d/heartbeat stop -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +resource_d= +pid_file=/var/run/heartbeat.pid diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index 2ad874c35..293b3d362 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -htaccess=.htaccess -digest=1 -htpasswd=.htpasswd -htgroups=.htgroups -md5=1 -sha1=0 extra_directives= sort=0 +htpasswd=.htpasswd +digest=1 +sha1=0 +md5=1 +htgroups=.htgroups +htaccess=.htaccess diff --git a/webmin/idmapd/config b/webmin/idmapd/config index d6cd4227f..f25eeba97 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ -idmapd_conf=/etc/idmapd.conf restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi +idmapd_conf=/etc/idmapd.conf idmapd_path=/usr/sbin/rpc.idmapd diff --git a/webmin/inetd/config b/webmin/inetd/config index e8ca3902b..5dad58cf6 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ +rpc_file=/etc/rpc rpc_protocols=tcp udp -display_max=100 -show_empty=1 -extended_inetd=1 -services_file=/etc/services +ipv6=0 rpc_inetd=1 -qm_mode=0 -inetd_conf_file=/etc/inetd.conf deny_file=/etc/hosts.deny +protocols_file=/etc/protocols +inetd_conf_file=/etc/inetd.conf +tcpd_path=/usr/sbin/tcpd +show_empty=1 sort_mode=0 +qm_mode=0 restart_command=killall -HUP inetd -rpc_file=/etc/rpc -ipv6=0 -tcpd_path=/usr/sbin/tcpd allow_file=/etc/hosts.allow -protocols_file=/etc/protocols +display_max=100 +extended_inetd=1 +services_file=/etc/services diff --git a/webmin/init/config b/webmin/init/config index 1a738a8a1..9bcd5010c 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -order_digits=2 -inittab_id=id -atboot_product=webmin -order=0 +init_dir=/etc/init.d soft_links=1 +no_chkconfig=0 init_base=/etc/ init_info=1 show_opts=0 -init_dir=/etc/init.d -boot_levels=2 3 5 -no_chkconfig=0 +reboot_command=reboot desc=1 +order=0 shutdown_command=poweroff -status_check=0 expert=0 +order_digits=2 +status_check=0 +atboot_product=webmin +inittab_id=id +boot_levels=2 3 5 sort_mode=0 -reboot_command=reboot diff --git a/webmin/inittab/config b/webmin/inittab/config index c2b25728b..31db3e7b1 100644 --- a/webmin/inittab/config +++ b/webmin/inittab/config @@ -1,2 +1,2 @@ -telinit=telinit inittab_file=/etc/inittab +telinit=telinit diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index 738c3f269..fdebcd946 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ -view_comment=0 -ipnat=ipnat cluster_mode=0 -ipfstat=ipfstat ipf_conf=/etc/ipf/ipf.conf +ipf=ipf +ipnat=ipnat view_condition=1 -cluster_nat=1 ipnat_conf=/etc/ipf/ipnat.conf -ipf=ipf +view_comment=0 +cluster_nat=1 +ipfstat=ipfstat diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 68acae5c4..e927f16f7 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ -view_condition=1 view_comment=0 -view_counters=0 version=2 ipfw=/sbin/ipfw +view_condition=1 cluster_mode=0 +view_counters=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 9f44fe7d2..191f13a15 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ +file=/etc/ipsec.conf +ipsec=/usr/sbin/ipsec logfile=/var/log/messages +restart_cmd=/etc/init.d/ipsec restart 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 +policies_dir=/etc/ipsec.d/policies stop_cmd=/etc/init.d/ipsec stop diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 34c3a6b2a..9e1711732 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -config_file=/etc/iscsi/iscsid.conf -iscsiiname=iscsi-iname +init_name=open-iscsi initiator_file=/etc/iscsi/initiatorname.iscsi -ifaces_dir=/var/lib/iscsi/ifaces +iscsiiname=iscsi-iname +config_file=/etc/iscsi/iscsid.conf iscsiadm=iscsiadm -init_name=open-iscsi +ifaces_dir=/var/lib/iscsi/ifaces diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 4c0b5bf55..d31eaf93d 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 -init_name=netbsd-iscsi -auths_file=/etc/iscsi/auths opts_file=/etc/sysconfig/netbsd-iscsi +auths_file=/etc/iscsi/auths +init_name=netbsd-iscsi +iscsi_server=/usr/sbin/iscsi-target pid_file=/var/run/iscsi-target.pid +targets_file=/etc/iscsi/targets diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 1e9d0a928..f154008c8 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ -ietadm=ietadm -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 +initiators_file=/etc/iet/initiators.allow +opts_file=/etc/default/iscsitarget +config_file=/etc/iet/ietd.conf +ietadm=ietadm diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 655370a52..90828cbbe 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ init_name=tgtd +tgtadmin=tgt-admin tgtadm=tgtadm tgtd=tgtd -tgtadmin=tgt-admin config_file=/etc/tgt/targets.conf diff --git a/webmin/jabber/config b/webmin/jabber/config index f9d2c09aa..415989b80 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ jabber_config=/etc/jabber/jabber.xml stop_cmd=/etc/init.d/jabberd stop +start_cmd=/etc/init.d/jabberd start jabber_daemon=/usr/sbin/jabberd jabber_dir=/var/lib/jabber -start_cmd=/etc/init.d/jabberd start diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 4587ce571..55d1e7111 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -auth_ldap=/etc/ldap.conf -init_name=nslcd 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 262d606cf..f47a11828 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ -slapd=slapd -start_cmd=/etc/init.d/slapd start -browse_max=100 -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 +stop_cmd=/etc/init.d/slapd stop +config_file=/etc/ldap/slapd.d schema_dir=/etc/ldap/schema +browse_max=100 +slapd=slapd +start_cmd=/etc/init.d/slapd start +ldap_user=openldap +apply_cmd=/etc/init.d/slapd restart diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 565a787e7..e8a4b7437 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ -given=0 -membox=0 quota_support=0 -person=1 -mailfmt=0 -imap_folders=old public sent-mail +imap_class=SuSEeMailObject +slappasswd=slappasswd gecos=1 -md5=0 +given_order=0 +mailfmt=0 samba_gclass=sambaGroup -imap_class=SuSEeMailObject +auth_ldap=/etc/ldap.conf alias_same=0 -imap_def=0 secmode=0 -other_class=inetOrgPerson -auth_ldap=/etc/ldap.conf -samba_def=0 -slappasswd=slappasswd +imap_folders=old public sent-mail +md5=0 imap_login=cyrus -given_order=0 -imap_foldersep=. +given=0 +other_class=inetOrgPerson +membox=0 ldap_tls=0 -samba_class=sambaSamAccount multi_fields=0 +samba_class=sambaSamAccount +samba_def=0 +person=1 +imap_def=0 shells=fixed,ldap,passwd,shells +imap_foldersep=. diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 89a1a0d84..3cea25e7f 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -sort_mode=0 logrotate=logrotate -add_file=/etc/logrotate.d logrotate_conf=/etc/logrotate.conf +sort_mode=0 +add_file=/etc/logrotate.d diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index 3cdeb94f0..e847d4cc7 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -iface_owner=lp:lp -gs_lib= +display_mode=0 print_style=cups -sort_mode=0 -stop_cmd=/etc/init.d/cupsys stop -gs_path=gs -iface_arg= -gs_fontpath= start_cmd=/etc/init.d/cupsys start -show_status=0 -show_jobs=0 -display_mode=0 +gs_fontpath= spool_dir=/var/spool/cups -model_path=/usr/share/foomatic/db /usr/share/ppd -iface_perms=755 +gs_path=gs +gs_lib= driver_style=cups +iface_perms=755 +iface_owner=lp:lp +show_jobs=0 smbclient_path=smbclient +show_status=0 +sort_mode=0 +iface_arg= +stop_cmd=/etc/init.d/cupsys stop +model_path=/usr/share/foomatic/db /usr/share/ppd diff --git a/webmin/lvm/config b/webmin/lvm/config index a5ef0ed4d..63b743f61 100644 --- a/webmin/lvm/config +++ b/webmin/lvm/config @@ -1,2 +1,2 @@ -show_table=0 lvm_conf=/etc/lvm/lvm.conf +show_table=0 diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index 813d044fc..02d796dde 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ +show_to=0 ignore_users_enabled=0 +delete_warn=y mail_dir=Maildir -mail_usermin=mail -size_mode=1 -show_mail=0 -no_crlf=0 -spam_report= -mailbox_user=.usermin/mailbox +mail_system=3 fwd_mode=0 -show_body=0 -vpopmail_dir=/home/vpopmail -html_edit=0 +mailbox_user=.usermin/mailbox show_sent=0 -date_fmt=dmy -maildir_deleted=0 -track_read=0 -mail_style=0 -perpage=20 +no_crlf=0 +auto=1 +show_mail=0 +arrows=1 +html_quote=0 ignore_users= -link_mode=0 -show_count=0 open_mode=0 +sync_create=0 +link_mode=0 +view_html=0 +perpage=20 sync_delete=1 -spam_del=0 +size_mode=1 +maildir_deleted=0 +sig_file=* +show_size_below=0 +no_orig_ip=0 +show_count=0 show_unread=0 max_records=200 -no_mailer=0 -sync_modify=1 -sort_mode=1 +spam_report= +from_virtualmin=1 +spam_del=0 +track_read=0 +date_fmt=dmy +top_buttons=2 +sync_perms=0700 mail_file=Mailbox -arrows=1 +mail_usermin=mail +show_delall=0 wrap_width=80 +column_count=4 log_read=0 -mail_system=3 -delete_warn=y -no_orig_ip=0 -check_mod=1 -spam_buttons=mail +no_mailer=0 +sort_mode=1 noindex_hostname=0 -show_delall=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 -auto=1 show_size=1 +sync_modify=1 +mail_style=0 +vpopmail_dir=/home/vpopmail +check_mod=1 +spam_buttons=mail +html_edit=0 +show_body=0 diff --git a/webmin/man/config b/webmin/man/config index 8f6209df6..b5e281fc0 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ +doc_dir=/usr/share/doc 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 -doc_dir=/usr/share/doc man2html_path=man2html +list_cmd_sect=man -w SECTION PAGE kernel_dir=/usr/src/linux/Documentation man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man +man_cmd_sect=man SECTION PAGE diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index 1ebbcfa09..c0f6a8464 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.973 +server=MiniServ/1.974 diff --git a/webmin/mon/config b/webmin/mon/config index e29a42e57..c10046be0 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -pid_file=/var/run/mon.pid +start_cmd=/etc/init.d/mon start restart_cmd=/etc/init.d/mon restart -mon_cgi=/var/www/cgi-bin/mon.cgi +pid_file=/var/run/mon.pid monshow=/usr/bin/monshow -stop_cmd=/etc/init.d/mon stop -start_cmd=/etc/init.d/mon start +mon_cgi=/var/www/cgi-bin/mon.cgi cfbasedir=/etc/mon +stop_cmd=/etc/init.d/mon stop diff --git a/webmin/mount/config b/webmin/mount/config index afb363083..173f0feb9 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ +smbclient_path=smbclient +show_used=1 +long_fstypes=1 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 sort_mode=2 -smbclient_path=smbclient +sysinfo=1 +auto_file=/etc/am-utils/amd.conf +nmblookup_path=nmblookup diff --git a/webmin/mysql/config b/webmin/mysql/config index 57f5328fb..aec34b503 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 -mysqladmin=/usr/bin/mysqladmin -passwd_mode=0 -webmin_subs=0 +access=*: * +mysqlshow=/usr/bin/mysqlshow +login=root +max_dbs=50 +start_cmd=service mysql start +add_mode=1 nopwd=0 -date_subs=0 -style=0 +mysqlimport=/usr/bin/mysqlimport mysql=/usr/bin/mysql +webmin_subs=0 +mysqladmin=/usr/bin/mysqladmin nodbi=0 -stop_cmd=service mysql stop mysql_data=/var/lib/mysql +mysql_libs=/usr/local/mysql/lib blob_mode=0 -login=root -max_dbs=50 -start_cmd=service mysql start +stop_cmd=service mysql stop +passwd_mode=0 mysqldump=/usr/bin/mysqldump -access=*: * -add_mode=1 +perpage=25 +date_subs=0 +style=0 diff --git a/webmin/mysql/module.info.override b/webmin/mysql/module.info.override new file mode 100644 index 000000000..e69de29bb diff --git a/webmin/nis/config b/webmin/nis/config index 77c6c89c7..cccab7be9 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ +manual_build=0 +securenets=/etc/ypserv.securenets client_conf=/etc/yp.conf max_size=100 nsswitch_conf=/etc/nsswitch.conf -securenets=/etc/ypserv.securenets -manual_build=0 diff --git a/webmin/openslp/config b/webmin/openslp/config index 60230b9c6..630b639cf 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ +slpd=/usr/sbin/slpd slpd_conf=/etc/slp.conf +slpd_reg=/etc/slp.reg slpd_log=/var/log/slpd.log slpd_pid=/var/run/slpd.pid -slpd=/usr/sbin/slpd -slpd_reg=/etc/slp.reg diff --git a/webmin/package-updates/config b/webmin/package-updates/config index 226c127d1..195d872e7 100644 --- a/webmin/package-updates/config +++ b/webmin/package-updates/config @@ -1,2 +1,2 @@ -cache_time=6 update_multiple=1 +cache_time=6 diff --git a/webmin/pam/config b/webmin/pam/config index 9e8b1cc3c..44c9cbe9e 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ -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 fcdb2d609..307d5f417 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 +login_config=/etc/mgetty+sendfax/login.config +encrypt_pass=0 +mgetty=mgetty ppp_options=/etc/ppp/options +pppd=pppd +pap_file=/etc/ppp/pap-secrets diff --git a/webmin/passwd/config b/webmin/passwd/config index 1c1ed801d..75e5ffcde 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -sort_mode=0 -max_users=200 input_type=0 +max_users=200 +sort_mode=0 diff --git a/webmin/postfix/config b/webmin/postfix/config index 9eadf9da8..d3250a5b7 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ -check_config=1 -prefix_cmts=0 -fwd_mode=0 -wrap_width=80 -delete_warn=1 -postcat_cmd=/usr/sbin/postcat -columns=2 +postfix_control_command=/usr/sbin/postfix postfix_newaliases_command=/usr/bin/newaliases -postfix_config_file=/etc/postfix/main.cf -max_maps=100 -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_count=0 +prefix_cmts=0 +mailq_cmd=postqueue -p index_check=1 +postfix_config_file=/etc/postfix/main.cf postfix_aliases_table_command=/usr/sbin/postalias -postfix_master=/etc/postfix/master.cf -ldap_doms=0 -show_cmts=0 +columns=2 +perpage=20 mailq_sort=0 -postfix_queue_command=postqueue mailq_dir=/var/spool/postfix +postfix_lookup_table_command=/usr/sbin/postmap +ldap_doms=0 +max_maps=100 +delete_confirm=1 +postfix_master=/etc/postfix/master.cf +max_records=200 +postfix_queue_command=postqueue +show_cmts=0 +check_config=1 +postfix_config_command=/usr/sbin/postconf +delete_warn=1 top_buttons=1 +wrap_width=80 postfix_super_command=/usr/sbin/postsuper -mailq_cmd=postqueue -p -postfix_control_command=/usr/sbin/postfix -perpage=20 +fwd_mode=0 +postcat_cmd=/usr/sbin/postcat diff --git a/webmin/postgresql/config b/webmin/postgresql/config index fe65d6bc3..faee89f12 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -stop_cmd=/etc/init.d/postgresql* stop -access=*: * +access_own=0 +hba_conf=/etc/postgresql/*/main/pg_hba.conf +plib= add_mode=1 -max_dbs=50 -start_cmd=/etc/init.d/postgresql* start -login=postgres blob_mode=0 -style=0 +stop_cmd=/etc/init.d/postgresql* stop +perpage=25 date_subs=0 -access_own=0 -psql=/usr/bin/psql -nodbi=0 -plib= -hba_conf=/etc/postgresql/*/main/pg_hba.conf +pid_file=/var/run/postmaster.pid +style=0 +rstr_cmd=/usr/bin/pg_restore +webmin_subs=0 max_text=1000 -perpage=25 sameunix=1 -webmin_subs=0 +access=*: * pass= -pid_file=/var/run/postmaster.pid -basedb=template1 -simple_sched=0 +login=postgres +max_dbs=50 +nodbi=0 dump_cmd=/usr/bin/pg_dump -rstr_cmd=/usr/bin/pg_restore +psql=/usr/bin/psql +simple_sched=0 +basedb=template1 +start_cmd=/etc/init.d/postgresql* start diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 33a2029ee..7af13e89f 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ -wvdial=wvdial file=/etc/wvdial.conf +wvdial=wvdial wvdialconf=wvdialconf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 187ad8bca..43865ec3a 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -peers_dir=/etc/ppp/peers +timeout=30 pptp_options=/etc/ppp/options.pptp -pptp=pptp pap_file=/etc/ppp/chap-secrets -timeout=30 +pptp=pptp +peers_dir=/etc/ppp/peers diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index 2d2458d3f..b597f98ce 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ +pptp_ppp_options=/etc/ppp/pptpd-options +log_file=/var/log/messages +ppp_options=/etc/ppp/options stop_cmd=/etc/init.d/pptpd stop +file=/etc/pptpd.conf pptpd=pptpd -pap_file=/etc/ppp/chap-secrets pid_file=/var/run/pptpd.pid -log_file=/var/log/messages -file=/etc/pptpd.conf -pptp_ppp_options=/etc/ppp/pptpd-options -ppp_options=/etc/ppp/options start_cmd=/etc/init.d/pptpd start +pap_file=/etc/ppp/chap-secrets diff --git a/webmin/proc/config b/webmin/proc/config index fb255f92f..a77aef77c 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ cut_length=80 -trace_java=0 ps_style=linux hide_self=1 -default_mode=last base_ppid=1 +default_mode=last +trace_java=0 diff --git a/webmin/procmail/config b/webmin/procmail/config index ff60bb0d1..9b36ccfbe 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -procmailrc=/etc/procmailrc procmail=procmail +procmailrc=/etc/procmailrc includes=0 diff --git a/webmin/proftpd/config b/webmin/proftpd/config index 60a36e88a..a3c4d1f3a 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -proftpd_path=/usr/sbin/proftpd +stop_cmd=/etc/init.d/proftpd stop +test_config=1 test_always=0 +proftpd_path=/usr/sbin/proftpd +test_manual=0 proftpd_conf=/etc/proftpd/proftpd.conf -test_config=1 +pid_file=/var/run/proftpd.pid start_cmd=/etc/init.d/proftpd start ftpusers=/etc/ftpusers -stop_cmd=/etc/init.d/proftpd stop -test_manual=0 -pid_file=/var/run/proftpd.pid diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 6d1a05323..0f2b14f59 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ +mail_dir_qmail=Maildir mailq_count=0 sort_mode=0 +max_records=200 +mailq_sort=0 +columns=2 +delete_warn=1 perpage=20 +mail_dir= +mail_system=1 index_min=1000000 -mail_file=Mailbox qmail_dir=/var/qmail -mail_dir= -max_records=200 -columns=2 -mail_dir_qmail=Maildir -mailq_sort=0 +mail_file=Mailbox fwd_mode=0 -mail_system=1 -delete_warn=1 diff --git a/webmin/quota/config b/webmin/quota/config index 264ac7f6d..5527b06a5 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -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 +show_grace=1 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 -user_edquota_command=edquota -u +user_quota_command=quota -v -u block_size=1024 block_mode=1 -show_grace=1 -quotacheck_command=quotacheck -u -g -group_repquota_command=repquota -g -v -user_quota_command=quota -v -u -user_quotaoff_command=quotaoff -u +user_setquota_command=setquota -u +sort_mode=0 +user_quotaon_command=quotaon -u display_max=100 +user_edquota_command=edquota -u +pc_show=1 user_grace_command=edquota -u -t +group_quotaon_command=quotaon -g +quotacheck_command=quotacheck -u -g hide_uids=0 -sort_mode=0 +group_edquota_command=edquota -g +group_copy_command=edquota -g -p +user_quotaoff_command=quotaoff -u +user_repquota_command=repquota -u -v group_quota_command=quota -v -g -pc_show=1 +group_repquota_command=repquota -g -v +group_quotaoff_command=quotaoff -g user_copy_command=edquota -u -p +group_grace_command=edquota -g -t group_setquota_command=setquota -g diff --git a/webmin/raid/config b/webmin/raid/config index 76eb03452..c4849915b 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ +mdstat=/proc/mdstat mdadm=/etc/mdadm/mdadm.conf raidtab=/etc/raidtab -mdstat=/proc/mdstat diff --git a/webmin/samba/config b/webmin/samba/config index b681f13ce..0af908e0a 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -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_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 -text_lists=0 -run_from_inetd=0 -samba_password_program=/usr/bin/smbpasswd -smb_passwd=/etc/samba/smbpasswd +restart_cmd=service smbd restart ; service nmbd restart sort_mode=0 stop_cmd=service smbd stop ; service nmbd stop +samba_server=/usr/sbin/smbd +text_lists=0 start_cmd=service smbd start ; service nmbd start -smbgroupedit=/usr/bin/smbgroupedit +samba_status_program=/usr/bin/smbstatus +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' +run_from_inetd=0 +smb_passwd=/etc/samba/smbpasswd +dont_convert=-499 pdbedit=/usr/bin/pdbedit +samba_password_program=/usr/bin/smbpasswd +smb_conf=/etc/samba/smb.conf +smbgroupedit=/usr/bin/smbgroupedit +name_server=/usr/sbin/nmbd diff --git a/webmin/sarg/config b/webmin/sarg/config index a8477b752..c41edca4f 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -clear=1 -sarg_conf=/etc/sarg/sarg.conf naked=0 sarg=sarg +sarg_conf=/etc/sarg/sarg.conf +clear=1 diff --git a/webmin/sendmail/config b/webmin/sendmail/config index d0206c197..e6ae9ba86 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -perpage=20 -sendmail_path=/usr/lib/sendmail -sendmail_command=/usr/lib/sendmail -bd -q1h +smrsh_dir=/etc/smrsh +mailq_show=Date,From,To,Size,Status +track_read=0 +order_mail=0 +delete_warn=1 +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +max_records=200 +show_cmts=0 +show_to=0 +mail_file=mbox +fwd_mode=0 +wrap_width=80 +mail_type=0 +top_buttons=1 +mail_dir=/var/spool/mail sendmail_features=/usr/share/sendmail/cf sendmail_cf=/etc/mail/sendmail.cf -top_buttons=1 mail_style=0 -track_read=0 +columns=2 mailq_sort=0 -show_cmts=0 sendmail_mc=/etc/mail/sendmail.mc -mail_type=0 -smrsh_dir=/etc/smrsh -show_to=0 +perpage=20 makemap_path=makemap -order_mail=0 -index_min=1000000 -mail_file=mbox sort_mode=0 +prefix_cmts=0 mailq_count=0 -mailq_show=Date,From,To,Size,Status -max_records=200 +sendmail_command=/usr/lib/sendmail -bd -q1h +sendmail_path=/usr/lib/sendmail +index_min=1000000 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 9ca79bfa9..211aef8fc 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -groups_dir=/etc/cluster/groups -sort_mode=0 resolve=1 -max_servers=100 -deffast=2 -show_ip=0 +scan_time=5 deflink=0 +show_status=1 +sort_mode=0 +groups_dir=/etc/cluster/groups +deffast=2 capath=/usr/share/ca-certificates -scan_time=5 +show_ip=0 +max_servers=100 display_mode=0 -show_status=1 diff --git a/webmin/shell/config b/webmin/shell/config index 044e158ce..af7728831 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 ed0dababb..9e2d83099 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -shorewall=shorewall actions=/etc/shorewall/actions /usr/share/shorewall/actions.std -display_zone_descriptions=1 +shorewall=shorewall config_dir=/etc/shorewall +display_zone_descriptions=1 macros=/usr/share/shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index 10a2651bb..915cc8629 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -shorewall6=shorewall6 display_zone_descriptions=1 -config_dir=/etc/shorewall6 macros=/usr/share/shorewall6 +shorewall6=shorewall6 +actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std +config_dir=/etc/shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index 8537d1b9b..2f395c4f9 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ -mode=1 smartctl=smartctl -ata=0 +mode=1 attribs=1 +ata=0 diff --git a/webmin/software/config b/webmin/software/config index bf587ee21..facec37dd 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ package_system=debian -update_system=apt apt_mode=0 +update_system=apt diff --git a/webmin/spam/config b/webmin/spam/config index 14341cef1..348903ba0 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ +local_cf=/etc/spamassassin/local.cf procmail_cmd=* -sa_learn=sa-learn +addto=0 max_awl=200 +procmailrc=/etc/procmailrc +spamassassin=spamassassin mode=0 +call_spam=1 processes=spamd amavisd -spamassassin=spamassassin -procmailrc=/etc/procmailrc -local_cf=/etc/spamassassin/local.cf restart_cmd=/etc/init.d/spamassassin restart -call_spam=1 +sa_learn=sa-learn warn_procmail=1 -addto=0 diff --git a/webmin/squid/config b/webmin/squid/config index 848fd162b..718160957 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -log_dir=/var/log/squid -cal_args=-aw +sync_modify=1 pid_file=/var/run/squid.pid -crypt_conf=0 -sort_conf=0 +sync_create=0 +calamaris=calamaris +squid_path=squid cal_fmt=w -squid_start=service squid start +squid_restart=service squid reload squidclient=squidclient +sort_conf=0 squid_stop=service squid stop -calamaris=calamaris -cal_max=50000 -cache_dir=/var/spool/squid -sync_modify=1 -sync_create=0 +squid_start=service squid start restart_pos=0 -sync_delete=0 -squid_path=squid -squid_conf=/etc/squid/squid.conf +cal_args=-aw +crypt_conf=0 cal_all=1 -squid_restart=service squid reload cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +log_dir=/var/log/squid +sync_delete=0 +cal_max=50000 +cache_dir=/var/spool/squid +squid_conf=/etc/squid/squid.conf diff --git a/webmin/sshd/config b/webmin/sshd/config index d214957eb..e2b2c73c1 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -sync_pass=0 +sync_gnupg=0 pid_file=/var/run/sshd.pid +sync_create=0 +start_cmd=service ssh start +sshd_config=/etc/ssh/sshd_config client_config=/etc/ssh/ssh_config sshd_path=/usr/sbin/sshd +sync_pass=0 +sync_auth=1 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 a7ff8b8d5..a0e8c0dbd 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,13 +1,13 @@ -history_show=50 -snmp_version=2 -subject_mode=0 +index_status=1 +pager_cmd=sms_client sched_offset=0 +sysinfo_users=0 +snmp_trap=1.3.6.1.4.1.10000.1.1 sort_mode=0 -history_purge=30 -pager_cmd=sms_client -index_status=1 -output=0 +subject_mode=0 sysinfo=0 -snmp_trap=1.3.6.1.4.1.10000.1.1 -sysinfo_users=0 +history_show=50 +snmp_version=2 +output=0 +history_purge=30 columns=2 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index c565166d1..cf17b180e 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ +syslogng_conf=/etc/syslog-ng/syslog-ng.conf +compressed=1 +syslogng_cmd=syslog-ng +stop_cmd=/etc/init.d/syslog-ng stop pid_file=/var/run/syslog-ng.pid 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 -compressed=1 diff --git a/webmin/syslog/config b/webmin/syslog/config index 7cbc860ff..122c6761f 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ -tags=0 +lines=20 start_cmd=/usr/sbin/service rsyslog start 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= +signal_cmd=/usr/sbin/service rsyslog restart socket=0 -pri_all=1 compressed=1 -lines=20 -restart_cmd=/usr/sbin/service rsyslog restart pid_file=/var/run/rsyslogd.pid -signal_cmd=/usr/sbin/service rsyslog restart +restart_cmd=/usr/sbin/service rsyslog restart +m4_path= +tags=0 sync=1 +pipe=1 +syslog_conf=/etc/rsyslog.conf +pri_dir=1 +pri_all=1 +reverse=0 +m4_conf=0 +syslogd=/usr/sbin/rsyslogd diff --git a/webmin/system-status/config b/webmin/system-status/config index c627a9fec..b6a7e4155 100644 --- a/webmin/system-status/config +++ b/webmin/system-status/config @@ -1,2 +1,2 @@ -collect_pkgs=1 collect_interval=5 +collect_pkgs=1 diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config index 10eceba4d..bfd2d19d4 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ -hosts_deny=/etc/hosts.deny -hosts_allow=/etc/hosts.allow inetd_services=0 +hosts_allow=/etc/hosts.allow +hosts_deny=/etc/hosts.deny diff --git a/webmin/telnet/config b/webmin/telnet/config index b5cbb0cf2..564a384c6 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ -sizemode=0 -detach=0 proxy=0 no_test=0 +sizemode=0 mode=1 +detach=0 diff --git a/webmin/time/config b/webmin/time/config index 71ef6c203..2d666d1a7 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ lease=5 +ntp_only=1 zone_style=linux timeserver_hardware=1 -timeserver=0.pool.ntp.org seconds=1 -ntp_only=1 +timeserver=0.pool.ntp.org diff --git a/webmin/updown/config b/webmin/updown/config index c0df4bf3b..9eddc8fbb 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ +duser=root dir=/ -ddir=/ user=root -duser=root +ddir=/ diff --git a/webmin/useradmin/config b/webmin/useradmin/config index b87309727..c48b57f39 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -shadow_file=/etc/shadow -display_max=400 -random_password=0 -group_file=/etc/group -secmode=0 -user_files=/etc/skel -new_user_gid=0 -new_user_group=0 -gid_mode=1 -delete_only=0 -sort_mode=0 +skip_md5=0 from_files=0 +uid_calc=0 base_uid=1000 -passwd_same=0 -home_base=/home -membox=0 -empty_mode=0 +base_gid=1000 passwd_file=/etc/passwd -default_other=1 default_group=users -display_mode=1 -uid_mode=1 +default_other=1 +shadow_file=/etc/shadow +user_files=/etc/skel +selinux_con=user_u:object_r:user_home_dir_t +last_show=0 md5=1 -homedir_perms=0755 alias_check=0 -base_gid=1000 -delete_root=0 -last_show=0 -uid_calc=0 +email_type=0 +delete_only=0 +secmode=0 +gshadow_file=/etc/gshadow +empty_mode=0 +uid_mode=1 +extra_real=0 +sort_mode=0 home_style=0 -shells=fixed,passwd,shells +display_max=400 +membox=0 +random_password=0 passwd_dict=0 -extra_real=0 -lock_string=* -gshadow_file=/etc/gshadow +group_file=/etc/group +new_user_group=0 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 +home_base=/home +delete_root=0 +display_mode=1 +passwd_same=0 +new_user_gid=0 +shells=fixed,passwd,shells +homedir_perms=0755 +lock_string=* +passwd_stars=0 +gid_mode=1 diff --git a/webmin/usermin/config b/webmin/usermin/config index 5c9ee6d7f..0a1a3187e 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ uphour=4 upshow=1 -cron_mode=0 +usermin_dir=/etc/usermin upmissing=0 -update=0 updays=1 -usermin_dir=/etc/usermin +update=0 +cron_mode=0 diff --git a/webmin/version b/webmin/version index 63c3f6c70..495aca49f 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.973 +1.974 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index f1a176042..929b33a86 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -skip_old=0 -webalizer_conf=/etc/webalizer/webalizer.conf webalizer=/usr/bin/webalizer -alt_conf=/etc/webalizer/webalizer.conf.sample naked=0 auto=apache,squid,proftpd,wuftpd +alt_conf=/etc/webalizer/webalizer.conf.sample +webalizer_conf=/etc/webalizer/webalizer.conf +skip_old=0 diff --git a/webmin/webmin/config b/webmin/webmin/config index f769fc453..982ceb0b5 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ -letsencrypt_dns_wait=10 -update=0 +last_version_number=1.900 +updays=1 upmissing=0 -last_version_check=1549050668 -warn_days=7 -upmins=47 -upshow=1 +update=0 +osdn=1 uphour=23 -last_version_number=1.900 +upshow=1 cron_mode=0 -osdn=1 -updays=1 +letsencrypt_dns_wait=10 +warn_days=7 +upmins=47 +last_version_check=1549050668 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index e5126088e..e783e2db8 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftpgroups=/etc/wu-ftpd/ftpgroups +ftpd_path=/usr/sbin/wu-ftpd ftphosts=/etc/wu-ftpd/ftphosts pid_file=/var/run/ftpd.pids-all -ftpconversions=/etc/wu-ftpd/ftpconversions -log_file=/var/log/xferlog ftpusers=/etc/wu-ftpd/ftpusers ftpaccess=/etc/wu-ftpd/ftpaccess -ftpd_path=/usr/sbin/wu-ftpd +ftpconversions=/etc/wu-ftpd/ftpconversions +ftpgroups=/etc/wu-ftpd/ftpgroups +log_file=/var/log/xferlog diff --git a/webmin/xinetd/config b/webmin/xinetd/config index dd1583869..74d1cb77f 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -protocols_file=/etc/protocols -xinetd_conf=/etc/xinetd.conf -pid_file=/var/run/xinetd.pid lookup_servs=1 +pid_file=/var/run/xinetd.pid start_cmd=/etc/init.d/xinetd start +protocols_file=/etc/protocols +xinetd_conf=/etc/xinetd.conf