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

Package changes:
-libfreetype6 2.10.1-2 amd64
+libfreetype6 2.10.1-2ubuntu0.1 amd64
-libnetplan0 0.99-0ubuntu3~20.04.2 amd64
+libnetplan0 0.100-0ubuntu4~20.04.2 amd64
-linux-libc-dev 5.4.0-51.56 amd64
+linux-libc-dev 5.4.0-52.57 amd64
-netplan.io 0.99-0ubuntu3~20.04.2 amd64
+netplan.io 0.100-0ubuntu4~20.04.2 amd64
-webmin 1.955 all
+webmin 1.960 all

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

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

diff --git a/webmin/apache/config b/webmin/apache/config
index 5c54d34b41b6fc0be993a58eb47d39b568a55a29..e77c3b02d8c06f1dce754a0669c87db80325be7c 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
 virt_file=/etc/apache2/sites-available
-max_servers=100
+apachectl_path=/usr/sbin/apache2ctl
+stop_cmd=/etc/init.d/apache2 stop
 httpd_conf=/etc/apache2/apache2.conf
-srm_conf=/etc/apache2/srm.conf
-test_config=1
-access_conf=/etc/apache2/access.conf
 show_list=0
+test_config=1
+srm_conf=/etc/apache2/srm.conf
+defines_file=/etc/apache2/envvars
 link_dir=/etc/apache2/sites-enabled
-httpd_path=/usr/sbin/apache2
-test_always=0
-stop_cmd=/etc/init.d/apache2 stop
-defines_name=APACHE_ARGUMENTS
-show_names=0
+apply_cmd=/usr/sbin/apache2ctl graceful
+max_servers=100
 httpd_dir=/etc/apache2
-apachectl_path=/usr/sbin/apache2ctl
-auto_mods=1
-test_apachectl=1
-mime_types=/etc/apache2/mime.types
-show_order=0
-allow_virtualmin=0
 test_manual=0
-start_cmd=/etc/init.d/apache2 start
-defines_file=/etc/apache2/envvars
-apply_cmd=/usr/sbin/apache2ctl graceful
+test_always=0
+test_apachectl=1

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

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

diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config
index db38d77512510100f19a87e68a12f5c2eac4d9a3..da72c415d6dd43c27f93599a120501761b2a0a41 100644 (file)
--- a/webmin/bandwidth/config
+++ b/webmin/bandwidth/config
@@ -1,2 +1,2 @@
-firewall_system=firewall
 bandwidth_log=/var/log/bandwidth
+firewall_system=firewall

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

diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config
index 2ab4c6af195ddf54df41fc1e48bf2e62574345c1..1c1ed801df780c749f8753e235a79011201bd452 100644 (file)
--- a/webmin/cluster-passwd/config
+++ b/webmin/cluster-passwd/config
@@ -1,3 +1,3 @@
-input_type=0
 sort_mode=0
 max_users=200
+input_type=0

diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config
index fd788cb1e074549f6b0858f1e816c867c16118a7..470eaee86535d874ac8fe55dbfee746a3dd61ef8 100644 (file)
--- a/webmin/cluster-software/config
+++ b/webmin/cluster-software/config
@@ -1,2 +1,2 @@
-table_mode=0
 sort_mode=0
+table_mode=0

diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config
index e607f88214e097896d861422a8879bb191c01e89..31329133ec6070340cebef5d867f0dea0570dc34 100644 (file)
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
-conf_add_user=1
-sort_mode=0
-conf_host_links=1
 conf_find_group=1
+conf_add_group=1
+conf_add_user=1
+table_mode=0
 conf_find_user=1
-conf_allow_refresh=1
+conf_host_links=1
+sort_mode=0
 conf_allow_sync=1
-table_mode=0
-conf_add_group=1
+conf_allow_refresh=1

diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config
index 470eaee86535d874ac8fe55dbfee746a3dd61ef8..fd788cb1e074549f6b0858f1e816c867c16118a7 100644 (file)
--- 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 7319cc75e57d30eb245d5359905ddcf89494c073..a0a4dd4bac8178cc3e03efe7199852ad32ef61bc 100644 (file)
--- a/webmin/config
+++ b/webmin/config
@@ -1,32 +1,32 @@
-tempdelete_days=7
+by_view=0
+hostnamedisplay=
+hostnamemode=0
+feedback_to=
+passwd_mindex=4
+os_type=debian-linux
+lang=en.UTF-8
 passwd_file=/etc/shadow
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
-help_height=
-webprefix=
-nofeedbackcc=0
+showlogin=0
 os_version=9.0
-lang_root=de.UTF-8
-os_type=debian-linux
+nofeedbackcc=0
 passwd_cindex=2
-passwd_pindex=1
-help_width=
-passwd_uindex=0
-referers_none=1
+real_os_version=18.04.1
 real_os_type=Ubuntu Linux
+product=webmin
+md5pass=1
+help_width=
+tempdelete_days=7
 theme=authentic-theme
-lang=en.UTF-8
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+passwd_pindex=1
+help_height=
+ld_env=LD_LIBRARY_PATH
+webprefix=
 sysinfo=0
+passwd_uindex=0
+lang_root=de.UTF-8
 log=1
-feedback_to=
-product=webmin
-passwd_mindex=4
-real_os_version=18.04.1
-ld_env=LD_LIBRARY_PATH
-hostnamedisplay=
-dateformat=dd/mon/yyyy
-by_view=0
-md5pass=1
-showlogin=0
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
 showhost=0
-hostnamemode=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 067bac10d8c8c35ee81dd3cde3f0bcceeeafe200..82f8f80ad60be947627e92e5a910ac28a9875c43 100644 (file)
--- a/webmin/cpan/config
+++ b/webmin/cpan/config
@@ -1,6 +1,6 @@
-packages=http://www.cpan.org/modules/02packages.details.txt.gz
-refresh_days=30
-save_partial=0
+incpackages=1
 cpan=http://www.cpan.org/authors/id
+save_partial=0
+refresh_days=30
+packages=http://www.cpan.org/modules/02packages.details.txt.gz
 incyum=1
-incpackages=1

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

diff --git a/webmin/custom/config b/webmin/custom/config
index 6c90eac06c733e23a340f701f76f832422f09785..55a8becd6fc6cbfc291d2223682679144d49af9a 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
-columns=2
+params_cmd=0

diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index fc44163b81b64e2f968fb66a80f8c98de0b9aed1..62474e1463cef54c0e2b8731a35fb5d7ce88723b 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
-interfaces_type=debian
-dhcpd_path=/usr/sbin/dhcpd
 start_cmd=service isc-dhcp-server start
+show_ip=0
 display_max=100
-show_mac=0
-dhcpd_conf=/etc/dhcp/dhcpd.conf
 desc_name=0
-dhcpd_nocols=5
-lease_tz=0
+dhcpd_conf=/etc/dhcp/dhcpd.conf
 restart_cmd=service isc-dhcp-server restart
-pid_file=/var/run/dhcpd.pid
-show_ip=0
+dhcpd_nocols=5
 stop_cmd=service isc-dhcp-server stop
-lease_sort=0
+lease_tz=0
 lease_file=/var/lib/dhcp/dhcpd.leases
+interfaces_type=debian
+dhcpd_path=/usr/sbin/dhcpd
+lease_sort=0

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

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

diff --git a/webmin/exports/config b/webmin/exports/config
index d23f7b7df154181b01624267f43464a293e5e868..5a48ca66fb55683866e1a0cfe1c82382aa28c518 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
-apply_cmd=exportfs -r

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index 29510081ca0cc660fcb36ffef88f8a1f12e4d8f6..2c3e546012887fd4278d1fcbc1ce8b284fd048cf 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
-targets_file=/etc/iscsi/targets
-auths_file=/etc/iscsi/auths
-opts_file=/etc/sysconfig/netbsd-iscsi
 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

diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config
index ea884f9636b7343758470b84956c58a86fce6958..f09dd5e4efaf2560cf5af20b46505e7ba05edf82 100644 (file)
--- a/webmin/iscsi-target/config
+++ b/webmin/iscsi-target/config
@@ -1,7 +1,7 @@
-init_name=iscsitarget
-opts_file=/etc/default/iscsitarget
-pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid
-targets_file=/etc/iet/targets.allow
 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
 config_file=/etc/iet/ietd.conf

diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config
index a1adcd7d66d675d4452b3c9e595eb2ba577dd2aa..34a3e9561ac997de772214ce615a7c87747075fd 100644 (file)
--- a/webmin/iscsi-tgtd/config
+++ b/webmin/iscsi-tgtd/config
@@ -1,5 +1,5 @@
 tgtd=tgtd
+config_file=/etc/tgt/targets.conf
+tgtadm=tgtadm
 init_name=tgtd
 tgtadmin=tgt-admin
-tgtadm=tgtadm
-config_file=/etc/tgt/targets.conf

diff --git a/webmin/jabber/config b/webmin/jabber/config
index 2d3456223209bfedafc80afa80b80514bfd32ade..8f7f7aa3da2e5bfcb1dc75d415bc0692810e1d47 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_dir=/var/lib/jabber

diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config
index 0f578e5fb1ac6ed5a261ac441b0524ca4125746e..4587ce571ddd2b74f0fa614d0e83175d76b6d069 100644 (file)
--- a/webmin/ldap-client/config
+++ b/webmin/ldap-client/config
@@ -1,3 +1,3 @@
-init_name=nslcd
 auth_ldap=/etc/ldap.conf
+init_name=nslcd
 secret=/etc/ldap.secret

diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index a63de2a7ca05a56af75f676f081b81ed9d8dc87d..fbca6e90c1052ce29aa10dd25d40338b17e43823 100644 (file)
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
-config_file=/etc/ldap/slapd.d
-ldap_user=openldap
+attr_count=6
 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
-start_cmd=/etc/init.d/slapd start
 init_name=slapd
-browse_max=100
-apply_cmd=/etc/init.d/slapd restart
-attr_count=6
+config_file=/etc/ldap/slapd.d
+start_cmd=/etc/init.d/slapd start

diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config
index 66dc15566c79e90a49e731e888e1512ce561dd8b..1870023eb821c0ef8dccdc843704b5ac2e607610 100644 (file)
--- a/webmin/ldap-useradmin/config
+++ b/webmin/ldap-useradmin/config
@@ -1,24 +1,24 @@
-quota_support=0
-membox=0
-shells=fixed,ldap,passwd,shells
-alias_same=0
-other_class=inetOrgPerson
-auth_ldap=/etc/ldap.conf
+given=0
 samba_def=0
-imap_class=SuSEeMailObject
+given_order=0
 mailfmt=0
-imap_foldersep=.
-secmode=0
-person=1
-multi_fields=0
-samba_class=sambaSamAccount
-given=0
-imap_def=0
+imap_class=SuSEeMailObject
+other_class=inetOrgPerson
 ldap_tls=0
-gecos=1
-md5=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
+quota_support=0
+md5=0
 samba_gclass=sambaGroup
-given_order=0
+person=1
+alias_same=0

diff --git a/webmin/logrotate/config b/webmin/logrotate/config
index 89a1a0d84b7e668abc53f514db0bfd475e17e51e..b85fb9a25815cdd0f26d6fbb5ec3c52e5964f05c 100644 (file)
--- 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
+logrotate=logrotate
+sort_mode=0

diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config
index 60d9f2dabe54bbf722d5f02361ec4d2d334b0ba4..2b37d2d61f077e747190cd398b7cca2999fb1007 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_perms=755
+iface_arg=
+sort_mode=0
+print_style=cups
+gs_fontpath=
 start_cmd=/etc/init.d/cupsys start
+spool_dir=/var/spool/cups
+gs_path=gs
+show_status=0
 iface_owner=lp:lp
+smbclient_path=smbclient
 display_mode=0
-gs_path=gs
-spool_dir=/var/spool/cups
+gs_lib=
+iface_perms=755
 driver_style=cups
-gs_fontpath=
-smbclient_path=smbclient
 stop_cmd=/etc/init.d/cupsys stop
-print_style=cups
-iface_arg=
-gs_lib=
-show_status=0
-sort_mode=0
-model_path=/usr/share/foomatic/db /usr/share/ppd

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

diff --git a/webmin/man/config b/webmin/man/config
index b5349529c5c8764b765aa60b819bb6be2eb60653..26d8788d98c15503a7b0db5ebd834c21061b8722 100644 (file)
--- a/webmin/man/config
+++ b/webmin/man/config
@@ -1,9 +1,9 @@
-man_cmd=man PAGE
-list_cmd_sect=man -w SECTION PAGE
-list_cmd=man -w PAGE
+doc_dir=/usr/share/doc
 kernel_dir=/usr/src/linux/Documentation
 man2html_path=man2html
 man_cmd_sect=man SECTION PAGE
-doc_dir=/usr/share/doc
+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 4d70615d9d086bb1ed50d09c7dba1c3bc932370f..3ddaf7837c087481727afaaa2e14837fb3d4c354 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.955
+server=MiniServ/1.960

diff --git a/webmin/mon/config b/webmin/mon/config
index fd476aa39f85c5fe69d2a87a647a3751f5079444..85d095cdd477b4c58d166cc250a39f0d873c0328 100644 (file)
--- a/webmin/mon/config
+++ b/webmin/mon/config
@@ -1,7 +1,7 @@
-cfbasedir=/etc/mon
 start_cmd=/etc/init.d/mon start
-stop_cmd=/etc/init.d/mon stop
+cfbasedir=/etc/mon
 mon_cgi=/var/www/cgi-bin/mon.cgi
-restart_cmd=/etc/init.d/mon restart
 monshow=/usr/bin/monshow
+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 f6a58616ad9b1a5d3a5d26fd3d87d30d54c748b0..75d148ae4d664db3fd4a06c81d94e63848e10daf 100644 (file)
--- a/webmin/mount/config
+++ b/webmin/mount/config
@@ -1,10 +1,10 @@
-nfs_check=1
+fstab_file=/etc/fstab
+nmblookup_path=nmblookup
 show_used=1
+long_fstypes=1
 sysinfo=1
-sort_mode=2
-fstab_file=/etc/fstab
 autofs_file=/etc/auto.master
-nmblookup_path=nmblookup
 auto_file=/etc/am-utils/amd.conf
-long_fstypes=1
+sort_mode=2
 smbclient_path=smbclient
+nfs_check=1

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

diff --git a/webmin/net/config b/webmin/net/config
index 04c0295d539ca9945acf0329655be7fb0129f4dd..56c61c18ea8b53d0bf28fe026e3aa6de40ddc838 100644 (file)
--- a/webmin/net/config
+++ b/webmin/net/config
@@ -1,2 +1,2 @@
-def_netmask=255.255.255.0
 hosts_file=/etc/hosts
+def_netmask=255.255.255.0

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

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

diff --git a/webmin/pam/config b/webmin/pam/config
index a434b0919b9c6b6c6fbb02d0d2f228e39c5b4467..c05bf36063b33071df431be419fdfd19e6c87b76 100644 (file)
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
-pam_dir=/etc/pam.d
+mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so
 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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/webmin/quota/config b/webmin/quota/config
