committing changes in /etc made by "apt-get upgrade"

Package changes:
-intel-microcode 3.20201110.0ubuntu0.20.04.1 amd64
+intel-microcode 3.20201110.0ubuntu0.20.04.2 amd64
-webmin 1.960 all
+webmin 1.962 all

diff --git a/webmin/acl/config b/webmin/acl/config
index e5e83c2ab2de371e2abed5d4d4ac40506d568e89..ee9b4c16bf9c98fa7f50a8d5cc598fcc568ad3c9 100644 (file)
--- a/webmin/acl/config
+++ b/webmin/acl/config
@@ -1,3 +1,3 @@
-order=0
 display=1
 ssleay=/usr/bin/openssl
+order=0

diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config
index 7479b484601150721358c71a8047671b333d0f42..3b7d1326eb7b660b98b31e6c86b8a31516615cfc 100644 (file)
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
+conf_style=0
+stop_cmd=adsl-stop
 start_cmd=adsl-start
-pppoe_conf=/etc/ppp/pppoe.conf
 pppoe_cmd=pppoe
-stop_cmd=adsl-stop
-conf_style=0
-pap_file=/etc/ppp/pap-secrets
 status_cmd=adsl-status
+pap_file=/etc/ppp/pap-secrets
+pppoe_conf=/etc/ppp/pppoe.conf

diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config
index 003ebb11cc5559dda5bdbac81019f2718ead6c95..a31edabcbfd145ec85ac796ce4d4f2cb4e4d4f56 100644 (file)
--- a/webmin/ajaxterm/config
+++ b/webmin/ajaxterm/config
@@ -1,2 +1,2 @@
-timeout=120
 autologin=0
+timeout=120

diff --git a/webmin/apache/config b/webmin/apache/config
index e77c3b02d8c06f1dce754a0669c87db80325be7c..da0315c05a22c930d49df67a7033e2a6756ff968 100644 (file)
--- a/webmin/apache/config
+++ b/webmin/apache/config
@@ -1,24 +1,24 @@
 show_order=0
-start_cmd=/etc/init.d/apache2 start
-show_names=0
-defines_name=APACHE_ARGUMENTS
-allow_virtualmin=0
-access_conf=/etc/apache2/access.conf
-mime_types=/etc/apache2/mime.types
-auto_mods=1
 httpd_path=/usr/sbin/apache2
+allow_virtualmin=0
 virt_file=/etc/apache2/sites-available
-apachectl_path=/usr/sbin/apache2ctl
-stop_cmd=/etc/init.d/apache2 stop
-httpd_conf=/etc/apache2/apache2.conf
-show_list=0
-test_config=1
-srm_conf=/etc/apache2/srm.conf
 defines_file=/etc/apache2/envvars
-link_dir=/etc/apache2/sites-enabled
-apply_cmd=/usr/sbin/apache2ctl graceful
 max_servers=100
-httpd_dir=/etc/apache2
 test_manual=0
+srm_conf=/etc/apache2/srm.conf
+apachectl_path=/usr/sbin/apache2ctl
+mime_types=/etc/apache2/mime.types
+defines_name=APACHE_ARGUMENTS
+start_cmd=/etc/init.d/apache2 start
+apply_cmd=/usr/sbin/apache2ctl graceful
+httpd_dir=/etc/apache2
 test_always=0
+test_config=1
 test_apachectl=1
+stop_cmd=/etc/init.d/apache2 stop
+access_conf=/etc/apache2/access.conf
+show_names=0
+httpd_conf=/etc/apache2/apache2.conf
+link_dir=/etc/apache2/sites-enabled
+show_list=0
+auto_mods=1

diff --git a/webmin/backup-config/config b/webmin/backup-config/config
index 3bdfb12314d2029a5f48b8a829223d76f2c7e3b2..5d1c57e87eb30530e70bf4acd955b5b1a089763b 100644 (file)
--- a/webmin/backup-config/config
+++ b/webmin/backup-config/config
@@ -1,3 +1,3 @@
 date_subs=0
-apply=1
 webmin_subs=0
+apply=1

diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config
index 7ac49a150c95a26827b909e809153ce09f274d72..b4e87b4be99dd484bff4c57cf7e72a952d9f44d0 100644 (file)
--- a/webmin/bacula-backup/config
+++ b/webmin/bacula-backup/config
@@ -1,12 +1,12 @@
-user=bacula
-init_start=0
-bextract=bextract
-driver=Pg
-bls=bls
+pass=
+db=bacula
+wait=1
+btape=btape
 apply=1
+driver=Pg
 showdirs=0
+init_start=0
 bacula_dir=/etc/bacula
-btape=btape
-pass=
-wait=1
-db=bacula
+user=bacula
+bls=bls
+bextract=bextract

diff --git a/webmin/bind8/config b/webmin/bind8/config
index fb9a3d0a00ef01712a50be9b58088450ca6b0709..65cf7dab12cceca59813cca4f6ac023aa60c7541 100644 (file)
--- a/webmin/bind8/config
+++ b/webmin/bind8/config
@@ -1,45 +1,45 @@
-allow_comments=0
-no_chroot=0
+rev_def=0
+confirm_zone=1
+largezones=0
+support_aaaa=1
+rndcconf_cmd=rndc-confgen
+slave_dir=/var/lib/bind
+max_zones=50
+checkzone=named-checkzone
+soa_style=0
+zones_file=/etc/bind/named.conf.local
 short_names=0
+show_list=0
+confirm_rec=0
 ipv6_mode=1
-updserial_def=0
-updserial_on=1
+spf_record=0
+soa_start=0
+master_ttl=1
 checkconf=named-checkconf
-pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
-rev_must=0
-largezones=0
-reversezonefilename_format=ZONE.rev
-rndc_cmd=rndc
+updserial_on=1
+allow_long=0
+by_view=0
 keygen=dnssec-keygen
-zones_file=/etc/bind/named.conf.local
-slave_dir=/var/lib/bind
+updserial_def=0
 other_slaves=1
-allow_underscore=1
-allow_long=0
-checkzone=named-checkzone
-records_order=0
+rndc_cmd=rndc
+named_conf=/etc/bind/named.conf
+pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid
+no_pid_chroot=0
+rndc_conf=/etc/bind/rndc.conf
 relative_paths=0
-allow_wild=1
-whois_cmd=whois
-confirm_zone=1
+no_chroot=0
 force_random=0
-updserial_man=1
 forwardzonefilename_format=ZONE.hosts
-named_conf=/etc/bind/named.conf
-confirm_rec=0
-support_aaaa=1
-rev_def=0
-rndc_conf=/etc/bind/rndc.conf
-spf_record=0
-no_pid_chroot=0
-soa_start=0
-soa_style=0
+master_dir=/var/lib/bind
+allow_wild=1
 named_path=/usr/sbin/named
-show_list=0
-max_zones=50
-by_view=0
-master_ttl=1
+records_order=0
+allow_underscore=1
+reversezonefilename_format=ZONE.rev
 ndc_cmd=ndc
-master_dir=/var/lib/bind
+allow_comments=0
 signzone=dnssec-signzone
-rndcconf_cmd=rndc-confgen
+rev_must=0
+whois_cmd=whois
+updserial_man=1

diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config
index 1c1ed801df780c749f8753e235a79011201bd452..75e5ffcde479b9f9dbe56587d0430f9479c96f35 100644 (file)
--- a/webmin/cluster-passwd/config
+++ b/webmin/cluster-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/cluster-software/config b/webmin/cluster-software/config
index 470eaee86535d874ac8fe55dbfee746a3dd61ef8..fd788cb1e074549f6b0858f1e816c867c16118a7 100644 (file)
--- 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 31329133ec6070340cebef5d867f0dea0570dc34..36f8f0aedcd948fbd66caa16e9699160ddbde0bf 100644 (file)
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
-conf_find_group=1
-conf_add_group=1
 conf_add_user=1
-table_mode=0
+conf_add_group=1
+conf_allow_sync=1
+sort_mode=0
+conf_find_group=1
 conf_find_user=1
 conf_host_links=1
-sort_mode=0
-conf_allow_sync=1
+table_mode=0
 conf_allow_refresh=1

diff --git a/webmin/config b/webmin/config
index a0a4dd4bac8178cc3e03efe7199852ad32ef61bc..241d7968191efe371ee307cd9202791401720049 100644 (file)
--- a/webmin/config
+++ b/webmin/config
@@ -1,32 +1,32 @@
-by_view=0
+os_version=9.0
+ld_env=LD_LIBRARY_PATH
+real_os_version=18.04.1
+theme=authentic-theme
+lang=en.UTF-8
+passwd_uindex=0
+referers_none=1
+log=1
+os_type=debian-linux
 hostnamedisplay=
-hostnamemode=0
+md5pass=1
+nofeedbackcc=0
 feedback_to=
+tempdelete_days=7
+lang_root=de.UTF-8
 passwd_mindex=4
-os_type=debian-linux
-lang=en.UTF-8
+product=webmin
+dateformat=dd/mon/yyyy
+webprefix=
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+passwd_pindex=1
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
+showhost=0
+sysinfo=0
 passwd_file=/etc/shadow
 showlogin=0
-os_version=9.0
-nofeedbackcc=0
+hostnamemode=0
 passwd_cindex=2
