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

Package changes:
-bind9 1:9.16.1-0ubuntu2.2 amd64
-bind9-dnsutils 1:9.16.1-0ubuntu2.2 amd64
-bind9-host 1:9.16.1-0ubuntu2.2 amd64
-bind9-libs 1:9.16.1-0ubuntu2.2 amd64
-bind9-utils 1:9.16.1-0ubuntu2.2 amd64
+bind9 1:9.16.1-0ubuntu2.3 amd64
+bind9-dnsutils 1:9.16.1-0ubuntu2.3 amd64
+bind9-host 1:9.16.1-0ubuntu2.3 amd64
+bind9-libs 1:9.16.1-0ubuntu2.3 amd64
+bind9-utils 1:9.16.1-0ubuntu2.3 amd64
-dnsutils 1:9.16.1-0ubuntu2.2 all
+dnsutils 1:9.16.1-0ubuntu2.3 all
-webmin 1.954 all
+webmin 1.955 all

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

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

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

diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info
index 6f24290e2d77b86422012ca31c568d9320463ca1..973f72c8941b2ada28458e904c12973cfd8c9122 100644 (file)
--- a/webmin/apache/httpd-info
+++ b/webmin/apache/httpd-info
@@ -1,4 +1,4 @@
-time=1587659947
+time=1597062733
 cmd=/usr/sbin/apache2
 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
-version=2.443
+version=2.446

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 9aacce74f86ba857f909e5af1c940dc0824c5df7..e732b1163ef6188304368b6cbc202d9713b637a0 100644 (file)
--- a/webmin/bacula-backup/config
+++ b/webmin/bacula-backup/config
@@ -1,12 +1,12 @@
+showdirs=0
 bls=bls
 pass=
-db=bacula
-wait=1
-bextract=bextract
-init_start=0
-bacula_dir=/etc/bacula
 driver=Pg
-showdirs=0
+bacula_dir=/etc/bacula
+init_start=0
+apply=1
+db=bacula
 btape=btape
 user=bacula
-apply=1
+wait=1
+bextract=bextract

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

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

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

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

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

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

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

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

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

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

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

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

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 3733143b5a615a8c83b193f6249ea0af32f7b90f..424dbf2b0d5fc21e07e5e8578f38119f85aa25e9 100644 (file)
--- a/webmin/fail2ban/config
+++ b/webmin/fail2ban/config
@@ -1,4 +1,4 @@
 config_dir=/etc/fail2ban
+server_cmd=/usr/bin/fail2ban-server
 init_script=fail2ban
 client_cmd=/usr/bin/fail2ban-client
-server_cmd=/usr/bin/fail2ban-server

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

diff --git a/webmin/filter/config b/webmin/filter/config
index dedf35ce173f9e334744263f5c3f31a7b6f3d525..85010a1caafea55d47109492ef36cb7569705699 100644 (file)
--- a/webmin/filter/config
+++ b/webmin/filter/config
@@ -1,6 +1,6 @@
-reply_force=0
-warn_procmail=1
+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
-forward_procmail=0
+virtualmin_config=/etc/webmin/virtual-server
+reply_force=0
+warn_procmail=1

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

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

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

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

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

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

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

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

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

diff --git a/webmin/inittab/config b/webmin/inittab/config
index 31db3e7b12dd3f7b98454b47d9f60a32ecb9275c..c2b25728b1fcde239638523ffc5b34f97bc5b66e 100644 (file)
--- a/webmin/inittab/config
+++ b/webmin/inittab/config
@@ -1,2 +1,2 @@
-inittab_file=/etc/inittab
 telinit=telinit
+inittab_file=/etc/inittab

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

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

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

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

diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config
index e61268735e26a560be2e96676ae3944f159db4ca..29510081ca0cc660fcb36ffef88f8a1f12e4d8f6 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
 iscsi_server=/usr/sbin/iscsi-target
+pid_file=/var/run/iscsi-target.pid
 targets_file=/etc/iscsi/targets
 auths_file=/etc/iscsi/auths
+opts_file=/etc/sysconfig/netbsd-iscsi
+init_name=netbsd-iscsi

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

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

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

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

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

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

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

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

diff --git a/webmin/lvm/config b/webmin/lvm/config
index a5ef0ed4d8556694c1e0d55dee27c447acdd67fc..63b743f6126d3e42ce3d804a9ca23ee656a978c3 100644 (file)
--- a/webmin/lvm/config
+++ b/webmin/lvm/config
@@ -1,2 +1,2 @@
-show_table=0
 lvm_conf=/etc/lvm/lvm.conf
+show_table=0

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

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

diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index f916b3537583db04583ff4fed9a6db38a648f20d..4d70615d9d086bb1ed50d09c7dba1c3bc932370f 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.954
+server=MiniServ/1.955

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

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

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

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

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

diff --git a/webmin/pam/config b/webmin/pam/config
index 02a4dd5938611e71e8c877e2f869769115b1998b..a434b0919b9c6b6c6fbb02d0d2f228e39c5b4467 100644 (file)
--- a/webmin/pam/config
+++ b/webmin/pam/config
@@ -1,4 +1,4 @@
 pam_dir=/etc/pam.d
-mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so
-lib_dirs=/lib/security /lib/*/security
 ignore=README
+lib_dirs=/lib/security /lib/*/security
+mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/webmin/shell/config b/webmin/shell/config
index ae2fea776c34d2b46ae4d1c5b909378db2739860..044e158ce7275da152f8c1d257357e6a87fedd07 100644 (file)
--- a/webmin/shell/config
+++ b/webmin/shell/config
@@ -1,3 +1,3 @@
-max_runtime=86400
-max_output=100000
 clear_envs=0
+max_output=100000
+max_runtime=86400

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/webmin/time/config b/webmin/time/config
index 129e4c6e544261e4554e48647c7ddddeeb5c0abe..79b40be2b1cf9bd0c5b2eb805382e204d592604b 100644 (file)
--- a/webmin/time/config
+++ b/webmin/time/config
@@ -1,5 +1,5 @@
 timeserver_hardware=1
 seconds=1
+ntp_only=1
 lease=5
 zone_style=linux
-ntp_only=1

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

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

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

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

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

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

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