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

Package changes:
-libmysqlclient21 8.0.29-0ubuntu0.20.04.3 amd64
+libmysqlclient21 8.0.30-0ubuntu0.20.04.2 amd64
-mysql-client-8.0 8.0.29-0ubuntu0.20.04.3 amd64
-mysql-client-core-8.0 8.0.29-0ubuntu0.20.04.3 amd64
+mysql-client-8.0 8.0.30-0ubuntu0.20.04.2 amd64
+mysql-client-core-8.0 8.0.30-0ubuntu0.20.04.2 amd64
-mysql-server 8.0.29-0ubuntu0.20.04.3 all
-mysql-server-8.0 8.0.29-0ubuntu0.20.04.3 amd64
-mysql-server-core-8.0 8.0.29-0ubuntu0.20.04.3 amd64
+mysql-server 8.0.30-0ubuntu0.20.04.2 all
+mysql-server-8.0 8.0.30-0ubuntu0.20.04.2 amd64
+mysql-server-core-8.0 8.0.30-0ubuntu0.20.04.2 amd64
-webmin 1.997 all
+webmin 1.998 all
-wireless-regdb 2021.08.28-0ubuntu1~20.04.1 all
+wireless-regdb 2022.06.06-0ubuntu1~20.04.1 all

diff --git a/mysql/FROZEN b/mysql/FROZEN
new file mode 120000 (symlink)
index 0000000..2bc63ae
--- /dev/null
+++ b/mysql/FROZEN
@@ -0,0 +1 @@
+../../usr/share/doc/mysql-common/frozen-mode/downgrade
\ No newline at end of file

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

diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config
index 210a8d7f536b5eb4e8ebccc5cb7c990f085af53c..a3ddb6067f3d29116a7950d08ee6c7fc15259c65 100644 (file)
--- a/webmin/adsl-client/config
+++ b/webmin/adsl-client/config
@@ -1,7 +1,7 @@
+conf_style=0
 start_cmd=adsl-start
+stop_cmd=adsl-stop
 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
+pppoe_conf=/etc/ppp/pppoe.conf

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

diff --git a/webmin/apache/config b/webmin/apache/config
index b67386ecbcaa256e1346f3a9e7e834505ec1cf68..a12f03854665cb41bb4f5a73ef2d4ff8af54e021 100644 (file)
--- a/webmin/apache/config
+++ b/webmin/apache/config
@@ -1,25 +1,25 @@
-httpd_conf=/etc/apache2/apache2.conf
-test_manual=0
-srm_conf=/etc/apache2/srm.conf
-allow_virtualmin=0
+httpd_dir=/etc/apache2
+test_apachectl=1
+defines_name=APACHE_ARGUMENTS
+httpd_path=/usr/sbin/apache2
+test_always=0
+link_dir=/etc/apache2/sites-enabled
 show_list=0
+virt_file=/etc/apache2/sites-available
+format_config=1
+show_names=0
 show_order=0
-link_dir=/etc/apache2/sites-enabled
 defines_file=/etc/apache2/envvars
-test_config=1
-test_always=0
-format_config=1
+access_conf=/etc/apache2/access.conf
+mime_types=/etc/apache2/mime.types
+test_manual=0
+apply_cmd=/usr/sbin/apache2ctl graceful
+httpd_conf=/etc/apache2/apache2.conf
 max_servers=100
-test_apachectl=1
+allow_virtualmin=0
 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
 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
+test_config=1

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

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

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

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

diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config
index 7108987603199f979f6ed260de27c1006c324e09..505a814779a99459ad945f24213ed65af2f34f8b 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_find_user=1
-table_mode=0
-conf_find_group=1
-conf_allow_sync=1
 conf_allow_refresh=1
 sort_mode=0
+conf_allow_sync=1
 conf_add_group=1
+conf_add_user=1
+conf_host_links=1
+table_mode=0
+conf_find_group=1

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

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

diff --git a/webmin/cron/config b/webmin/cron/config
index b0db247ad2d299a82d8de2300face5d5a2b8c1f8..e82890ddc7653faace50385bf8c606b671b704d1 100644 (file)
--- a/webmin/cron/config
+++ b/webmin/cron/config
@@ -1,26 +1,26 @@
-cronfiles_dir=/etc/cron.d
-kill_subs=0
 hourly_only=0