-real_os_version=18.04.1
+by_view=0
+help_height=
 real_os_type=Ubuntu Linux
-product=webmin
-md5pass=1
 help_width=
-tempdelete_days=7
-theme=authentic-theme
-passwd_pindex=1
-help_height=
-ld_env=LD_LIBRARY_PATH
-webprefix=
-sysinfo=0
-passwd_uindex=0
-lang_root=de.UTF-8
-log=1
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-showhost=0
-dateformat=dd/mon/yyyy
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-referers_none=1

diff --git a/webmin/cpan/config b/webmin/cpan/config
index 82f8f80ad60be947627e92e5a910ac28a9875c43..c08bb337274bf0a29067c26a38aa7dd2d1b44f29 100644 (file)
--- a/webmin/cpan/config
+++ b/webmin/cpan/config
@@ -1,6 +1,6 @@
+incyum=1
 incpackages=1
-cpan=http://www.cpan.org/authors/id
+packages=http://www.cpan.org/modules/02packages.details.txt.gz
 save_partial=0
+cpan=http://www.cpan.org/authors/id
 refresh_days=30
-packages=http://www.cpan.org/modules/02packages.details.txt.gz
-incyum=1

diff --git a/webmin/cron/config b/webmin/cron/config
index 0a5aa5c695176ebf929af60fc32637156dddc5dc..a9cfdf4b34edbc3d38e96a2967eeb251451cbaaf 100644 (file)
--- a/webmin/cron/config
+++ b/webmin/cron/config
@@ -1,25 +1,25 @@
 show_comment=0
-system_crontab=/etc/crontab
-max_len=80
-cron_user_delete_command=crontab -r
-run_parts=run-parts
-cron_deny_all=2
-vixie_cron=1
-show_run=0
-cron_edit_command=crontab -u USER -e
-match_user=1
+max_jobs=100
+cron_allow_file=/var/spool/cron/allow
 cron_dir=/var/spool/cron/crontabs
-show_time=0
+vixie_cron=1
+system_crontab=/etc/crontab
+cron_get_command=crontab -u USER -l
+cron_input=1
 show_next=0
-match_mode=0
-cronfiles_dir=/etc/cron.d
-hourly_only=0
 cron_user_get_command=crontab -l
-cron_input=1
+cronfiles_dir=/etc/cron.d
+cron_user_edit_command=crontab -e
+cron_delete_command=crontab -u USER -r
+match_user=1
 kill_subs=0
-cron_get_command=crontab -u USER -l
-cron_allow_file=/var/spool/cron/allow
-max_jobs=100
+show_run=0
+max_len=80
+cron_deny_all=2
+hourly_only=0
+match_mode=0
 cron_deny_file=/var/spool/cron/deny
-cron_delete_command=crontab -u USER -r
-cron_user_edit_command=crontab -e
+cron_edit_command=crontab -u USER -e
+cron_user_delete_command=crontab -r
+run_parts=run-parts
+show_time=0

diff --git a/webmin/custom/config b/webmin/custom/config
index 55a8becd6fc6cbfc291d2223682679144d49af9a..aea470f3c56472af6080e6a0f57fd6f1580daab8 100644 (file)
--- a/webmin/custom/config
+++ b/webmin/custom/config
@@ -1,4 +1,4 @@
+params_cmd=0
 columns=2
 params_file=0
 display_mode=0
-params_cmd=0

diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index 62474e1463cef54c0e2b8731a35fb5d7ce88723b..098b57a32fa3a1914288d56753e6af979126370d 100644 (file)
--- a/webmin/dhcpd/config
+++ b/webmin/dhcpd/config
@@ -1,16 +1,16 @@
-pid_file=/var/run/dhcpd.pid
-show_mac=0
-group_name=0
 start_cmd=service isc-dhcp-server start
-show_ip=0
-display_max=100
-desc_name=0
-dhcpd_conf=/etc/dhcp/dhcpd.conf
-restart_cmd=service isc-dhcp-server restart
+show_mac=0
 dhcpd_nocols=5
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+desc_name=0
+display_max=100
+dhcpd_path=/usr/sbin/dhcpd
+group_name=0
+pid_file=/var/run/dhcpd.pid
+lease_sort=0
 stop_cmd=service isc-dhcp-server stop
+show_ip=0
 lease_tz=0
 lease_file=/var/lib/dhcp/dhcpd.leases
 interfaces_type=debian
-dhcpd_path=/usr/sbin/dhcpd
-lease_sort=0
+restart_cmd=service isc-dhcp-server restart

diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index 6b501532333d72c2d277fce300cfc3634b5902f3..d6e9d8483647b58793c5255e16aba1cf7206792d 100644 (file)
--- a/webmin/dovecot/config
+++ b/webmin/dovecot/config
@@ -1,4 +1,4 @@
-pid_file=/var/run/dovecot/master.pid
 dovecot_config=/etc/dovecot/dovecot.conf
+pid_file=/var/run/dovecot/master.pid
 dovecot=/usr/sbin/dovecot
 init_script=dovecot

diff --git a/webmin/exim/config b/webmin/exim/config
index 3b921371a54cdfeb022e112418939878c0460631..58d77d68f2897391d962dda97932399323bb921b 100644 (file)
--- a/webmin/exim/config
+++ b/webmin/exim/config
@@ -1,8 +1,8 @@
+exim_dbmfile=/etc/exim4/local_domains
+exim_dir=/etc/exim4
+exim_addrfile=/etc/exim4/email-addresses
 exim_mail_file=Maildir
-exim_dbmext=.dbm
 exim_aliasfileext=
-exim_addrfile=/etc/exim4/email-addresses
-exim_dir=/etc/exim4
-exim_virt_dir=/etc/exim4/aliases
+exim_dbmext=.dbm
 mail_system=1
-exim_dbmfile=/etc/exim4/local_domains
+exim_virt_dir=/etc/exim4/aliases

diff --git a/webmin/exports/config b/webmin/exports/config
index 5a48ca66fb55683866e1a0cfe1c82382aa28c518..b8864bec557a8fe17e2f07d54397b75e1b3b8d41 100644 (file)
--- a/webmin/exports/config
+++ b/webmin/exports/config
@@ -1,3 +1,3 @@
-apply_cmd=exportfs -r
-restart_command=if (killall -HUP rpc.nfsd && killall -HUP rpc.mountd); then /bin/true; else (/etc/init.d/nfs-*server stop ; /etc/init.d/nfs-*server start) fi
 exports_file=/etc/exports
+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

diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config
index 8598b4b2e4ea0c3e72db7ddd1b4b256940b51f02..00afde77986b46b3bc3a76a2f543f61e5490ad4f 100644 (file)
--- a/webmin/fail2ban/config
+++ b/webmin/fail2ban/config
@@ -1,4 +1,4 @@
-init_script=fail2ban
 config_dir=/etc/fail2ban
-client_cmd=/usr/bin/fail2ban-client
+init_script=fail2ban
 server_cmd=/usr/bin/fail2ban-server
+client_cmd=/usr/bin/fail2ban-client

diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config
index b6861409e411586d6c301d80b65815ac17ca1206..38cf033bf88e0c17ca36a9eadd34ab3f556e0476 100644 (file)
--- a/webmin/fetchmail/config
+++ b/webmin/fetchmail/config
@@ -1,6 +1,6 @@
 view_mode=0
+config_file=
 max_users=400
+pid_file=/var/run/fetchmail.pid
 daemon_user=root
 fetchmail_path=fetchmail
-config_file=
-pid_file=/var/run/fetchmail.pid

diff --git a/webmin/filter/config b/webmin/filter/config
index d776d608609106fad0f96cb72c0518292dbd2c9c..fdc102a5d651d6939cf08826b602a8335939dc44 100644 (file)
--- a/webmin/filter/config
+++ b/webmin/filter/config
@@ -1,6 +1,6 @@
-warn_procmail=1
-virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
 reply_force=0
-virtualmin_config=/etc/webmin/virtual-server
 alias_files=/etc/aliases       /etc/postfix/aliases    /etc/mail/aliases
+warn_procmail=1
+virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
 forward_procmail=0
+virtualmin_config=/etc/webmin/virtual-server

diff --git a/webmin/firewall/config b/webmin/firewall/config
index 8864aaac9c84b9aa0349facaf3451f9c3a1df428..3f438a7f7a2d141675b5f164d379263e7264cdf2 100644 (file)
--- a/webmin/firewall/config
+++ b/webmin/firewall/config
@@ -1,6 +1,6 @@
-force_init=0
-comment_mod=0
+view_comment=0
 direct=0
 view_condition=1
-view_comment=0
+comment_mod=0
+force_init=0
 cluster_mode=1

diff --git a/webmin/firewall6/config b/webmin/firewall6/config
index f1c0db1de40295936f8523f33a88653b2fe5cdbf..d20de0ca50b81b3d1b859552e4ca3e00bda318bb 100644 (file)
--- a/webmin/firewall6/config
+++ b/webmin/firewall6/config
@@ -1,6 +1,6 @@
+force_init=0
 cluster_mode=1
 comment_mod=0
-view_condition=1
 direct=0
+view_condition=1
 view_comment=0
-force_init=0

