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

Package changes:
-dovecot-core 1:2.3.7.2-1ubuntu3.5 amd64
-dovecot-imapd 1:2.3.7.2-1ubuntu3.5 amd64
-dovecot-lmtpd 1:2.3.7.2-1ubuntu3.5 amd64
-dovecot-managesieved 1:2.3.7.2-1ubuntu3.5 amd64
-dovecot-mysql 1:2.3.7.2-1ubuntu3.5 amd64
-dovecot-sieve 1:2.3.7.2-1ubuntu3.5 amd64
+dovecot-core 1:2.3.7.2-1ubuntu3.6 amd64
+dovecot-imapd 1:2.3.7.2-1ubuntu3.6 amd64
+dovecot-lmtpd 1:2.3.7.2-1ubuntu3.6 amd64
+dovecot-managesieved 1:2.3.7.2-1ubuntu3.6 amd64
+dovecot-mysql 1:2.3.7.2-1ubuntu3.6 amd64
+dovecot-sieve 1:2.3.7.2-1ubuntu3.6 amd64
-git 1:2.25.1-1ubuntu3.4 amd64
-git-man 1:2.25.1-1ubuntu3.4 all
+git 1:2.25.1-1ubuntu3.5 amd64
+git-man 1:2.25.1-1ubuntu3.5 all
-linux-firmware 1.187.31 all
+linux-firmware 1.187.32 all
-linux-libc-dev 5.4.0-121.137 amd64
+linux-libc-dev 5.4.0-122.138 amd64
-webmin 1.996 all
+webmin 1.997 all

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/webmin/exim/config b/webmin/exim/config
index b262972685274dd64d5f6869d65974c5c30a7c4b..ebff2bb1354b3c6fccf4d746341cc1398c3a341b 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_dir=/etc/exim4
+exim_aliasfileext=
 exim_addrfile=/etc/exim4/email-addresses
-exim_virt_dir=/etc/exim4/aliases
-exim_mail_file=Maildir
+exim_dbmfile=/etc/exim4/local_domains
 mail_system=1
-exim_aliasfileext=
 exim_dbmext=.dbm
-exim_dbmfile=/etc/exim4/local_domains

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

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

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

diff --git a/webmin/filter/config b/webmin/filter/config
index c51b837760302274b87e6bf028ce344c122ed85f..654f27f480a97b9181484dda73839084a1b3ec6a 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
 virtualmin_config=/etc/webmin/virtual-server
 virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl
 warn_procmail=1
-forward_procmail=0
 reply_force=0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/webmin/logviewer/config b/webmin/logviewer/config
index 87bc80f4f4e6cdd202756703e916be36351ac473..010c568456d19fc64b4f01b012a0672d856ae014 100644 (file)
--- a/webmin/logviewer/config
+++ b/webmin/logviewer/config
@@ -1,3 +1,3 @@
+others=1
 reverse=1
 lines=100
-others=1

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

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

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

diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index 70ec9e25cea6747d6121f583d57b89f45b84458f..39a35a2d0e120a9a91d6d6a0458ab4fc742b8c8a 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.996
+server=MiniServ/1.997

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

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

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

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 6dd3e9498be683ab8ad027fb0a167d57ade08aa3..a85e2240754c39e8f56327990779ffe4764c8deb 100644 (file)
--- a/webmin/nis/config
+++ b/webmin/nis/config
@@ -1,5 +1,5 @@
 manual_build=0
-max_size=100
 nsswitch_conf=/etc/nsswitch.conf
-client_conf=/etc/yp.conf
 securenets=/etc/ypserv.securenets
+max_size=100
+client_conf=/etc/yp.conf

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