index c356925fbcf066f359d0ef2c9a772934e29db224..5ccd96b6ee2efe3365fe2f9ff3d51dda7873b91f 100644 (file)
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
+group_copy_command=edquota -g -p
+user_copy_command=edquota -u -p
+quotacheck_command=quotacheck -u -g
 block_size=1024
-group_quotaon_command=quotaon -g
-user_repquota_command=repquota -u -v
 user_quotaon_command=quotaon -u
-user_quotaoff_command=quotaoff -u
-hide_uids=0
+user_grace_command=edquota -u -t
 group_repquota_command=repquota -g -v
-sort_mode=0
-group_grace_command=edquota -g -t
-user_copy_command=edquota -u -p
-pc_show=1
-group_quota_command=quota -v -g
-quotacheck_command=quotacheck -u -g
-user_quota_command=quota -v -u
+group_quotaoff_command=quotaoff -g
+block_mode=1
 user_setquota_command=setquota -u
 show_grace=1
-group_quotaoff_command=quotaoff -g
-user_grace_command=edquota -u -t
-group_copy_command=edquota -g -p
+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}.
-display_max=100
-group_edquota_command=edquota -g
-block_mode=1
 user_edquota_command=edquota -u
-group_setquota_command=setquota -g
+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 4bd2da90edf6465683e2291abe2c316b200fd9c3..8ffe6d468c9d654b8443b714f9ab5dee68f7ad38 100644 (file)
--- a/webmin/raid/config
+++ b/webmin/raid/config
@@ -1,3 +1,3 @@
+mdadm=/etc/mdadm/mdadm.conf
 mdstat=/proc/mdstat
 raidtab=/etc/raidtab
-mdadm=/etc/mdadm/mdadm.conf

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

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

diff --git a/webmin/sendmail/config b/webmin/sendmail/config
index 895718025ae228e5074b52a56a74b831aa9135d3..33ce186db669b8cdb2031b07b58843712a7827fb 100644 (file)
--- a/webmin/sendmail/config
+++ b/webmin/sendmail/config
@@ -1,30 +1,30 @@
-smrsh_dir=/etc/smrsh
-wrap_width=80
-show_cmts=0
-prefix_cmts=0
+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
 index_min=1000000
+sort_mode=0
+prefix_cmts=0
+mail_dir=/var/spool/mail
 makemap_path=makemap
-mail_type=0
-max_records=200
-top_buttons=1
 sendmail_cf=/etc/mail/sendmail.cf
-mail_file=mbox
-mail_dir=/var/spool/mail
-mailq_sort=0
-sendmail_pid=/var/run/sendmail/mta/sendmail.pid
-track_read=0
-sort_mode=0
+wrap_width=80
+mailq_show=Date,From,To,Size,Status
 sendmail_path=/usr/lib/sendmail
-perpage=20
-delete_confirm=1
-fwd_mode=0
 sendmail_command=/usr/lib/sendmail -bd -q1h
-columns=2
-mailq_count=0
-order_mail=0
-sendmail_features=/usr/share/sendmail/cf
-show_to=0
+mail_type=0
 delete_warn=1
+fwd_mode=0
+track_read=0
+order_mail=0
 sendmail_mc=/etc/mail/sendmail.mc
-mailq_show=Date,From,To,Size,Status
-mail_style=0
+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 f28855fb0cd8bcbbbfe8dffe8847edd7ac0d3b24..7a0afcca43e771c9ea5533617dc787eaa0c6c12e 100644 (file)
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
-scan_time=5
-sort_mode=0
-max_servers=100
-show_status=1
-deffast=2
 groups_dir=/etc/cluster/groups
+show_status=1
+scan_time=5
 show_ip=0
-display_mode=0
+max_servers=100
 deflink=0
-capath=/usr/share/ca-certificates
 resolve=1
+sort_mode=0
+display_mode=0
+deffast=2
+capath=/usr/share/ca-certificates

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

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

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

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

