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

Package changes:
-libapr1 1.7.0-6+ubuntu20.04.1+deb.sury.org+2 amd64
+libapr1 1.7.0-8+ubuntu20.04.1+deb.sury.org+1 amd64
-libssh-4 0.9.3-2ubuntu2.1 amd64
+libssh-4 0.9.3-2ubuntu2.2 amd64
-postfix 3.4.13-0ubuntu1 amd64
-postfix-mysql 3.4.13-0ubuntu1 amd64
+postfix 3.4.13-0ubuntu1.1 amd64
+postfix-mysql 3.4.13-0ubuntu1.1 amd64
-webmin 1.980 all
+webmin 1.981 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 1dcf20e9c89d6d7f20b9bc5c69efdd986abc7470..c722d3801a1520382fe18d4364e27e7ef81d8a31 100644 (file)
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
 pppoe_conf=/etc/ppp/pppoe.conf
-pppoe_cmd=pppoe
-conf_style=0
 stop_cmd=adsl-stop
+conf_style=0
+pppoe_cmd=pppoe
 status_cmd=adsl-status
-start_cmd=adsl-start
 pap_file=/etc/ppp/pap-secrets
+start_cmd=adsl-start

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

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

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

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

diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config
index 0ff36670f6be0e9639843d161ac27ffbea335efd..55c404f0e095b07852b750edbc00ea496b721343 100644 (file)
--- a/webmin/cluster-useradmin/config
+++ b/webmin/cluster-useradmin/config
@@ -1,9 +1,9 @@
-conf_add_group=1
-conf_host_links=1
-sort_mode=0
 conf_allow_refresh=1
-conf_allow_sync=1
 conf_find_group=1
+conf_host_links=1
+conf_add_user=1
+sort_mode=0
 conf_find_user=1
+conf_add_group=1
+conf_allow_sync=1
 table_mode=0
-conf_add_user=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 192e51b5e084ddc1177848191ddc32c76895ce02..f5afe06df0fdac47315aabcf860f39333983af4f 100644 (file)
--- a/webmin/config
+++ b/webmin/config
@@ -1,32 +1,32 @@
-nofeedbackcc=0
+real_os_version=18.04.1
+passwd_mindex=4
+referers_none=1
+ld_env=LD_LIBRARY_PATH
+sysinfo=0
+by_view=0
 showlogin=0
-passwd_file=/etc/shadow
-product=webmin
+real_os_type=Ubuntu Linux
+lang=en.UTF-8
+help_height=
 feedback_to=
-by_view=0
+passwd_file=/etc/shadow
+os_version=9.0
+hostnamedisplay=
 os_type=debian-linux
+passwd_uindex=0
 tempdelete_days=7
+log=1
+md5pass=1
+dateformat=dd/mon/yyyy
 webprefix=
+lang_root=de.UTF-8
+passwd_cindex=2
 showhost=0
+nofeedbackcc=0
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
 theme=authentic-theme
+product=webmin
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
 hostnamemode=0
-dateformat=dd/mon/yyyy
-lang_root=de.UTF-8
-sysinfo=0
-lang=en.UTF-8
-hostnamedisplay=
-ld_env=LD_LIBRARY_PATH
-help_height=
-real_os_version=18.04.1
-passwd_mindex=4
-real_os_type=Ubuntu Linux
-log=1
-passwd_uindex=0
-passwd_cindex=2
 passwd_pindex=1
-os_version=9.0
-md5pass=1
 help_width=
-referers_none=1
-path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
-find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'

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

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

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

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

diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index 2c130e9833612d78138c16fbaf72b6d328b84d71..dd7cbf11cd2360712ad8b38adfe3b5945865f6d5 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
 dovecot=/usr/sbin/dovecot
 init_script=dovecot
-dovecot_config=/etc/dovecot/dovecot.conf
+pid_file=/var/run/dovecot/master.pid

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

diff --git a/webmin/exports/config b/webmin/exports/config
index b8864bec557a8fe17e2f07d54397b75e1b3b8d41..d23f7b7df154181b01624267f43464a293e5e868 100644 (file)
--- a/webmin/exports/config
+++ b/webmin/exports/config
@@ -1,3 +1,3 @@
-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
+exports_file=/etc/exports
 apply_cmd=exportfs -r

diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config
index 73862c6ef7e3e29fcc7a7caef604ed3852ad5c85..0025be87b24090d6ef3a6c0ff4c2797c0f71b40f 100644 (file)
--- a/webmin/fail2ban/config
+++ b/webmin/fail2ban/config
@@ -1,4 +1,4 @@
-server_cmd=/usr/bin/fail2ban-server
 client_cmd=/usr/bin/fail2ban-client
 config_dir=/etc/fail2ban
 init_script=fail2ban
+server_cmd=/usr/bin/fail2ban-server

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

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

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

diff --git a/webmin/firewall6/config b/webmin/firewall6/config
index 06fb63d1d8d4dda30e55c310f180bd79f29be2da..2e13e3ab7a0ea7bbd5115ddb7fc0b70a4313a5cf 100644 (file)
--- a/webmin/firewall6/config
+++ b/webmin/firewall6/config
@@ -1,6 +1,6 @@
-cluster_mode=1
 view_condition=1
+cluster_mode=1
 direct=0
+view_comment=0
 force_init=0
 comment_mod=0
-view_comment=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 1387f5ef066aa0ab19d086c0765e87a8048d425b..b9d0f0b35a27d02092abeb8cdbc96e99bf57f7b2 100644 (file)
--- a/webmin/fsdump/config
+++ b/webmin/fsdump/config
@@ -1,7 +1,7 @@
-date_subs=0
-error_email=0
-nonewtape=0
-webmin_subs=0
 always_tar=0
+webmin_subs=0
 simple_sched=0
+error_email=0
+date_subs=0
+nonewtape=0
 run_mode=0

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

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

diff --git a/webmin/idmapd/config b/webmin/idmapd/config
index f25eeba972966eea8656e64271011b1dbc646211..d6cd4227f403ad79c0c428ea91b948d7e0148e2d 100644 (file)
--- a/webmin/idmapd/config
+++ b/webmin/idmapd/config
@@ -1,3 +1,3 @@
-restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
 idmapd_conf=/etc/idmapd.conf
+restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi
 idmapd_path=/usr/sbin/rpc.idmapd

diff --git a/webmin/inetd/config b/webmin/inetd/config
index b4e3b0583ef2fd4bc83f8d2e76a0d1a1f930bf8b..439b34f2ba834eb21b76d798d77148438d4968ba 100644 (file)
--- a/webmin/inetd/config
+++ b/webmin/inetd/config
@@ -1,16 +1,16 @@
-ipv6=0
 extended_inetd=1
-deny_file=/etc/hosts.deny
 rpc_inetd=1
-protocols_file=/etc/protocols
-allow_file=/etc/hosts.allow
+deny_file=/etc/hosts.deny
+services_file=/etc/services
+ipv6=0
+qm_mode=0
+sort_mode=0
 show_empty=1
 restart_command=killall -HUP inetd
+protocols_file=/etc/protocols
+rpc_file=/etc/rpc
+rpc_protocols=tcp udp
 display_max=100
+allow_file=/etc/hosts.allow
 tcpd_path=/usr/sbin/tcpd
-qm_mode=0
-sort_mode=0
-rpc_protocols=tcp udp
-rpc_file=/etc/rpc
-services_file=/etc/services
 inetd_conf_file=/etc/inetd.conf

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

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

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

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

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

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

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

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

diff --git a/webmin/jabber/config b/webmin/jabber/config
index 54d570ee57192838fe280e32d67869f90145b77f..846252cf8e8edfbae8f9e806f8b4cc16040719ee 100644 (file)
--- a/webmin/jabber/config
+++ b/webmin/jabber/config
@@ -1,5 +1,5 @@
 start_cmd=/etc/init.d/jabberd start
-stop_cmd=/etc/init.d/jabberd stop
 jabber_daemon=/usr/sbin/jabberd
 jabber_config=/etc/jabber/jabber.xml
 jabber_dir=/var/lib/jabber
+stop_cmd=/etc/init.d/jabberd stop

diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config
index 4460f14f739d912bea17ddceee4289c0cfec75f6..55d1e7111353cdc10d7f72c6550eacdf418fd225 100644 (file)
--- a/webmin/ldap-client/config
+++ b/webmin/ldap-client/config
@@ -1,3 +1,3 @@
-auth_ldap=/etc/ldap.conf
 secret=/etc/ldap.secret
 init_name=nslcd