diff --git a/webmin/pam/config b/webmin/pam/config
index 2d867ee25061b3733844eedfffd78da0421ebfd5..5b3bccb05d608e6e71c13a47d68bc3d5a18cccc9 100644 (file)
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
+ignore=README
 lib_dirs=/lib/security /lib/*/security
 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

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

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

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

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

diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config
index e9a9bd08cdbcf64359beba1d480ad98362cce2c8..d16208a8fac38cce1aacbffbe1929a7d892d4615 100644 (file)
--- a/webmin/pptp-client/config
+++ b/webmin/pptp-client/config
@@ -1,5 +1,5 @@
-pptp=pptp
-pptp_options=/etc/ppp/options.pptp
 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

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

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

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

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

diff --git a/webmin/quota/config b/webmin/quota/config
index fb384daa24c652f38778749da4be95cc77f00b1a..df49824f0742be77b39d2c24a8f1022c7411809e 100644 (file)
--- a/webmin/quota/config
+++ b/webmin/quota/config
@@ -1,25 +1,25 @@
-user_quotaoff_command=quotaoff -u
-group_quotaoff_command=quotaoff -g
+group_copy_command=edquota -g -p
+user_setquota_command=setquota -u
+user_edquota_command=edquota -u
 display_max=100
-pc_show=1
-show_grace=1
-user_quotaon_command=quotaon -u
+group_repquota_command=repquota -g -v
+user_grace_command=edquota -u -t
+user_quotaoff_command=quotaoff -u
 group_edquota_command=edquota -g
 group_setquota_command=setquota -g
-user_setquota_command=setquota -u
-user_quota_command=quota -v -u
-quotacheck_command=quotacheck -u -g
-sort_mode=0
+user_copy_command=edquota -u -p
 group_quotaon_command=quotaon -g
-user_grace_command=edquota -u -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}.
-group_copy_command=edquota -g -p
-group_repquota_command=repquota -g -v
+group_quotaoff_command=quotaoff -g
+block_mode=1
+show_grace=1
+sort_mode=0
 block_size=1024
-user_repquota_command=repquota -u -v
-group_quota_command=quota -v -g
 group_grace_command=edquota -g -t
-block_mode=1
+pc_show=1
+user_quota_command=quota -v -u
+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}.
 hide_uids=0
-user_edquota_command=edquota -u
-user_copy_command=edquota -u -p
+quotacheck_command=quotacheck -u -g
+group_quota_command=quota -v -g
+user_quotaon_command=quotaon -u
+user_repquota_command=repquota -u -v

diff --git a/webmin/raid/config b/webmin/raid/config
index c4849915b9624a7c9adfff3da495e7ee3187e910..4bd2da90edf6465683e2291abe2c316b200fd9c3 100644 (file)
--- a/webmin/raid/config
+++ b/webmin/raid/config
@@ -1,3 +1,3 @@
 mdstat=/proc/mdstat
-mdadm=/etc/mdadm/mdadm.conf
 raidtab=/etc/raidtab
+mdadm=/etc/mdadm/mdadm.conf

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

diff --git a/webmin/sarg/config b/webmin/sarg/config
index 01e5d4b6ffd300dc2f5dddf09826ed0b6563eed7..5fdc73086767728a74d6f169c16cfde2cda8674f 100644 (file)
--- a/webmin/sarg/config
+++ b/webmin/sarg/config
@@ -1,4 +1,4 @@
+sarg_conf=/etc/sarg/sarg.conf
+naked=0
 clear=1
 sarg=sarg
-naked=0
-sarg_conf=/etc/sarg/sarg.conf

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

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

diff --git a/webmin/shell/config b/webmin/shell/config
index 4b3e40b527944dd61bb7418468b7358c2f9330aa..42aceaa4140370fc5e02793b7dfa951ad543ae7b 100644 (file)
--- a/webmin/shell/config
+++ b/webmin/shell/config
@@ -1,3 +1,3 @@
-max_output=100000
-max_runtime=86400
 clear_envs=0
+max_runtime=86400
+max_output=100000

diff --git a/webmin/shorewall/config b/webmin/shorewall/config
index dc238f69f1422a58b5c1eb786d18c8b47fd1c258..3bb56ada3064838c31d5b1cbc46ab9c6a374c55a 100644 (file)
--- a/webmin/shorewall/config
+++ b/webmin/shorewall/config
@@ -1,5 +1,5 @@
-shorewall=shorewall
-display_zone_descriptions=1
-macros=/usr/share/shorewall
 config_dir=/etc/shorewall
+macros=/usr/share/shorewall
+display_zone_descriptions=1
+shorewall=shorewall
 actions=/etc/shorewall/actions /usr/share/shorewall/actions.std

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

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

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

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

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

diff --git a/webmin/sshd/config b/webmin/sshd/config
index 0cfe4ace863afceb2ee944c4b49cb0f038922610..ba28970ee3e25e7889ba7d6974c7c7d16ec9e303 100644 (file)
--- a/webmin/sshd/config
+++ b/webmin/sshd/config
@@ -1,11 +1,11 @@
-pid_file=/var/run/sshd.pid
-sync_pass=0
 client_config=/etc/ssh/ssh_config
-keygen_path=/usr/bin/ssh-keygen
 sync_create=0
-sync_auth=1
-sshd_path=/usr/sbin/sshd
-stop_cmd=service ssh stop
 start_cmd=service ssh start
-sshd_config=/etc/ssh/sshd_config
+sync_pass=0
 sync_gnupg=0
+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
+sshd_path=/usr/sbin/sshd

diff --git a/webmin/status/config b/webmin/status/config
index 53cac72f9909ebd180a91efffe3add0471aa4157..a1084a84823cb73f9bba2c981516383a6fa4615f 100644 (file)
--- a/webmin/status/config
+++ b/webmin/status/config
@@ -1,14 +1,14 @@
-history_purge=30
-index_status=1
-subject_mode=0
-pinger=linux
-history_show=50
+sysinfo=0
 snmp_version=2
 sysinfo_users=0
-sched_offset=0
-output=0
-snmp_trap=1.3.6.1.4.1.10000.1.1
-sysinfo=0
 pager_cmd=sms_client
+pinger=linux
+output=0
+subject_mode=0
+history_purge=30
+history_show=50
+sched_offset=0
 sort_mode=0
 columns=2
+snmp_trap=1.3.6.1.4.1.10000.1.1
+index_status=1

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

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

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 161d92a01ba8f36d1f1d0c3dff61ca9f2fbc591e..ddc301405565123c9c63a9fc35dffb71db7bd9e6 100644 (file)
--- a/webmin/tcpwrappers/config
+++ b/webmin/tcpwrappers/config
@@ -1,3 +1,3 @@
 hosts_allow=/etc/hosts.allow
-hosts_deny=/etc/hosts.deny
 inetd_services=0
+hosts_deny=/etc/hosts.deny

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

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

diff --git a/webmin/uninstall.sh b/webmin/uninstall.sh
index bf73c12878060955812e401b9e61b943f264fcbf..bd13ed296cf15e55ffe3c2e0e71fee53c012e5c5 100755 (executable)
--- a/webmin/uninstall.sh
+++ b/webmin/uninstall.sh
@@ -5,5 +5,11 @@ printf "\n"
 if [ "$answer" = "y" ]; then
        echo "Removing Webmin package .."
        dpkg --remove --force-depends webmin
+       systemctlcmd=`which systemctl 2>/dev/null`
+       if [ -x "$systemctlcmd" ]; then
+               $systemctlcmd stop webmin >/dev/null 2>&1 </dev/null
+               rm -f /lib/systemd/system/webmin.service
+               $systemctlcmd daemon-reload
+       fi
        echo ".. done"
 fi

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

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

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

diff --git a/webmin/version b/webmin/version
index 1f83d6797cb67865aabea55be0c77de30b20d657..514aab61c0798f3b57378c7ea3827fd9226e5451 100644 (file)
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-1.996
+1.997

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 fd3d0245a42d39f8cc815a8cf5183ff82168059c..50269f5fdb1fac9f1be6e1f6b3492c8d719d5fa2 100644 (file)
--- a/webmin/webalizer/config
+++ b/webmin/webalizer/config
@@ -1,6 +1,6 @@
+naked=0
+skip_old=0
+alt_conf=/etc/webalizer/webalizer.conf.sample
 webalizer=/usr/bin/webalizer
 webalizer_conf=/etc/webalizer/webalizer.conf
 auto=apache,squid,proftpd,wuftpd
-alt_conf=/etc/webalizer/webalizer.conf.sample
-naked=0
-skip_old=0

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

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

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