diff --git a/webmin/firewalld/config b/webmin/firewalld/config
index ff329a00df52306ad875de4b3eea0cfebd0b9201..0aae64fac685f941a198c53d4a9b77d5545ebcb9 100644 (file)
--- a/webmin/firewalld/config
+++ b/webmin/firewalld/config
@@ -1,2 +1,2 @@
-firewall_cmd=firewall-cmd
 init_name=firewalld
+firewall_cmd=firewall-cmd

diff --git a/webmin/fsdump/config b/webmin/fsdump/config
index dfef40b595d4638550d323e446323cc59d0393c4..7987b3b6fb16e3539e5408d49894b32956f5d290 100644 (file)
--- a/webmin/fsdump/config
+++ b/webmin/fsdump/config
@@ -1,7 +1,7 @@
-always_tar=0
-run_mode=0
 nonewtape=0
 date_subs=0
+run_mode=0
+always_tar=0
 error_email=0
-webmin_subs=0
 simple_sched=0
+webmin_subs=0

diff --git a/webmin/grub/config b/webmin/grub/config
index 084704907f752bb59c12dda386c8899c7030bc4e..f6464eb2a6b58252ed6b529e6f893f79d52919bc 100644 (file)
--- a/webmin/grub/config
+++ b/webmin/grub/config
@@ -1,3 +1,3 @@
 install=(hd0)
-menu_file=/boot/grub/menu.lst
 grub_path=grub
+menu_file=/boot/grub/menu.lst

diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config
index 6a34c9909b3fd71808d6480b943c8e246b0e8f63..f5ce8b86540f829abcdb8d5144b841189dc1c91e 100644 (file)
--- a/webmin/heartbeat/config
+++ b/webmin/heartbeat/config
@@ -1,15 +1,15 @@
-alt_haresources=/usr/share/doc/packages/heartbeat/haresources
+ha_dir=/etc/ha.d
 alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
-start_cmd=/etc/init.d/heartbeat start
-alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
-pid_file=/var/run/heartbeat.pid
+req_resource_cmd=/usr/lib/heartbeat/req_resource
+heartbeat=/usr/lib/heartbeat/heartbeat
+alt_haresources=/usr/share/doc/packages/heartbeat/haresources
 ha_cf=
 apply_cmd=/etc/init.d/heartbeat reload
-req_resource_cmd=/usr/lib/heartbeat/req_resource
-ha_dir=/etc/ha.d
 authkeys=
-serials=/dev/ttyS*
-haresources=
-heartbeat=/usr/lib/heartbeat/heartbeat
-stop_cmd=/etc/init.d/heartbeat stop
+alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
+start_cmd=/etc/init.d/heartbeat start
 resource_d=
+stop_cmd=/etc/init.d/heartbeat stop
+pid_file=/var/run/heartbeat.pid
+haresources=
+serials=/dev/ttyS*

diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config
index 1744fb4074662824c5d47c9740d253fc089cf0fc..f6f23cddc1998f81f9d042ed4ccbf3690a26b798 100644 (file)
--- a/webmin/htaccess-htpasswd/config
+++ b/webmin/htaccess-htpasswd/config
@@ -1,8 +1,8 @@
-htgroups=.htgroups
-sort=0
-md5=1
+htpasswd=.htpasswd
 digest=1
+extra_directives=
+htgroups=.htgroups
 sha1=0
 htaccess=.htaccess
-extra_directives=
-htpasswd=.htpasswd
+md5=1
+sort=0

diff --git a/webmin/idmapd/config b/webmin/idmapd/config
index bc70dab5eea1f36ba44847feb987ea433f33045e..f25eeba972966eea8656e64271011b1dbc646211 100644 (file)
--- a/webmin/idmapd/config
+++ b/webmin/idmapd/config
@@ -1,3 +1,3 @@
-idmapd_path=/usr/sbin/rpc.idmapd
 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 c9ecdf022d18a2e077077bde1565e9280afb2a64..35e997de4a0c5d4cefffac81cdd5128d2307f0ae 100644 (file)
--- a/webmin/inetd/config
+++ b/webmin/inetd/config
@@ -1,16 +1,16 @@
-extended_inetd=1
-restart_command=killall -HUP inetd
-protocols_file=/etc/protocols
-deny_file=/etc/hosts.deny
-services_file=/etc/services
-rpc_file=/etc/rpc
-rpc_protocols=tcp udp
-rpc_inetd=1
-tcpd_path=/usr/sbin/tcpd
-sort_mode=0
-display_max=100
-ipv6=0
 allow_file=/etc/hosts.allow
+ipv6=0
 qm_mode=0
 show_empty=1
+tcpd_path=/usr/sbin/tcpd
+rpc_protocols=tcp udp
+rpc_inetd=1
+protocols_file=/etc/protocols
+deny_file=/etc/hosts.deny
 inetd_conf_file=/etc/inetd.conf
+sort_mode=0
+extended_inetd=1
+rpc_file=/etc/rpc
+restart_command=killall -HUP inetd
+display_max=100
+services_file=/etc/services

diff --git a/webmin/init/config b/webmin/init/config
index 536d2d83d8c86562aed36ce81ab88cad0546fd31..f19c956db2580145743511778272ad0df46bd7f7 100644 (file)
--- a/webmin/init/config
+++ b/webmin/init/config
@@ -1,17 +1,17 @@
 order=0
-boot_levels=2 3 5
-reboot_command=reboot
-shutdown_command=poweroff
-inittab_id=id
-init_dir=/etc/init.d
-order_digits=2
-init_base=/etc/
-status_check=0
-show_opts=0
 no_chkconfig=0
+init_base=/etc/
+inittab_id=id
+shutdown_command=poweroff
 soft_links=1
+init_info=1
 sort_mode=0
-atboot_product=webmin
+boot_levels=2 3 5
+show_opts=0
 desc=1
+order_digits=2
+atboot_product=webmin
+status_check=0
+reboot_command=reboot
 expert=0
-init_info=1
+init_dir=/etc/init.d

diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config
index 8281e26ed7b9dd0a36a3b44e8447252019d1fc9a..2e72bf82529cca02767506509748656798a1d3e7 100644 (file)
--- a/webmin/ipfilter/config
+++ b/webmin/ipfilter/config
@@ -1,9 +1,9 @@
-ipfstat=ipfstat
-ipnat_conf=/etc/ipf/ipnat.conf
+view_condition=1
 ipnat=ipnat
+cluster_mode=0
+ipnat_conf=/etc/ipf/ipnat.conf
 cluster_nat=1
-view_comment=0
-view_condition=1
-ipf=ipf
 ipf_conf=/etc/ipf/ipf.conf
-cluster_mode=0
+ipfstat=ipfstat
+ipf=ipf
+view_comment=0

diff --git a/webmin/ipfw/config b/webmin/ipfw/config
index 0515788ecb2c9b45e8e089ac0777d76cab59a88b..003915a6fb32ed1b3aa2b0f16efa745534eb0c9b 100644 (file)
--- a/webmin/ipfw/config
+++ b/webmin/ipfw/config
@@ -1,6 +1,6 @@
-view_counters=0
-cluster_mode=0
-view_comment=0
 view_condition=1
+cluster_mode=0
+view_counters=0
 ipfw=/sbin/ipfw
 version=2
+view_comment=0

diff --git a/webmin/ipsec/config b/webmin/ipsec/config
index 4b9d27448253f013eb710a85449a6eb7b80e3566..8e7b4c23f5091c034052a832ee6263392fcf3b33 100644 (file)
--- a/webmin/ipsec/config
+++ b/webmin/ipsec/config
@@ -1,8 +1,8 @@
-file=/etc/ipsec.conf
-start_cmd=/etc/init.d/ipsec start
-ipsec=/usr/sbin/ipsec
 logfile=/var/log/messages
+restart_cmd=/etc/init.d/ipsec restart
+file=/etc/ipsec.conf
 secrets=/etc/ipsec.secrets
+ipsec=/usr/sbin/ipsec
 stop_cmd=/etc/init.d/ipsec stop
-restart_cmd=/etc/init.d/ipsec restart
 policies_dir=/etc/ipsec.d/policies
+start_cmd=/etc/init.d/ipsec start

diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config
index 4ba9df6baff0d622c847bd8fcf3c54e179737e1c..fdbb38f1f9ed1f64874a890f023c9955c6ccedba 100644 (file)
--- a/webmin/iscsi-client/config
+++ b/webmin/iscsi-client/config
@@ -1,6 +1,6 @@
-ifaces_dir=/var/lib/iscsi/ifaces
-initiator_file=/etc/iscsi/initiatorname.iscsi
 init_name=open-iscsi
-iscsiiname=iscsi-iname
 config_file=/etc/iscsi/iscsid.conf
+initiator_file=/etc/iscsi/initiatorname.iscsi
+iscsiiname=iscsi-iname
 iscsiadm=iscsiadm
+ifaces_dir=/var/lib/iscsi/ifaces

diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index 2c3e546012887fd4278d1fcbc1ce8b284fd048cf..c2c53fef433d561a11c2b5b5b1d24fca71de678f 100644 (file)
--- a/webmin/iscsi-server/config
+++ b/webmin/iscsi-server/config
@@ -1,6 +1,6 @@
+iscsi_server=/usr/sbin/iscsi-target
 pid_file=/var/run/iscsi-target.pid