-show_comment=0
-match_mode=0
+cron_user_edit_command=crontab -e
+init_name=cron
+cron_dir=/var/spool/cron/crontabs
+match_user=1
+kill_subs=0
+run_parts=run-parts
+cron_deny_all=2
 show_time=0
-show_next=0
-cron_deny_file=/var/spool/cron/deny
 cron_edit_command=crontab -u USER -e
+system_crontab=/etc/crontab
+cron_deny_file=/var/spool/cron/deny
+show_comment=0
+cron_delete_command=crontab -u USER -r
+cron_allow_file=/var/spool/cron/allow
+match_mode=0
+show_run=0
+cron_user_get_command=crontab -l
+cronfiles_dir=/etc/cron.d
+cron_user_delete_command=crontab -r
 cron_get_command=crontab -u USER -l
-cron_deny_all=2
-cron_dir=/var/spool/cron/crontabs
-match_user=1
 max_jobs=100
+show_next=0
 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
-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 14aa503819f094a609a42a7fd07ca8aa55ed6148..6d0b22ef3f03fa61792abfa7614955c74f3b1111 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
+columns=2
+params_file=0

diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config
index 3c7684e11c5970dacde9c6cc7f7d510639636e34..09607af7476b4c4993f3bf32270b436af3decad5 100644 (file)
--- a/webmin/dhcpd/config
+++ b/webmin/dhcpd/config
@@ -1,17 +1,17 @@
+dhcpd_conf=/etc/dhcp/dhcpd.conf
+desc_name=0
+dhcpd_nocols=5
+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
+lease_sort=0
+lease_vendor=0
 show_ip=0
-desc_name=0
-lease_tz=0
+show_mac=0
 group_name=0
+restart_cmd=service isc-dhcp-server restart
+lease_tz=0
 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
+interfaces_type=debian

diff --git a/webmin/dovecot/config b/webmin/dovecot/config
index 13921487401c6fd909a1171776227d21af2189cf..c9ec1754c6f6cc00f031b9a234ccac2ca575a320 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
-dovecot_config=/etc/dovecot/dovecot.conf

diff --git a/webmin/exim/config b/webmin/exim/config
index ebff2bb1354b3c6fccf4d746341cc1398c3a341b..87bb91acc7af02af89ea3e268b735200c117dcf4 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_dbmfile=/etc/exim4/local_domains
+exim_virt_dir=/etc/exim4/aliases
 mail_system=1
+exim_dir=/etc/exim4
 exim_dbmext=.dbm
+exim_dbmfile=/etc/exim4/local_domains
+exim_aliasfileext=
+exim_mail_file=Maildir

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

diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config
index 4723263dd0fdc8ccecc54cb56e75944e6ecd43c8..f058ffa00a53740d8401d1e1e8b9042be27ef40f 100644 (file)
--- a/webmin/fetchmail/config
+++ b/webmin/fetchmail/config
@@ -1,6 +1,6 @@
-config_file=
+max_users=400
 fetchmail_path=fetchmail
+config_file=
+view_mode=0
 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 654f27f480a97b9181484dda73839084a1b3ec6a..4532e1d011b3a03148f8839b8e85637341fc41e7 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
+virtualmin_config=/etc/webmin/virtual-server
 reply_force=0
+alias_files=/etc/aliases       /etc/postfix/aliases    /etc/mail/aliases

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

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

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

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

diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config
index 4b6b26b986b5a2fa5f14df926f19f1e093196e7e..c2ced1e151127ab80f5755e95afe5a080d7eb791 100644 (file)
--- a/webmin/heartbeat/config
+++ b/webmin/heartbeat/config
@@ -1,15 +1,15 @@
-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=
+alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys
 haresources=
-alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
 heartbeat=/usr/lib/heartbeat/heartbeat
+pid_file=/var/run/heartbeat.pid
+ha_cf=
+apply_cmd=/etc/init.d/heartbeat reload
+resource_d=
 req_resource_cmd=/usr/lib/heartbeat/req_resource
-stop_cmd=/etc/init.d/heartbeat stop
+alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf
+authkeys=
+alt_haresources=/usr/share/doc/packages/heartbeat/haresources
 start_cmd=/etc/init.d/heartbeat start
-apply_cmd=/etc/init.d/heartbeat reload
+stop_cmd=/etc/init.d/heartbeat stop

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

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