diff --git a/webmin/spam/config b/webmin/spam/config
index a36a07aa92d495b5ee75b1979a28634807de8efa..c464ba8c612baa2cd9347ca06c88e9f0cdb7705b 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
-warn_procmail=1
-spamassassin=spamassassin
 procmailrc=/etc/procmailrc
-mode=0
-max_awl=200
-processes=spamd amavisd
 procmail_cmd=*
+spamassassin=spamassassin
+addto=0
 sa_learn=sa-learn
+warn_procmail=1
+processes=spamd amavisd
+mode=0
 call_spam=1
-restart_cmd=/etc/init.d/spamassassin restart

diff --git a/webmin/squid/config b/webmin/squid/config
index e9d27eb1f0ac4136da193fb950e617b1810452f5..31ce69363482624b5f556d2adcfaa298b2f83f76 100644 (file)
--- a/webmin/squid/config
+++ b/webmin/squid/config
@@ -1,21 +1,21 @@
-sort_conf=0
-sync_delete=0
-sync_create=0
-sync_modify=1
-cal_max=50000
-squid_start=service squid start
-cache_dir=/var/spool/squid
-squid_stop=service squid stop
-log_dir=/var/log/squid
+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
-squid_restart=service squid reload
+squid_stop=service squid stop
 squidclient=squidclient
+sync_delete=0
 calamaris=calamaris
-pid_file=/var/run/squid.pid
-squid_conf=/etc/squid/squid.conf
-restart_pos=0
-cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
+cal_max=50000
+squid_restart=service squid reload
+cache_dir=/var/spool/squid
 squid_path=squid
 cal_all=1
-cal_fmt=w
+sync_modify=1
+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 5bfac3bd4527bf27b7c13329326256e69a4aeb9e..a5f0707e4f8200d6a753cf57ba4a945247e9ae14 100644 (file)
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,11 +1,11 @@
 sync_create=0
-sshd_config=/etc/ssh/sshd_config
-stop_cmd=service ssh stop
-sync_auth=1
-sync_pass=0
-sync_gnupg=0
 pid_file=/var/run/sshd.pid
+start_cmd=service ssh start
 client_config=/etc/ssh/ssh_config
+sync_pass=0
 keygen_path=/usr/bin/ssh-keygen
+stop_cmd=service ssh stop
+sync_auth=1
 sshd_path=/usr/sbin/sshd
-start_cmd=service ssh start
+sync_gnupg=0
+sshd_config=/etc/ssh/sshd_config

diff --git a/webmin/status/config b/webmin/status/config
index 8193d3e2ca987dc51cb0f9e4f77c58c068d7e3d4..c114469a3cc9c610d2aba16c016e875e4e960be9 100644 (file)
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,13 +1,13 @@
-columns=2
-subject_mode=0
-sched_offset=0
-sysinfo=0
-output=0
-index_status=1
 sysinfo_users=0
-history_show=50
 snmp_version=2
+sysinfo=0
+sched_offset=0
 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
 history_purge=30
 pager_cmd=sms_client

diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config
index a4bcc547f5cbb45d869b249fe3d5ddb6d5aba420..0938cf9953fff32ec0c0c1dd5207f0398bbd7f64 100644 (file)
--- a/webmin/syslog-ng/config
+++ b/webmin/syslog-ng/config
@@ -1,7 +1,7 @@
-pid_file=/var/run/syslog-ng.pid
 compressed=1
+lines=20
 syslogng_conf=/etc/syslog-ng/syslog-ng.conf
 syslogng_cmd=syslog-ng
 start_cmd=/etc/init.d/syslog-ng start
-lines=20
+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 040208af4104e95110064231016e80dff3d85e27..4d2ccb145a7f8c0fd215e902e81ba1e6201ba4f6 100644 (file)
--- a/webmin/syslog/config
+++ b/webmin/syslog/config
@@ -1,19 +1,19 @@
-pid_file=/var/run/rsyslogd.pid
+reverse=0
+sync=1
 restart_cmd=/usr/sbin/service rsyslog restart