-init_name=netbsd-iscsi
-opts_file=/etc/sysconfig/netbsd-iscsi
 auths_file=/etc/iscsi/auths
 targets_file=/etc/iscsi/targets
-iscsi_server=/usr/sbin/iscsi-target
+init_name=netbsd-iscsi
+opts_file=/etc/sysconfig/netbsd-iscsi

diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config
index f09dd5e4efaf2560cf5af20b46505e7ba05edf82..e524d883f543d01b12cc8316c7418e3f28bb0858 100644 (file)
--- a/webmin/iscsi-target/config
+++ b/webmin/iscsi-target/config
@@ -1,7 +1,7 @@
-initiators_file=/etc/iet/initiators.allow
-ietadm=ietadm
-opts_file=/etc/default/iscsitarget
-targets_file=/etc/iet/targets.allow
-init_name=iscsitarget
 pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
+init_name=iscsitarget
+opts_file=/etc/default/iscsitarget
+initiators_file=/etc/iet/initiators.allow
 config_file=/etc/iet/ietd.conf
+targets_file=/etc/iet/targets.allow
+ietadm=ietadm

diff --git a/webmin/jabber/config b/webmin/jabber/config
index 8f7f7aa3da2e5bfcb1dc75d415bc0692810e1d47..415989b80facf78da88f6370780a5277ad1aa9b1 100644 (file)
--- 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
-jabber_dir=/var/lib/jabber
-jabber_daemon=/usr/sbin/jabberd
 start_cmd=/etc/init.d/jabberd start
+jabber_daemon=/usr/sbin/jabberd
+jabber_dir=/var/lib/jabber

diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config
index 4587ce571ddd2b74f0fa614d0e83175d76b6d069..d452867702759788f2a8a28cb49d2734d500e824 100644 (file)
--- a/webmin/ldap-client/config
+++ b/webmin/ldap-client/config
@@ -1,3 +1,3 @@
+secret=/etc/ldap.secret
 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 fbca6e90c1052ce29aa10dd25d40338b17e43823..bc7fc2cf05a611038a481e9efb24fdee144aee97 100644 (file)
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
+stop_cmd=/etc/init.d/slapd stop
 attr_count=6
+config_file=/etc/ldap/slapd.d
+init_name=slapd
+browse_max=100
+start_cmd=/etc/init.d/slapd start
 slapd=slapd
 apply_cmd=/etc/init.d/slapd restart
-ldap_user=openldap
-browse_max=100
 schema_dir=/etc/ldap/schema
-stop_cmd=/etc/init.d/slapd stop
-init_name=slapd
-config_file=/etc/ldap/slapd.d
-start_cmd=/etc/init.d/slapd start
+ldap_user=openldap

diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config
index 1870023eb821c0ef8dccdc843704b5ac2e607610..49cda461d9a788466a922da947d0c7f7548b0837 100644 (file)
--- a/webmin/ldap-useradmin/config
+++ b/webmin/ldap-useradmin/config
@@ -1,24 +1,24 @@
-given=0
-samba_def=0
-given_order=0
+multi_fields=0
+alias_same=0
 mailfmt=0
-imap_class=SuSEeMailObject
+given_order=0
+gecos=1
 other_class=inetOrgPerson
-ldap_tls=0
-imap_def=0
-imap_login=cyrus
-samba_class=sambaSamAccount
-multi_fields=0
-shells=fixed,ldap,passwd,shells
-imap_foldersep=.
-auth_ldap=/etc/ldap.conf
-membox=0
 imap_folders=old       public  sent-mail
-secmode=0
-gecos=1
 slappasswd=slappasswd
+auth_ldap=/etc/ldap.conf
+person=1
+samba_class=sambaSamAccount
+imap_login=cyrus
+samba_gclass=sambaGroup
+membox=0
+shells=fixed,ldap,passwd,shells
+imap_def=0
+given=0
 quota_support=0
+secmode=0
+imap_class=SuSEeMailObject
+samba_def=0
 md5=0
-samba_gclass=sambaGroup
-person=1
-alias_same=0
+ldap_tls=0
+imap_foldersep=.

diff --git a/webmin/logrotate/config b/webmin/logrotate/config
index b85fb9a25815cdd0f26d6fbb5ec3c52e5964f05c..bdc255d3a608120289210dcb90f2e0600550eece 100644 (file)
--- a/webmin/logrotate/config
+++ b/webmin/logrotate/config
@@ -1,4 +1,4 @@
-add_file=/etc/logrotate.d
 logrotate_conf=/etc/logrotate.conf
-logrotate=logrotate
 sort_mode=0
+add_file=/etc/logrotate.d
+logrotate=logrotate

diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config
index 2b37d2d61f077e747190cd398b7cca2999fb1007..d454639c67c045ff8b9f28bc6b66646d0d6db7c5 100644 (file)
--- a/webmin/lpadmin/config
+++ b/webmin/lpadmin/config
@@ -1,17 +1,17 @@
-model_path=/usr/share/foomatic/db /usr/share/ppd
-show_jobs=0
-iface_arg=
-sort_mode=0
 print_style=cups
-gs_fontpath=
-start_cmd=/etc/init.d/cupsys start
-spool_dir=/var/spool/cups
+display_mode=0
+iface_perms=755
 gs_path=gs
+show_jobs=0
 show_status=0
+stop_cmd=/etc/init.d/cupsys stop
 iface_owner=lp:lp
-smbclient_path=smbclient
-display_mode=0
+gs_fontpath=
+start_cmd=/etc/init.d/cupsys start
+sort_mode=0
+iface_arg=
+spool_dir=/var/spool/cups
 gs_lib=
-iface_perms=755
+model_path=/usr/share/foomatic/db /usr/share/ppd
 driver_style=cups
-stop_cmd=/etc/init.d/cupsys stop
+smbclient_path=smbclient

diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config
index b18cdc70ca29cd6b93284556169849b5c587fee4..4df4dd0f5f7d565ba95496fb661eb2e8a42f0310 100644 (file)
--- a/webmin/mailboxes/config
+++ b/webmin/mailboxes/config
@@ -1,52 +1,52 @@
+view_html=0
+sync_modify=1
+show_to=0
+delete_warn=y
+date_fmt=dmy
+sync_perms=0700
+check_mod=1
+arrows=1
+show_size=1
+ignore_users_enabled=0
+wrap_width=80
+no_crlf=0
+vpopmail_dir=/home/vpopmail
+mail_style=0
+show_count=0
+max_records=200
+spam_report=
+html_quote=0
+fwd_mode=0
+maildir_deleted=0
+top_buttons=2
+size_mode=1
 mail_usermin=mail
-sync_create=0
-show_unread=0
+spam_buttons=mail
+mail_dir=Maildir
 show_size_below=0
+noindex_hostname=0
 mailbox_user=.usermin/mailbox
-show_count=0
-mail_dir=Maildir
-show_delall=0
+ignore_users=
+sort_mode=1
 open_mode=0
-mail_file=Mailbox
-no_orig_ip=0
-perpage=20
-noindex_hostname=0
-spam_buttons=mail
-size_mode=1
-link_mode=0
-mail_style=0
-max_records=200
-sync_modify=1
-top_buttons=2
-view_html=0
-sync_delete=1
-track_read=0
-sync_perms=0700
-fwd_mode=0
-show_body=0
 auto=1
-log_read=0
-wrap_width=80
-column_count=4
+mail_system=3
 no_mailer=0
-sort_mode=1
-check_mod=1
-sig_file=*
-spam_del=0
-show_to=0
-spam_report=
-vpopmail_dir=/home/vpopmail
-no_crlf=0
-date_fmt=dmy
-ignore_users=
+track_read=0
 from_virtualmin=1
-arrows=1
-mail_system=3
-show_sent=0
+sig_file=*
+show_unread=0
 html_edit=0
-ignore_users_enabled=0
-show_size=1
-html_quote=0
-delete_warn=y
+sync_delete=1
 show_mail=0
-maildir_deleted=0
+show_delall=0
+column_count=4
+perpage=20
+show_body=0
+sync_create=0
+log_read=0
+spam_del=0
+no_orig_ip=0
+link_mode=0
+show_sent=0
+mail_file=Mailbox

diff --git a/webmin/man/config b/webmin/man/config
index 26d8788d98c15503a7b0db5ebd834c21061b8722..6dd7f6b60f742803367de31bad645d280fafdcdc 100644 (file)
--- a/webmin/man/config
+++ b/webmin/man/config
@@ -1,9 +1,9 @@
+man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
+man2html_path=man2html
 doc_dir=/usr/share/doc
 kernel_dir=/usr/src/linux/Documentation
-man2html_path=man2html
 man_cmd_sect=man SECTION PAGE
+list_cmd_sect=man -w SECTION PAGE
 list_cmd=man -w PAGE
 man_cmd=man PAGE
-list_cmd_sect=man -w SECTION PAGE
 search_cmd=man -k PAGE
-man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man

diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index 3ddaf7837c087481727afaaa2e14837fb3d4c354..0e310926df6bfedd1dcb26e8c5efd32144b8eb96 100644 (file)
--- 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.960
+server=MiniServ/1.962