diff --git a/webmin/init/config b/webmin/init/config
index aeaeb5ece1de259cf205cddccfd5162a1081768a..53e75b708c871ed12dd6e91557bec6854313ab55 100644 (file)
--- a/webmin/init/config
+++ b/webmin/init/config
@@ -1,17 +1,17 @@
-boot_levels=2 3 5
-show_opts=0
-sort_mode=0
+order_digits=2
+init_info=1
 no_chkconfig=0
+boot_levels=2 3 5
 shutdown_command=poweroff
-status_check=0
-init_base=/etc/
-order_digits=2
-order=0
 inittab_id=id
-atboot_product=webmin
+sort_mode=0
+init_base=/etc/
 reboot_command=reboot
+expert=0
+init_dir=/etc/init.d
+atboot_product=webmin
+show_opts=0
+order=0
 soft_links=1
 desc=1
-init_info=1
-init_dir=/etc/init.d
-expert=0
+status_check=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 a9405978636209597d1a76eccc946e5db51b5c9a..369f4c62376cd9826b89aa36f28d6bd72a782644 100644 (file)
--- a/webmin/ipfilter/config
+++ b/webmin/ipfilter/config
@@ -1,9 +1,9 @@
-ipnat=ipnat
 view_condition=1
-ipf_conf=/etc/ipf/ipf.conf
-cluster_mode=0
 ipfstat=ipfstat
-cluster_nat=1
 view_comment=0
+cluster_mode=0
+ipnat=ipnat
 ipnat_conf=/etc/ipf/ipnat.conf
 ipf=ipf
+ipf_conf=/etc/ipf/ipf.conf
+cluster_nat=1

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

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

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

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

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

diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config
index ee56348986f530bf4e205c6e4e9c03b4f683401c..1e6e6e376bbc9a35acce71fc348091c531ed7e23 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
+tgtd=tgtd
 config_file=/etc/tgt/targets.conf

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

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

diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config
index 287782793c43f12d079643e43edf4ece56e58ef5..f8307fd92e38bf314d505af38c3e2dfd606a4a80 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
+browse_max=100
 stop_cmd=/etc/init.d/slapd stop
+slapd=slapd
+apply_cmd=/etc/init.d/slapd restart
+attr_count=6
+init_name=slapd
 schema_dir=/etc/ldap/schema
-config_file=/etc/ldap/slapd.d
-browse_max=100
 ldap_user=openldap
-attr_count=6
-slapd=slapd
+config_file=/etc/ldap/slapd.d

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

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

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

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

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

diff --git a/webmin/man/config b/webmin/man/config
index 9b69f30b7908d2f7ec9562a8041011bc5fb523dc..1c6746941590e8b1025fb180ef71d2d9555b05a8 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_sect=man SECTION 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
+man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man
+man2html_path=man2html
+man_cmd=man PAGE
 list_cmd=man -w PAGE
+doc_dir=/usr/share/doc
+list_cmd_sect=man -w SECTION PAGE
+kernel_dir=/usr/src/linux/Documentation

diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index 39a35a2d0e120a9a91d6d6a0458ab4fc742b8c8a..ab09a94be088bf7d58d47f85edca7626fa3c4f8e 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.997
+server=MiniServ/1.998

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

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

diff --git a/webmin/mysql/config b/webmin/mysql/config
index 5d26db7720151d1a5ce795a289a03175efb5258a..47018d07f6dd8c512fcf6462ca5fa417512f0077 100644 (file)
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -1,23 +1,23 @@
-nopwd=0
-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
+max_text=1000
 mysql=/usr/bin/mysql
-mysqlimport=/usr/bin/mysqlimport
-mysqladmin=/usr/bin/mysqladmin
 start_cmd=service mysql start
+nodbi=0
+mysqldump=/usr/bin/mysqldump
+mysqlimport=/usr/bin/mysqlimport
 stop_cmd=service mysql stop
-login=root
-max_text=1000
-webmin_subs=0
 style=0
-nodbi=0
+webmin_subs=0
+max_dbs=50
 date_subs=0
-mysql_libs=/usr/local/mysql/lib
-perpage=25
+nopwd=0
+login=root
+mysql_data=/var/lib/mysql
 blob_mode=0