-others=1
-pri_all=1
+socket=0
+m4_path=
 tags=0
+pipe=1
+pri_dir=1
+lines=20
+others=1
+compressed=1
+pid_file=/var/run/rsyslogd.pid
 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
-m4_conf=0
-m4_path=
-reverse=0
+signal_cmd=/usr/sbin/service rsyslog restart
 start_cmd=/usr/sbin/service rsyslog start
-pri_dir=1
 syslogd=/usr/sbin/rsyslogd
-signal_cmd=/usr/sbin/service rsyslog restart
-pipe=1
-sync=1
-socket=0
-compressed=1
+pri_all=1
+m4_conf=0
 syslog_conf=/etc/rsyslog.conf
-lines=20

diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config
index bfd2d19d4140fa68e5a79cb5815e51fc74aac58a..10eceba4da0333ba478f7088eb7b1c4512a85570 100644 (file)
--- a/webmin/tcpwrappers/config
+++ b/webmin/tcpwrappers/config
@@ -1,3 +1,3 @@
-inetd_services=0
-hosts_allow=/etc/hosts.allow
 hosts_deny=/etc/hosts.deny
+hosts_allow=/etc/hosts.allow
+inetd_services=0

diff --git a/webmin/telnet/config b/webmin/telnet/config
index 1c000fc6a7df90f09664253f29512b72b708e62b..70f6076030f2e5177b03d8a47d9e39843800b4c9 100644 (file)
--- a/webmin/telnet/config
+++ b/webmin/telnet/config
@@ -1,5 +1,5 @@
 detach=0
-mode=1
+no_test=0
 sizemode=0
 proxy=0
-no_test=0
+mode=1

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

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

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

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

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

diff --git a/webmin/vgetty/config b/webmin/vgetty/config
index 00f79ad34d13757135b33eaf85df0fed3a34620c..bb4eec4d2f0a182ed079cffa2fe0fa7d4eef0d14 100644 (file)
--- a/webmin/vgetty/config
+++ b/webmin/vgetty/config
@@ -1,2 +1,2 @@
-vgetty_config=/etc/mgetty+sendfax/voice.conf
 vgetty_cmd=vgetty
+vgetty_config=/etc/mgetty+sendfax/voice.conf

diff --git a/webmin/webalizer/config b/webmin/webalizer/config
index 5442331419e17361c593ebe6403404b28f16e072..fdb54e96aa9372b262e9893855765166cf06ab18 100644 (file)
--- a/webmin/webalizer/config
+++ b/webmin/webalizer/config
@@ -1,6 +1,6 @@
-webalizer_conf=/etc/webalizer/webalizer.conf
+auto=apache,squid,proftpd,wuftpd
 naked=0
-alt_conf=/etc/webalizer/webalizer.conf.sample
 webalizer=/usr/bin/webalizer
-auto=apache,squid,proftpd,wuftpd
+alt_conf=/etc/webalizer/webalizer.conf.sample
 skip_old=0
+webalizer_conf=/etc/webalizer/webalizer.conf

diff --git a/webmin/webmin/config b/webmin/webmin/config
index 23d041b960b71c28ff285aaa28267e9d3dc9df21..090c652893fd0ce0a4050dac10600f6420f5e3ab 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
 cron_mode=0
-update=0
-updays=1
-last_version_number=1.900
 upmissing=0
-warn_days=7
+updays=1
+update=0
 letsencrypt_dns_wait=10
-osdn=1
-upshow=1
-last_version_check=1549050668
-uphour=23

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

diff --git a/webmin/xinetd/config b/webmin/xinetd/config
index 709f2b49ea3cf2dfa836f2b66e19d2015f13c508..8808102f8dc4dee364fbf0dce486eb68dbb5956e 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