diff --git a/webmin/mon/config b/webmin/mon/config
index 85d095cdd477b4c58d166cc250a39f0d873c0328..70892829b9db099b500b8acb9a34dadf807adf36 100644 (file)
--- 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
-cfbasedir=/etc/mon
 mon_cgi=/var/www/cgi-bin/mon.cgi
+restart_cmd=/etc/init.d/mon restart
 monshow=/usr/bin/monshow
+cfbasedir=/etc/mon
 stop_cmd=/etc/init.d/mon stop
-pid_file=/var/run/mon.pid
-restart_cmd=/etc/init.d/mon restart

diff --git a/webmin/mount/config b/webmin/mount/config
index 75d148ae4d664db3fd4a06c81d94e63848e10daf..571b334e90e718e94b096a86b6c5c7f9552bfabe 100644 (file)
--- a/webmin/mount/config
+++ b/webmin/mount/config
@@ -1,10 +1,10 @@
-fstab_file=/etc/fstab
-nmblookup_path=nmblookup
-show_used=1
-long_fstypes=1
-sysinfo=1
-autofs_file=/etc/auto.master
-auto_file=/etc/am-utils/amd.conf
 sort_mode=2
-smbclient_path=smbclient
+autofs_file=/etc/auto.master
+sysinfo=1
 nfs_check=1
+smbclient_path=smbclient
+auto_file=/etc/am-utils/amd.conf
+fstab_file=/etc/fstab
+long_fstypes=1
+show_used=1
+nmblookup_path=nmblookup

diff --git a/webmin/mysql/config b/webmin/mysql/config
index 4c001d86ff1268a2737fe9f33d5a355a946fe2b2..006f4f23524df34b02b783f644976f2e7a79a102 100644 (file)
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -1,23 +1,23 @@
-add_mode=1
-style=0
-max_dbs=50
-mysqlshow=/usr/bin/mysqlshow
+my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
 mysqldump=/usr/bin/mysqldump
-mysql_data=/var/lib/mysql
-date_subs=0
-mysqlimport=/usr/bin/mysqlimport
-max_text=1000
-nodbi=0
+webmin_subs=0
 login=root
-my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
-stop_cmd=service mysql stop
-perpage=25
-mysql_libs=/usr/local/mysql/lib
+mysql=/usr/bin/mysql
 nopwd=0
 passwd_mode=0
-webmin_subs=0
-blob_mode=0
-mysqladmin=/usr/bin/mysqladmin
+mysqlimport=/usr/bin/mysqlimport
 start_cmd=service mysql start
+blob_mode=0
 access=*: *
-mysql=/usr/bin/mysql
+nodbi=0
+perpage=25
+mysql_libs=/usr/local/mysql/lib
+stop_cmd=service mysql stop
+mysqladmin=/usr/bin/mysqladmin
+max_dbs=50
+mysql_data=/var/lib/mysql
+mysqlshow=/usr/bin/mysqlshow
+style=0
+date_subs=0
+add_mode=1
+max_text=1000

diff --git a/webmin/mysql/version b/webmin/mysql/version
index a7772731afa5820d4f4ba8df35da40206b691251..85da243696680ec9415343bc9e1c26d626b800ef 100644 (file)
--- a/webmin/mysql/version
+++ b/webmin/mysql/version
@@ -1 +1 @@
-8.0.21-0ubuntu0
+8.0.22-0ubuntu0

diff --git a/webmin/nis/config b/webmin/nis/config
index cf382fa575d23d7ac2fc969a0de2453f5ee9d532..0d2c7e07b96577228107e7b5cb57f56bbb38c92f 100644 (file)
--- a/webmin/nis/config
+++ b/webmin/nis/config
@@ -1,5 +1,5 @@
-securenets=/etc/ypserv.securenets
 client_conf=/etc/yp.conf
+manual_build=0
+securenets=/etc/ypserv.securenets
 nsswitch_conf=/etc/nsswitch.conf
 max_size=100
-manual_build=0

diff --git a/webmin/openslp/config b/webmin/openslp/config
index 3bd079410a2ffdaa597c75bb8180350218c0f941..1931cebef182c5a34013f7f86095ddaa22f39d55 100644 (file)
--- a/webmin/openslp/config
+++ b/webmin/openslp/config
@@ -1,5 +1,5 @@
+slpd_reg=/etc/slp.reg
+slpd_pid=/var/run/slpd.pid
 slpd_conf=/etc/slp.conf
-slpd_log=/var/log/slpd.log
 slpd=/usr/sbin/slpd
-slpd_pid=/var/run/slpd.pid
-slpd_reg=/etc/slp.reg
+slpd_log=/var/log/slpd.log

diff --git a/webmin/package-updates/config b/webmin/package-updates/config
index 195d872e7272f7216056aa344a080b36cb709aad..226c127d1632e46e5caeb7b0b55aff051b351642 100644 (file)
--- 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 c05bf36063b33071df431be419fdfd19e6c87b76..4287bf606316a23346c46b9335488be3d89c3fe1 100644 (file)
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
-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
-ignore=README
 lib_dirs=/lib/security /lib/*/security
+mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so
 pam_dir=/etc/pam.d
+ignore=README

diff --git a/webmin/pap/config b/webmin/pap/config
index 5ea04e5c96f50628524a1d0581df9c06b3f5187f..e229aa32fe4bd9cbbce189b1b387252bf30fa7fa 100644 (file)
--- a/webmin/pap/config
+++ b/webmin/pap/config
@@ -1,8 +1,8 @@
+pppd=pppd
+encrypt_pass=0
+login_config=/etc/mgetty+sendfax/login.config
 ppp_options=/etc/ppp/options
 mgetty=mgetty
 serials=/dev/ttyS[0-9]*
 dialin_config=/etc/mgetty+sendfax/dialin.config
-encrypt_pass=0
 pap_file=/etc/ppp/pap-secrets
-login_config=/etc/mgetty+sendfax/login.config
-pppd=pppd

diff --git a/webmin/passwd/config b/webmin/passwd/config
index 75e5ffcde479b9f9dbe56587d0430f9479c96f35..04110de954ef8ed5a644b4a718c43ee8f546e2c0 100644 (file)
--- a/webmin/passwd/config
+++ b/webmin/passwd/config
@@ -1,3 +1,3 @@
-input_type=0
 max_users=200
+input_type=0
 sort_mode=0

diff --git a/webmin/postfix/config b/webmin/postfix/config
index 5d1db3a02af448936bdfa99050d3102fe4327805..69b40f13b4a2a02573e0cc20bc8793e7dd208509 100644 (file)
--- a/webmin/postfix/config
+++ b/webmin/postfix/config
@@ -1,29 +1,29 @@
-mailq_sort=0
-ldap_doms=0
-show_cmts=0
-postfix_control_command=/usr/sbin/postfix
-max_records=200
-postfix_newaliases_command=/usr/bin/newaliases
 index_check=1
-postfix_lookup_table_command=/usr/sbin/postmap
-mailq_dir=/var/spool/postfix
-top_buttons=1
-delete_warn=1
-fwd_mode=0
-max_maps=100
+wrap_width=80
 postfix_super_command=/usr/sbin/postsuper
+mailq_dir=/var/spool/postfix
+ldap_doms=0
+postfix_newaliases_command=/usr/bin/newaliases
+max_records=200
 postfix_master=/etc/postfix/master.cf
-check_config=1
+postfix_config_file=/etc/postfix/main.cf
 mailq_cmd=postqueue -p
-wrap_width=80
+sort_mode=0
+postfix_lookup_table_command=/usr/sbin/postmap
+delete_warn=1
 delete_confirm=1
-columns=2
+postfix_config_command=/usr/sbin/postconf
 prefix_cmts=0
-sort_mode=0
-perpage=20
 postfix_aliases_table_command=/usr/sbin/postalias
-mailq_count=0
 postcat_cmd=/usr/sbin/postcat
-postfix_config_command=/usr/sbin/postconf
+mailq_count=0
+postfix_control_command=/usr/sbin/postfix
+max_maps=100
+show_cmts=0
+fwd_mode=0
+perpage=20
+columns=2
 postfix_queue_command=postqueue
-postfix_config_file=/etc/postfix/main.cf
+check_config=1
+top_buttons=1
+mailq_sort=0

diff --git a/webmin/postgresql/config b/webmin/postgresql/config
index 910aec6cd7e3c8f1bbab53c9ef96e49b29a8be0e..1ea5f3d6d58b06b4b8f838c59d49fb209a28ba26 100644 (file)
--- a/webmin/postgresql/config
+++ b/webmin/postgresql/config
@@ -1,24 +1,24 @@
+hba_conf=/etc/postgresql/*/main/pg_hba.conf
+webmin_subs=0
+sameunix=1
+simple_sched=0
 plib=
-style=0
 max_dbs=50