+perpage=25
+mysql_libs=/usr/local/mysql/lib
+access=*: *
+add_mode=1
+mysqladmin=/usr/bin/mysqladmin
+passwd_mode=0
 mysqlshow=/usr/bin/mysqlshow

diff --git a/webmin/mysql/version b/webmin/mysql/version
index ac7194a35b37e9a2360eb914f586dfe5acf53668..b0c7c5ea65e3050d8c906e908d7848db1c1d360f 100644 (file)
--- a/webmin/mysql/version
+++ b/webmin/mysql/version
@@ -1 +1 @@
-8.0.29-0ubuntu0
+8.0.30-0ubuntu0

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 a85e2240754c39e8f56327990779ffe4764c8deb..f54cb27fec82df78de9c6de88bf500bc4411a9b1 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
+manual_build=0
 securenets=/etc/ypserv.securenets
-max_size=100
 client_conf=/etc/yp.conf

diff --git a/webmin/openslp/config b/webmin/openslp/config
index 4d5dd5a1cd8397eefc0d971842efec8bb7058405..1137c38c455b5ea5eec099e5e36042df2bb56be6 100644 (file)
--- a/webmin/openslp/config
+++ b/webmin/openslp/config
@@ -1,5 +1,5 @@
+slpd_reg=/etc/slp.reg
+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/package-updates/config b/webmin/package-updates/config
index 195d872e7272f7216056aa344a080b36cb709aad..226c127d1632e46e5caeb7b0b55aff051b351642 100644 (file)
--- a/webmin/package-updates/config
+++ b/webmin/package-updates/config
@@ -1,2 +1,2 @@
-update_multiple=1
 cache_time=6
+update_multiple=1