+auth_ldap=/etc/ldap.conf

diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index 31f98881893875b8026b4ab99aee3cd338e9af74..b9727ffdeece9dbb7bf3782275edfc9c14e9ff34 100644 (file)
--- a/webmin/ldap-server/config
+++ b/webmin/ldap-server/config
@@ -1,10 +1,10 @@
-ldap_user=openldap
-init_name=slapd
-apply_cmd=/etc/init.d/slapd restart
-config_file=/etc/ldap/slapd.d
 attr_count=6
-schema_dir=/etc/ldap/schema
 stop_cmd=/etc/init.d/slapd stop
+config_file=/etc/ldap/slapd.d
+schema_dir=/etc/ldap/schema
 slapd=slapd
+ldap_user=openldap
+apply_cmd=/etc/init.d/slapd restart
+init_name=slapd
 browse_max=100
 start_cmd=/etc/init.d/slapd start

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

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

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

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

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

diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index 83c6c0cd1486df074a76beb982151ea6b40e6c6d..1a2f2b38988b1e85a1fc3d5876e3c3709f4adf92 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.980
+server=MiniServ/1.981

diff --git a/webmin/mon/config b/webmin/mon/config
index 509453890c5471f7bc5e411fff19985bbc3de450..3b23f434c30b448385dc4ed249e99c347153f5ab 100644 (file)
--- a/webmin/mon/config
+++ b/webmin/mon/config
@@ -1,7 +1,7 @@
+start_cmd=/etc/init.d/mon start
+restart_cmd=/etc/init.d/mon restart
+mon_cgi=/var/www/cgi-bin/mon.cgi
+stop_cmd=/etc/init.d/mon stop
 cfbasedir=/etc/mon
 monshow=/usr/bin/monshow
 pid_file=/var/run/mon.pid
-mon_cgi=/var/www/cgi-bin/mon.cgi
-start_cmd=/etc/init.d/mon start
-stop_cmd=/etc/init.d/mon stop
-restart_cmd=/etc/init.d/mon restart

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

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

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

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

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

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 67aa68b501a9dac54bf078258fce88445abd6e0b..2d867ee25061b3733844eedfffd78da0421ebfd5 100644 (file)
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
+lib_dirs=/lib/security /lib/*/security
 pam_dir=/etc/pam.d
-ignore=README
 mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so
-lib_dirs=/lib/security /lib/*/security
+ignore=README

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/webmin/servers/config b/webmin/servers/config
index 0fa6741540ebef88a69ba527d463dfb0cc100e35..871dc8bcf54f4dd240ee7cb2ab76bb2f336b2071 100644 (file)
--- a/webmin/servers/config
+++ b/webmin/servers/config
@@ -1,11 +1,11 @@
-scan_time=5
-deffast=2
-show_ip=0
-show_status=1
 deflink=0
-capath=/usr/share/ca-certificates
-sort_mode=0
-display_mode=0
-max_servers=100
 resolve=1
+display_mode=0
+capath=/usr/share/ca-certificates
 groups_dir=/etc/cluster/groups
+max_servers=100
+scan_time=5
+show_ip=0
+deffast=2
+sort_mode=0
+show_status=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 c7f719b0ec436042cff763b2256c52eb8c482d70..e40988a1d72fc9b3693ec1b89e63e75dd5f06d66 100644 (file)
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
-macros=/usr/share/shorewall
 display_zone_descriptions=1
+shorewall=shorewall
 actions=/etc/shorewall/actions /usr/share/shorewall/actions.std
+macros=/usr/share/shorewall
 config_dir=/etc/shorewall
-shorewall=shorewall

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

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

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

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

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

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

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

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

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

diff --git a/webmin/system-status/config b/webmin/system-status/config
index b6a7e4155594fba9d042e3e77f367757be828a52..c627a9fec943a9bb9cf121b1f02e78452fb485a9 100644 (file)
--- a/webmin/system-status/config
+++ b/webmin/system-status/config
@@ -1,2 +1,2 @@
-collect_interval=5
 collect_pkgs=1
+collect_interval=5

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

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

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

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

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

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

diff --git a/webmin/version b/webmin/version
index 01738d629132033637c0ab26a6007a59a9259d84..9306af7c5568742ae6e840f7a768c3ed62cd76af 100644 (file)
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.980
+1.981

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

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

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

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