-sameunix=1
-basedb=template1
-add_mode=1
-hba_conf=/etc/postgresql/*/main/pg_hba.conf
-date_subs=0
-max_text=1000
+pid_file=/var/run/postmaster.pid
 dump_cmd=/usr/bin/pg_dump
-nodbi=0
+rstr_cmd=/usr/bin/pg_restore
+style=0
 login=postgres
-psql=/usr/bin/psql
-perpage=25
-stop_cmd=/etc/init.d/postgresql* stop
-simple_sched=0
-blob_mode=0
-webmin_subs=0
 pass=
+perpage=25
+access=*: *
+psql=/usr/bin/psql
+nodbi=0
 start_cmd=/etc/init.d/postgresql* start
 access_own=0
-pid_file=/var/run/postmaster.pid
-rstr_cmd=/usr/bin/pg_restore
-access=*: *
+blob_mode=0
+stop_cmd=/etc/init.d/postgresql* stop
+max_text=1000
+add_mode=1
+date_subs=0
+basedb=template1

diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config
index 33a2029ee7c90fdddda73a26e193e6ccd0d15ac4..e0a3e10a857590a0f59e8fa47f3071c334a71acf 100644 (file)
--- a/webmin/ppp-client/config
+++ b/webmin/ppp-client/config
@@ -1,3 +1,3 @@
-wvdial=wvdial
 file=/etc/wvdial.conf
 wvdialconf=wvdialconf
+wvdial=wvdial

diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config
index 00075c3e832b77f522653fd110c4c1ea6cad02a5..79cca84a461e38474bcab5eed485e29810ac0215 100644 (file)
--- a/webmin/pptp-client/config
+++ b/webmin/pptp-client/config
@@ -1,5 +1,5 @@
-pptp_options=/etc/ppp/options.pptp
 peers_dir=/etc/ppp/peers
-pptp=pptp
 pap_file=/etc/ppp/chap-secrets
+pptp_options=/etc/ppp/options.pptp
 timeout=30
+pptp=pptp

diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config
index 7e432d9a1f56607a8573e6119a13491f0447b505..d2920c69af98a523ae08331b2dc469c2503330a5 100644 (file)
--- a/webmin/pptp-server/config
+++ b/webmin/pptp-server/config
@@ -1,9 +1,9 @@
 start_cmd=/etc/init.d/pptpd start
-log_file=/var/log/messages
 pptp_ppp_options=/etc/ppp/pptpd-options
-stop_cmd=/etc/init.d/pptpd stop
-ppp_options=/etc/ppp/options
+pap_file=/etc/ppp/chap-secrets
 pid_file=/var/run/pptpd.pid
+log_file=/var/log/messages
 file=/etc/pptpd.conf
 pptpd=pptpd
-pap_file=/etc/ppp/chap-secrets
+stop_cmd=/etc/init.d/pptpd stop
+ppp_options=/etc/ppp/options

diff --git a/webmin/proc/config b/webmin/proc/config
index e9b363eef8ec61b1e2121f6390410b1ce33e03fc..c51d66e9e9c8a7ae0ad2261ad19dc6b812a1de0e 100644 (file)
--- a/webmin/proc/config
+++ b/webmin/proc/config
@@ -1,6 +1,6 @@
-base_ppid=1
-ps_style=linux
 default_mode=last
-cut_length=80
-hide_self=1
 trace_java=0
+hide_self=1
+ps_style=linux
+base_ppid=1
+cut_length=80

diff --git a/webmin/procmail/config b/webmin/procmail/config
index 5dae99ba1c64532f21a24a1d6b9df945fe3c706a..d5df9474966c0743f17ed9c89f8934691d577bc9 100644 (file)
--- a/webmin/procmail/config
+++ b/webmin/procmail/config
@@ -1,3 +1,3 @@
-procmail=procmail
 includes=0
 procmailrc=/etc/procmailrc
+procmail=procmail

diff --git a/webmin/proftpd/config b/webmin/proftpd/config
index 71e530ead5968812e7c4a96ee66010eed156158a..3b2dfa6d18f85603aa1e43928487bfbaee53f70d 100644 (file)
--- a/webmin/proftpd/config
+++ b/webmin/proftpd/config
@@ -1,9 +1,9 @@
-start_cmd=/etc/init.d/proftpd start
+test_config=1
+test_always=0
+ftpusers=/etc/ftpusers
+stop_cmd=/etc/init.d/proftpd stop
+proftpd_path=/usr/sbin/proftpd
 pid_file=/var/run/proftpd.pid
 test_manual=0
-stop_cmd=/etc/init.d/proftpd stop
 proftpd_conf=/etc/proftpd/proftpd.conf
-ftpusers=/etc/ftpusers
-proftpd_path=/usr/sbin/proftpd
-test_config=1
-test_always=0
+start_cmd=/etc/init.d/proftpd start

diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config
index d238a2df7912105a79c354b909f1f0f246446b08..9d708d7d11ebce8929f9ba9dd78b11e0bdeca205 100644 (file)
--- a/webmin/qmailadmin/config
+++ b/webmin/qmailadmin/config
@@ -1,14 +1,14 @@
-delete_warn=1
+max_records=200
 mail_dir_qmail=Maildir
+mail_file=Mailbox
 mailq_count=0
-fwd_mode=0
-perpage=20
+mailq_sort=0
 qmail_dir=/var/qmail
 index_min=1000000
-sort_mode=0
-mail_file=Mailbox
 mail_system=1
 columns=2
+delete_warn=1
+perpage=20
+sort_mode=0
+fwd_mode=0
 mail_dir=
-max_records=200
-mailq_sort=0

diff --git a/webmin/quota/config b/webmin/quota/config
index 5ccd96b6ee2efe3365fe2f9ff3d51dda7873b91f..21ca380b0896c69fb5e2ac34cf871b7796b55a60 100644 (file)
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
+email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
+user_repquota_command=repquota -u -v
+group_setquota_command=setquota -g
+block_size=1024
+display_max=100
 group_copy_command=edquota -g -p
+sort_mode=0
+hide_uids=0
 user_copy_command=edquota -u -p
+group_quota_command=quota -v -g
+block_mode=1
+user_edquota_command=edquota -u
 quotacheck_command=quotacheck -u -g
-block_size=1024
+pc_show=1
+group_edquota_command=edquota -g
+user_quota_command=quota -v -u
 user_quotaon_command=quotaon -u
+show_grace=1
+group_quotaon_command=quotaon -g
 user_grace_command=edquota -u -t
 group_repquota_command=repquota -g -v
 group_quotaoff_command=quotaoff -g
-block_mode=1
+user_quotaoff_command=quotaoff -u
 user_setquota_command=setquota -u
-show_grace=1
-group_quota_command=quota -v -g
-pc_show=1
-group_setquota_command=setquota -g
-sort_mode=0
-user_quota_command=quota -v -u
-group_quotaon_command=quotaon -g
 group_grace_command=edquota -g -t
-email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the       allowed quota.          ${USED} of disk space is being used, out of a maximum of ${QUOTA}.
-user_edquota_command=edquota -u
-group_edquota_command=edquota -g
-user_repquota_command=repquota -u -v
-user_quotaoff_command=quotaoff -u
-hide_uids=0
-display_max=100

diff --git a/webmin/raid/config b/webmin/raid/config
index 8ffe6d468c9d654b8443b714f9ab5dee68f7ad38..3314566d048eda92a3de81aeebf790f8924e404b 100644 (file)
--- a/webmin/raid/config
+++ b/webmin/raid/config
@@ -1,3 +1,3 @@
+raidtab=/etc/raidtab
 mdadm=/etc/mdadm/mdadm.conf
 mdstat=/proc/mdstat
-raidtab=/etc/raidtab

diff --git a/webmin/samba/config b/webmin/samba/config
index 411ec38ea9661225dd718e0200f88bef638f9482..23e778f6c0ad05ac3c8a920d422c051cc7f7cac4 100644 (file)
--- a/webmin/samba/config
+++ b/webmin/samba/config
@@ -1,18 +1,18 @@
-dont_convert=-499
-restart_cmd=service smbd restart ; service nmbd restart
-samba_server=/usr/sbin/smbd
-stop_cmd=service smbd stop ; service nmbd stop
-net=/usr/bin/net
+sort_mode=0
 text_lists=0
 samba_status_program=/usr/bin/smbstatus
-smb_conf=/etc/samba/smb.conf
-smb_passwd=/etc/samba/smbpasswd
-name_server=/usr/sbin/nmbd
+list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
+start_cmd=service smbd start ; service nmbd start
+pdbedit=/usr/bin/pdbedit
 smbgroupedit=/usr/bin/smbgroupedit
+swat=/usr/sbin/swat
+smb_passwd=/etc/samba/smbpasswd
 run_from_inetd=0
-pdbedit=/usr/bin/pdbedit
-start_cmd=service smbd start ; service nmbd start
-sort_mode=0
+net=/usr/bin/net
 samba_password_program=/usr/bin/smbpasswd
-list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g'
-swat=/usr/sbin/swat
+samba_server=/usr/sbin/smbd
+name_server=/usr/sbin/nmbd
+restart_cmd=service smbd restart ; service nmbd restart
+smb_conf=/etc/samba/smb.conf
+stop_cmd=service smbd stop ; service nmbd stop
+dont_convert=-499

diff --git a/webmin/sarg/config b/webmin/sarg/config
index a8477b7527cf78dc35aef8884a2735a3b4b31697..75406f229ff4b611a383a7392c990177a8de6929 100644 (file)
--- a/webmin/sarg/config
+++ b/webmin/sarg/config
@@ -1,4 +1,4 @@
-clear=1
-sarg_conf=/etc/sarg/sarg.conf
 naked=0
+clear=1
 sarg=sarg
+sarg_conf=/etc/sarg/sarg.conf

diff --git a/webmin/sendmail/config b/webmin/sendmail/config
index 33ce186db669b8cdb2031b07b58843712a7827fb..df977e0daf212fcc628534ae9d81c5d9420f97e5 100644 (file)
--- a/webmin/sendmail/config
+++ b/webmin/sendmail/config
@@ -1,30 +1,30 @@
-mail_style=0
-mailq_count=0
-sendmail_features=/usr/share/sendmail/cf
-sendmail_pid=/var/run/sendmail/mta/sendmail.pid
 perpage=20
-show_to=0
-mail_file=mbox
 columns=2
-delete_confirm=1
+show_cmts=0
+fwd_mode=0
+sendmail_cf=/etc/mail/sendmail.cf
+top_buttons=1
+mailq_sort=0
+sendmail_command=/usr/lib/sendmail -bd -q1h
 index_min=1000000
-sort_mode=0
+mail_file=mbox
+smrsh_dir=/etc/smrsh
+mailq_count=0
 prefix_cmts=0
-mail_dir=/var/spool/mail
-makemap_path=makemap
-sendmail_cf=/etc/mail/sendmail.cf
-wrap_width=80
+sendmail_features=/usr/share/sendmail/cf
 mailq_show=Date,From,To,Size,Status
-sendmail_path=/usr/lib/sendmail
-sendmail_command=/usr/lib/sendmail -bd -q1h
-mail_type=0
+show_to=0
+sort_mode=0
 delete_warn=1
-fwd_mode=0
+mail_dir=/var/spool/mail
 track_read=0
+mail_type=0
+delete_confirm=1
+sendmail_path=/usr/lib/sendmail
+wrap_width=80
+max_records=200
 order_mail=0
+sendmail_pid=/var/run/sendmail/mta/sendmail.pid
+makemap_path=makemap
+mail_style=0
 sendmail_mc=/etc/mail/sendmail.mc
-smrsh_dir=/etc/smrsh
-top_buttons=1
-max_records=200
-show_cmts=0
-mailq_sort=0

diff --git a/webmin/servers/config b/webmin/servers/config
index 7a0afcca43e771c9ea5533617dc787eaa0c6c12e..48cb3c64b2d0555527317e70b99f454335b22256 100644 (file)
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
-groups_dir=/etc/cluster/groups
-show_status=1
+deffast=2
 scan_time=5
-show_ip=0
-max_servers=100
 deflink=0
-resolve=1
-sort_mode=0
 display_mode=0
-deffast=2
+show_ip=0
+show_status=1
+sort_mode=0
+max_servers=100
 capath=/usr/share/ca-certificates
+groups_dir=/etc/cluster/groups
+resolve=1

diff --git a/webmin/shell/config b/webmin/shell/config
index af7728831e58d76091c50db3b4a3530a728c3e6e..044e158ce7275da152f8c1d257357e6a87fedd07 100644 (file)
--- 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 1770754538d88aaf9a2cf131b57a5cdbd8ebdf8d..7e55b32a194d6223d1f51dfe4e39d9a4ab196531 100644 (file)
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
-config_dir=/etc/shorewall
-shorewall=shorewall
 macros=/usr/share/shorewall
-actions=/etc/shorewall/actions /usr/share/shorewall/actions.std
+shorewall=shorewall
 display_zone_descriptions=1
+config_dir=/etc/shorewall
+actions=/etc/shorewall/actions /usr/share/shorewall/actions.std

diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config
index 920b923f1ff7812a75e42186d369d751fbdff945..4cc447b64effdf0e9d084544f8e60a3e8e62b795 100644 (file)
--- a/webmin/shorewall6/config
+++ b/webmin/shorewall6/config
@@ -1,5 +1,5 @@
 config_dir=/etc/shorewall6
-macros=/usr/share/shorewall6
-shorewall6=shorewall6
-actions=/etc/shorewall6/actions        /usr/share/shorewall6/actions.std
 display_zone_descriptions=1
+actions=/etc/shorewall6/actions        /usr/share/shorewall6/actions.std
+shorewall6=shorewall6
+macros=/usr/share/shorewall6

diff --git a/webmin/smart-status/config b/webmin/smart-status/config
index 1c8af57542357bd5ff338053c270402e4c6689d7..fadfec290d207caaed01fa06e4ea3415c043cd77 100644 (file)
--- a/webmin/smart-status/config
+++ b/webmin/smart-status/config
@@ -1,4 +1,4 @@
-attribs=1
 smartctl=smartctl
-mode=1
 ata=0
+attribs=1
+mode=1

diff --git a/webmin/software/config b/webmin/software/config
index 037d899f341a61111e0997162aa1bb44fdb13b3c..9476e6757eb6e0138a39c58f065e799939856a63 100644 (file)
--- a/webmin/software/config
+++ b/webmin/software/config
@@ -1,3 +1,3 @@
-update_system=apt
 apt_mode=0
+update_system=apt
 package_system=debian

diff --git a/webmin/spam/config b/webmin/spam/config
index c464ba8c612baa2cd9347ca06c88e9f0cdb7705b..9b0981d85824fc1676ba140dbe97d3120aae3a22 100644 (file)
--- a/webmin/spam/config
+++ b/webmin/spam/config
@@ -1,12 +1,12 @@
-restart_cmd=/etc/init.d/spamassassin restart
-max_awl=200
-local_cf=/etc/spamassassin/local.cf
+addto=0
 procmailrc=/etc/procmailrc
-procmail_cmd=*
 spamassassin=spamassassin
-addto=0
 sa_learn=sa-learn
-warn_procmail=1
+local_cf=/etc/spamassassin/local.cf
 processes=spamd amavisd
+warn_procmail=1
 mode=0
+restart_cmd=/etc/init.d/spamassassin restart
 call_spam=1
+procmail_cmd=*
+max_awl=200

diff --git a/webmin/squid/config b/webmin/squid/config
index 31ce69363482624b5f556d2adcfaa298b2f83f76..82ef0317a3f7a25821190bf36e472c3cc44a77b5 100644 (file)
--- a/webmin/squid/config
+++ b/webmin/squid/config
@@ -1,21 +1,21 @@
-cal_fmt=w
-cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
-squid_conf=/etc/squid/squid.conf
-restart_pos=0
-cal_args=-aw
-squid_start=service squid start
-crypt_conf=0
+sync_create=0
 squid_stop=service squid stop
 squidclient=squidclient
-sync_delete=0
-calamaris=calamaris
-cal_max=50000
 squid_restart=service squid reload
+squid_start=service squid start
+cal_args=-aw
+calamaris=calamaris
+sort_conf=0
+sync_modify=1
 cache_dir=/var/spool/squid
-squid_path=squid
+squid_conf=/etc/squid/squid.conf
+crypt_conf=0
+restart_pos=0
+cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
 cal_all=1
-sync_modify=1
+cal_fmt=w
+squid_path=squid
+cal_max=50000
+sync_delete=0
 log_dir=/var/log/squid
-sort_conf=0
-sync_create=0
 pid_file=/var/run/squid.pid

diff --git a/webmin/sshd/config b/webmin/sshd/config
index a5f0707e4f8200d6a753cf57ba4a945247e9ae14..734a08d3530da7cad188924acea2d9b6cf17df0a 100644 (file)
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,11 +1,11 @@
+sshd_config=/etc/ssh/sshd_config
+keygen_path=/usr/bin/ssh-keygen
+sync_gnupg=0
+sync_pass=0
 sync_create=0
-pid_file=/var/run/sshd.pid
 start_cmd=service ssh start
-client_config=/etc/ssh/ssh_config
-sync_pass=0
-keygen_path=/usr/bin/ssh-keygen
+sshd_path=/usr/sbin/sshd
 stop_cmd=service ssh stop
+client_config=/etc/ssh/ssh_config
 sync_auth=1
-sshd_path=/usr/sbin/sshd
-sync_gnupg=0
-sshd_config=/etc/ssh/sshd_config
+pid_file=/var/run/sshd.pid

diff --git a/webmin/status/config b/webmin/status/config
index c114469a3cc9c610d2aba16c016e875e4e960be9..5cae5e7c5bda7ac8d727a9e91eb4e4a11089fceb 100644 (file)
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,13 +1,13 @@
-sysinfo_users=0
-snmp_version=2
+subject_mode=0
 sysinfo=0
-sched_offset=0
+output=0
+index_status=1
 sort_mode=0
-subject_mode=0
-snmp_trap=1.3.6.1.4.1.10000.1.1
 columns=2
-index_status=1
-output=0
-history_show=50
+sched_offset=0
 history_purge=30
+snmp_version=2
 pager_cmd=sms_client
+snmp_trap=1.3.6.1.4.1.10000.1.1
+sysinfo_users=0
+history_show=50

diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config
index 0938cf9953fff32ec0c0c1dd5207f0398bbd7f64..8cc42e4e21ea36f7f3e3aa9b21667181decd68d7 100644 (file)
--- a/webmin/syslog-ng/config
+++ b/webmin/syslog-ng/config
@@ -1,7 +1,7 @@
+syslogng_cmd=syslog-ng
 compressed=1
-lines=20
+pid_file=/var/run/syslog-ng.pid
 syslogng_conf=/etc/syslog-ng/syslog-ng.conf
-syslogng_cmd=syslog-ng
+lines=20
 start_cmd=/etc/init.d/syslog-ng start
-pid_file=/var/run/syslog-ng.pid
 stop_cmd=/etc/init.d/syslog-ng stop

diff --git a/webmin/syslog/config b/webmin/syslog/config
index 4d2ccb145a7f8c0fd215e902e81ba1e6201ba4f6..02825981ff91e486d30c17d3b01ffafdb7f44ee8 100644 (file)
--- a/webmin/syslog/config
+++ b/webmin/syslog/config
@@ -1,19 +1,19 @@
-reverse=0
-sync=1
-restart_cmd=/usr/sbin/service rsyslog restart
-socket=0
-m4_path=
-tags=0
-pipe=1
-pri_dir=1
-lines=20
-others=1
 compressed=1
 pid_file=/var/run/rsyslogd.pid
+lines=20
+m4_conf=0
 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
-signal_cmd=/usr/sbin/service rsyslog restart
-start_cmd=/usr/sbin/service rsyslog start
-syslogd=/usr/sbin/rsyslogd
+others=1
+m4_path=
+socket=0
+restart_cmd=/usr/sbin/service rsyslog restart
 pri_all=1
-m4_conf=0
+pri_dir=1
 syslog_conf=/etc/rsyslog.conf
+syslogd=/usr/sbin/rsyslogd
+reverse=0
+signal_cmd=/usr/sbin/service rsyslog restart
+tags=0
+start_cmd=/usr/sbin/service rsyslog start
+pipe=1
+sync=1

diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config
index 10eceba4da0333ba478f7088eb7b1c4512a85570..ddc301405565123c9c63a9fc35dffb71db7bd9e6 100644 (file)
--- 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 70f6076030f2e5177b03d8a47d9e39843800b4c9..ba8e81dd51e5a19a208058ecc09586e01a7926c1 100644 (file)
--- a/webmin/telnet/config
+++ b/webmin/telnet/config
@@ -1,5 +1,5 @@
-detach=0
 no_test=0
+detach=0
+mode=1
 sizemode=0
 proxy=0
-mode=1

diff --git a/webmin/time/config b/webmin/time/config
index 9b25584d59860ada7463f67f47a61a52d580ed2e..b92e28f8b57d1c9a4b67c03224043d6f4ac97037 100644 (file)
--- a/webmin/time/config
+++ b/webmin/time/config
@@ -1,6 +1,6 @@
-seconds=1
 ntp_only=1
+zone_style=linux
 lease=5
 timeserver_hardware=1
-zone_style=linux
+seconds=1
 timeserver=0.pool.ntp.org

diff --git a/webmin/updown/config b/webmin/updown/config
index ccf43a2d07b949db4fe2ee0d9708dbe7e04531b1..6153634f5eac634887c601878ec67c4a195b7c1f 100644 (file)
--- a/webmin/updown/config
+++ b/webmin/updown/config
@@ -1,4 +1,4 @@
-ddir=/
 user=root
 dir=/
 duser=root
+ddir=/

diff --git a/webmin/useradmin/config b/webmin/useradmin/config
index 26b4099778c57ff9261128ef47c3d63d98c760c0..e472cb3970505a9466252ec586305a32cad26dbd 100644 (file)
--- a/webmin/useradmin/config
+++ b/webmin/useradmin/config
@@ -1,41 +1,41 @@
 alias_check=0
-user_files=/etc/skel
-sort_mode=0
+md5=1
+last_show=0
 email_type=0
-shells=fixed,passwd,shells
-membox=0
-homedir_perms=0755
-new_user_group=0
-secmode=0
-display_mode=1
-passwd_file=/etc/passwd
-extra_real=0
-empty_mode=0
+uid_calc=0
+selinux_con=user_u:object_r:user_home_dir_t
+home_style=0
+default_group=users
 base_uid=1000
+secmode=0
+new_user_gid=0
 from_files=0
-md5=1
-default_other=1
-random_password=0
-selinux_con=user_u:object_r:user_home_dir_t
-lock_string=*
-passwd_progmode=0
+membox=0
+shells=fixed,passwd,shells
+empty_mode=0
 gid_calc=0
+homedir_perms=0755
+base_gid=1000
+gshadow_file=/etc/gshadow
 group_file=/etc/group
-uid_mode=1
-display_max=400
-home_style=0
 shadow_file=/etc/shadow
-base_gid=1000
+passwd_stars=0
+passwd_file=/etc/passwd
+random_password=0
+sort_mode=0
+user_files=/etc/skel
+extra_real=0
 skip_md5=0
-uid_calc=0
-delete_root=0
-gid_mode=1
-new_user_gid=0
-default_group=users
-passwd_same=0
-gshadow_file=/etc/gshadow
-last_show=0
-delete_only=0
 home_base=/home
+uid_mode=1
+display_max=400
+delete_only=0
+display_mode=1
+new_user_group=0
+passwd_progmode=0
 passwd_dict=0
-passwd_stars=0
+lock_string=*
+gid_mode=1
+delete_root=0
+default_other=1
+passwd_same=0

diff --git a/webmin/usermin/config b/webmin/usermin/config
index 462acaacd21fd86072467b28b21d7e80602a657a..77ceaf16c8ecb69e09a0482b256a2212d761297e 100644 (file)
--- a/webmin/usermin/config
+++ b/webmin/usermin/config
@@ -1,7 +1,7 @@
-cron_mode=0
-updays=1
+uphour=4
 upmissing=0
 update=0
+updays=1
 usermin_dir=/etc/usermin
+cron_mode=0
 upshow=1
-uphour=4

diff --git a/webmin/version b/webmin/version
index 922e0043a98cd1be37206d1f9d45892fe793b5fb..e33e37d100430b98cabfc9a5dc1742e75b50c756 100644 (file)
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.960
+1.962

diff --git a/webmin/vgetty/config b/webmin/vgetty/config
index bb4eec4d2f0a182ed079cffa2fe0fa7d4eef0d14..00f79ad34d13757135b33eaf85df0fed3a34620c 100644 (file)
--- 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 fdb54e96aa9372b262e9893855765166cf06ab18..15bb757e4b59d91e06a37bc2a0f32fadc4f4cfff 100644 (file)
--- a/webmin/webalizer/config
+++ b/webmin/webalizer/config
@@ -1,6 +1,6 @@
-auto=apache,squid,proftpd,wuftpd
 naked=0
-webalizer=/usr/bin/webalizer
-alt_conf=/etc/webalizer/webalizer.conf.sample
-skip_old=0
 webalizer_conf=/etc/webalizer/webalizer.conf
+skip_old=0
+alt_conf=/etc/webalizer/webalizer.conf.sample
+webalizer=/usr/bin/webalizer
+auto=apache,squid,proftpd,wuftpd

diff --git a/webmin/webmin/config b/webmin/webmin/config
index 090c652893fd0ce0a4050dac10600f6420f5e3ab..ef7f6f6cbf50069455e3a7e7d5400b39aa07bb87 100644 (file)
--- a/webmin/webmin/config
+++ b/webmin/webmin/config
@@ -1,12 +1,12 @@
 osdn=1
-uphour=23
-upshow=1
 warn_days=7
-last_version_number=1.900
-upmins=47
 last_version_check=1549050668
+letsencrypt_dns_wait=10
+last_version_number=1.900
+upshow=1
 cron_mode=0
-upmissing=0
+uphour=23
+upmins=47
 updays=1
+upmissing=0
 update=0
-letsencrypt_dns_wait=10

diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config
index f28dfaeed578154545ad8e194f50a35b1f330a28..2008166db7baa85aac0234cb781a954a4ebb582c 100644 (file)
--- a/webmin/wuftpd/config
+++ b/webmin/wuftpd/config
@@ -1,8 +1,8 @@
+ftphosts=/etc/wu-ftpd/ftphosts
 ftpconversions=/etc/wu-ftpd/ftpconversions
-log_file=/var/log/xferlog
-ftpusers=/etc/wu-ftpd/ftpusers
 pid_file=/var/run/ftpd.pids-all
-ftphosts=/etc/wu-ftpd/ftphosts
-ftpaccess=/etc/wu-ftpd/ftpaccess
 ftpd_path=/usr/sbin/wu-ftpd
+ftpusers=/etc/wu-ftpd/ftpusers
+log_file=/var/log/xferlog
 ftpgroups=/etc/wu-ftpd/ftpgroups
+ftpaccess=/etc/wu-ftpd/ftpaccess

diff --git a/webmin/xinetd/config b/webmin/xinetd/config
index 8808102f8dc4dee364fbf0dce486eb68dbb5956e..709f2b49ea3cf2dfa836f2b66e19d2015f13c508 100644 (file)
--- a/webmin/xinetd/config
+++ b/webmin/xinetd/config
@@ -1,5 +1,5 @@
 pid_file=/var/run/xinetd.pid
+xinetd_conf=/etc/xinetd.conf
 lookup_servs=1
 start_cmd=/etc/init.d/xinetd start
 protocols_file=/etc/protocols
-xinetd_conf=/etc/xinetd.conf