diff --git a/webmin/pam/config b/webmin/pam/config
index 5b3bccb05d608e6e71c13a47d68bc3d5a18cccc9..ab5e75c7bbdb518770274eb28924888e89aaa955 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
+pam_dir=/etc/pam.d
+lib_dirs=/lib/security /lib/*/security

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

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

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

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

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

diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config
index 199803fe4745fb61ab0a6180a25e9e8c5a8efbd7..00d46e17f48a91face2c7105c5101c5ee8ca6f83 100644 (file)
--- a/webmin/pptp-server/config
+++ b/webmin/pptp-server/config
@@ -1,9 +1,9 @@
+start_cmd=/etc/init.d/pptpd start
 stop_cmd=/etc/init.d/pptpd stop
-pap_file=/etc/ppp/chap-secrets
+ppp_options=/etc/ppp/options
+pptp_ppp_options=/etc/ppp/pptpd-options
 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
+pid_file=/var/run/pptpd.pid
+pap_file=/etc/ppp/chap-secrets

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

diff --git a/webmin/proftpd/config b/webmin/proftpd/config
index 79af00bc8f8ff754be7f1de5ae24e6c951094ff3..3d9e409d54f5f1cded1a04110ebb2797b8320f2c 100644 (file)
--- a/webmin/proftpd/config
+++ b/webmin/proftpd/config
@@ -1,9 +1,9 @@
-test_manual=0
+pid_file=/var/run/proftpd.pid
+proftpd_path=/usr/sbin/proftpd
 test_config=1
-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
+test_manual=0
+start_cmd=/etc/init.d/proftpd start
+test_always=0
 ftpusers=/etc/ftpusers
+stop_cmd=/etc/init.d/proftpd stop

diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config
index 92d3fb7360054b299e43c7d150c57c4ded5abb50..219c5c96892c12a218057c7aa3e6bdc22acf3199 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_dir_qmail=Maildir
+mail_file=Mailbox
 mail_system=1
 delete_warn=1
+max_records=200
+index_min=1000000
 mail_dir=
-mail_file=Mailbox
-fwd_mode=0
-columns=2
-sort_mode=0
-mail_dir_qmail=Maildir
 mailq_count=0
+qmail_dir=/var/qmail
+columns=2
 perpage=20
+sort_mode=0
+fwd_mode=0
 mailq_sort=0

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

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

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

diff --git a/webmin/sarg/config b/webmin/sarg/config
index 5fdc73086767728a74d6f169c16cfde2cda8674f..0b89616c5009fb936fb37bb4339cc8b59b3497d5 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_conf=/etc/sarg/sarg.conf
 sarg=sarg

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

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

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

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

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

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

diff --git a/webmin/spam/config b/webmin/spam/config
index 91522d5c2c88a9bc9a5a0b419479e076a3f68849..8079f184bf1795cb8566376ccf7e17b99e0cbd20 100644 (file)
--- a/webmin/spam/config
+++ b/webmin/spam/config
@@ -1,12 +1,12 @@
-procmail_cmd=*
-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
+warn_procmail=1
+spamassassin=spamassassin
+restart_cmd=/etc/init.d/spamassassin restart
+sa_learn=sa-learn
+procmailrc=/etc/procmailrc
+max_awl=200
 call_spam=1
 mode=0
-spamassassin=spamassassin
-warn_procmail=1
+procmail_cmd=*
 addto=0

diff --git a/webmin/squid/config b/webmin/squid/config
index 702f2cb80263676170e94a47e6ae5d8f040f83b4..b3b8ccc35b835762250a4dca513da024d15c5bf9 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_start=service squid start
 squid_conf=/etc/squid/squid.conf
+sync_modify=1
+squid_path=squid
+log_dir=/var/log/squid
 cal_fmt=w
-cal_args=-aw
-squidclient=squidclient
-crypt_conf=0
-cal_max=50000
 cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi
-squid_start=service squid start
-calamaris=calamaris
 cal_all=1
+cache_dir=/var/spool/squid
+pid_file=/var/run/squid.pid
 sync_create=0
-squid_path=squid
-log_dir=/var/log/squid
+calamaris=calamaris
+crypt_conf=0
+cal_max=50000
+cal_args=-aw
+sort_conf=0
+squidclient=squidclient
+squid_stop=service squid stop
+sync_delete=0
+restart_pos=0

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

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

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

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

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

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

diff --git a/webmin/uninstall.sh b/webmin/uninstall.sh
index bd13ed296cf15e55ffe3c2e0e71fee53c012e5c5..06360b6da72fa558481b5347b5dee29406f71f66 100755 (executable)
--- a/webmin/uninstall.sh
+++ b/webmin/uninstall.sh
@@ -4,6 +4,7 @@ read answer
 printf "\n"
 if [ "$answer" = "y" ]; then
        echo "Removing Webmin package .."
+       rm -f /usr/share/webmin/authentic-theme/manifest-*
        dpkg --remove --force-depends webmin
        systemctlcmd=`which systemctl 2>/dev/null`
        if [ -x "$systemctlcmd" ]; then

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

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

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

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

diff --git a/webmin/webalizer/config b/webmin/webalizer/config
index 50269f5fdb1fac9f1be6e1f6b3492c8d719d5fa2..3e7436799ae8a041a5edb53c8425eca6018c0d4f 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
+webalizer=/usr/bin/webalizer
 auto=apache,squid,proftpd,wuftpd
+skip_old=0
+naked=0
+alt_conf=/etc/webalizer/webalizer.conf.sample

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

diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config
index c8105e84f81d4064dfdd7fd5c7dc5ced62c120ec..28ec100e623fcd65b98958678cec96d71925b7ee 100644 (file)
--- a/webmin/wuftpd/config
+++ b/webmin/wuftpd/config
@@ -1,8 +1,8 @@
-ftpconversions=/etc/wu-ftpd/ftpconversions
+ftphosts=/etc/wu-ftpd/ftphosts
+ftpgroups=/etc/wu-ftpd/ftpgroups
+ftpusers=/etc/wu-ftpd/ftpusers
 ftpd_path=/usr/sbin/wu-ftpd
 pid_file=/var/run/ftpd.pids-all
-ftpusers=/etc/wu-ftpd/ftpusers
-ftphosts=/etc/wu-ftpd/ftphosts
+ftpconversions=/etc/wu-ftpd/ftpconversions
 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 ba0584d156107531c185904253046494593503fd..14054cfe79d5218e04cf9f3dc67cb4af946a4b6e 100644 (file)
--- a/webmin/xinetd/config
+++ b/webmin/xinetd/config
@@ -1,5 +1,5 @@
+start_cmd=/etc/init.d/xinetd start
 protocols_file=/etc/protocols
+lookup_servs=1
 pid_file=/var/run/xinetd.pid
 xinetd_conf=/etc/xinetd.conf
-lookup_servs=1
-start_cmd=/etc/init.d/xinetd start