From d493c979e096e11cb58b24fe3f784069eb967aaf Mon Sep 17 00:00:00 2001 From: mhoellein Date: Wed, 1 Jun 2022 13:49:55 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -dpkg 1.19.7ubuntu3 amd64 -dpkg-dev 1.19.7ubuntu3 all +dpkg 1.19.7ubuntu3.2 amd64 +dpkg-dev 1.19.7ubuntu3.2 all -kmod 27-1ubuntu2 amd64 +kmod 27-1ubuntu2.1 amd64 -libcups2 2.3.1-9ubuntu1.1 amd64 +libcups2 2.3.1-9ubuntu1.2 amd64 -libdpkg-perl 1.19.7ubuntu3 all +libdpkg-perl 1.19.7ubuntu3.2 all -libkmod2 27-1ubuntu2 amd64 +libkmod2 27-1ubuntu2.1 amd64 -libpq5 12.10-0ubuntu0.20.04.1 amd64 +libpq5 12.11-0ubuntu0.20.04.1 amd64 -linux-libc-dev 5.4.0-110.124 amd64 +linux-libc-dev 5.4.0-113.127 amd64 -webmin 1.991 all +webmin 1.994 all --- .etckeeper | 8 +- init.d/webmin | 82 ------------------- letsencrypt/.certbot.lock | 0 .../multi-user.target.wants/webmin.service | 1 + webmin/.reload-init | 4 + webmin/.restart-by-force-kill-init | 3 + webmin/.restart-init | 3 + webmin/.start-init | 10 +++ webmin/.stop-init | 21 +++++ webmin/acl/config | 2 +- webmin/adsl-client/config | 6 +- webmin/ajaxterm/config | 2 +- webmin/apache/config | 36 ++++---- webmin/apache/httpd-info | 2 +- webmin/at/config | 2 +- webmin/backup-config/config | 2 +- webmin/bacula-backup/config | 14 ++-- webmin/bind8/config | 66 +++++++-------- webmin/cluster-passwd/config | 4 +- webmin/cluster-useradmin/config | 10 +-- webmin/cluster-webmin/config | 2 +- webmin/config | 48 +++++------ webmin/cpan/config | 6 +- webmin/cron/config | 38 ++++----- webmin/custom/config | 2 +- webmin/dhcpd/config | 24 +++--- webmin/dovecot/config | 4 +- webmin/exim/config | 8 +- webmin/fail2ban/config | 4 +- webmin/fetchmail/config | 8 +- webmin/filter/config | 4 +- webmin/firewall/config | 4 +- webmin/firewall6/config | 6 +- webmin/fsdump/config | 6 +- webmin/grub/config | 2 +- webmin/heartbeat/config | 18 ++-- webmin/htaccess-htpasswd/config | 4 +- webmin/idmapd/config | 2 +- webmin/inetd/config | 20 ++--- webmin/init/config | 20 ++--- webmin/inittab/config | 2 +- webmin/ipfilter/config | 8 +- webmin/ipfw/config | 6 +- webmin/ipsec/config | 8 +- webmin/iscsi-client/config | 4 +- webmin/iscsi-server/config | 6 +- webmin/iscsi-target/config | 10 +-- webmin/iscsi-tgtd/config | 4 +- webmin/jabber/config | 6 +- webmin/ldap-client/config | 4 +- webmin/ldap-server/config | 12 +-- webmin/ldap-useradmin/config | 32 ++++---- webmin/logrotate/config | 4 +- webmin/lpadmin/config | 22 ++--- webmin/mailboxes/config | 80 +++++++++--------- webmin/man/config | 8 +- webmin/miniserv.conf | 2 +- webmin/mon/config | 8 +- webmin/mount/config | 12 +-- webmin/mysql/config | 26 +++--- webmin/mysql/version | 2 +- webmin/nis/config | 2 +- webmin/openslp/config | 6 +- webmin/package-updates/config | 2 +- webmin/pam/config | 2 +- webmin/pap/config | 4 +- webmin/passwd/config | 2 +- webmin/postfix/config | 38 ++++----- webmin/postgresql/config | 26 +++--- webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 4 +- webmin/pptp-server/config | 8 +- webmin/proc/config | 4 +- webmin/proftpd/config | 12 +-- webmin/qmailadmin/config | 16 ++-- webmin/quota/config | 34 ++++---- webmin/reload | 4 +- webmin/restart | 2 +- webmin/restart-by-force-kill | 4 + webmin/samba/config | 24 +++--- webmin/sarg/config | 4 +- webmin/sendmail/config | 44 +++++----- webmin/servers/config | 14 ++-- webmin/shell/config | 2 +- webmin/shorewall/config | 6 +- webmin/shorewall6/config | 4 +- webmin/smart-status/config | 2 +- webmin/software/config | 2 +- webmin/spam/config | 16 ++-- webmin/squid/config | 32 ++++---- webmin/sshd/config | 14 ++-- webmin/start | 11 +-- webmin/status/config | 18 ++-- webmin/stop | 15 +--- webmin/syslog-ng/config | 6 +- webmin/syslog/config | 26 +++--- webmin/system-status/config | 2 +- webmin/tcpwrappers/config | 2 +- webmin/telnet/config | 4 +- webmin/time/config | 4 +- webmin/uninstall.sh | 4 +- webmin/updown/config | 2 +- webmin/useradmin/config | 62 +++++++------- webmin/usermin/config | 4 +- webmin/version | 2 +- webmin/vgetty/config | 2 +- webmin/webalizer/config | 8 +- webmin/webmin/config | 14 ++-- webmin/wuftpd/config | 10 +-- webmin/xinetd/config | 2 +- 110 files changed, 627 insertions(+), 681 deletions(-) delete mode 100755 init.d/webmin create mode 100644 letsencrypt/.certbot.lock create mode 120000 systemd/system/multi-user.target.wants/webmin.service create mode 100755 webmin/.reload-init create mode 100755 webmin/.restart-by-force-kill-init create mode 100755 webmin/.restart-init create mode 100755 webmin/.start-init create mode 100755 webmin/.stop-init create mode 100755 webmin/restart-by-force-kill diff --git a/.etckeeper b/.etckeeper index 42f38aa20..f37e69e22 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1548,7 +1548,6 @@ maybe chmod 0755 'init.d/sysstat' maybe chmod 0755 'init.d/udev' maybe chmod 0755 'init.d/ufw' maybe chmod 0755 'init.d/uuidd' -maybe chmod 0755 'init.d/webmin' maybe chmod 0755 'init.d/x11-common' maybe chmod 0644 'init/mysql.conf' maybe chmod 0755 'initramfs-tools' @@ -1624,6 +1623,7 @@ maybe chmod 0755 'ldap/schema' maybe chmod 0644 'ldap/schema/amavis.schema' maybe chmod 0644 'legal' maybe chmod 0755 'letsencrypt' +maybe chmod 0600 'letsencrypt/.certbot.lock' maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt' maybe chmod 0700 'letsencrypt/accounts' maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org' @@ -10849,6 +10849,11 @@ maybe chmod 0755 'w3m' maybe chmod 0644 'w3m/config' maybe chmod 0644 'w3m/mailcap' maybe chmod 0755 'webmin' +maybe chmod 0755 'webmin/.reload-init' +maybe chmod 0755 'webmin/.restart-by-force-kill-init' +maybe chmod 0755 'webmin/.restart-init' +maybe chmod 0755 'webmin/.start-init' +maybe chmod 0755 'webmin/.stop-init' maybe chgrp 'bin' 'webmin/acl' maybe chmod 0711 'webmin/acl' maybe chgrp 'bin' 'webmin/acl/config' @@ -11208,6 +11213,7 @@ maybe chgrp 'bin' 'webmin/raid/config' maybe chmod 0600 'webmin/raid/config' maybe chmod 0755 'webmin/reload' maybe chmod 0755 'webmin/restart' +maybe chmod 0755 'webmin/restart-by-force-kill' maybe chgrp 'bin' 'webmin/samba' maybe chmod 0711 'webmin/samba' maybe chgrp 'bin' 'webmin/samba/config' diff --git a/init.d/webmin b/init.d/webmin deleted file mode 100755 index cdb64699e..000000000 --- a/init.d/webmin +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# chkconfig: 235 99 10 -# description: web-based administration interface for Unix systems -# -### BEGIN INIT INFO -# Provides: webmin -# Required-Start: $local_fs $network $syslog -# Required-Stop: $local_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: web-based administration interface for Unix systems -# Description: Webmin is a web-based interface for system administration -# for Unix. Using Webmin you can configure DNS, Samba, NFS, -# local/remote filesystems and more using your web browser. -### END INIT INFO - -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="web-based administration interface for Unix systems" -NAME=Webmin -PIDFILE=/var/webmin/miniserv.pid -SCRIPTNAME=/etc/init.d/$NAME -START=/etc/webmin/start -STOP=/etc/webmin/stop -RELOAD=/etc/webmin/reload -LOCKFILE=/var/lock/subsys/webmin -CONFFILE=/etc/webmin/miniserv.conf - -case "$1" in -start) - $START >/dev/null 2>&1 /dev/null 2>&1 - fi - ;; -stop) - $STOP - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - rm -f $LOCKFILE - pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'` - if [ "$pidfile" = "" ]; then - pidfile=$PIDFILE - fi - rm -f $pidfile - fi - ;; -status) - pidfile=`grep "^pidfile=" $CONFFILE | sed -e 's/pidfile=//g'` - if [ "$pidfile" = "" ]; then - pidfile=$PIDFILE - fi - if [ -s $pidfile ]; then - pid=`cat $pidfile` - kill -0 $pid >/dev/null 2>&1 - if [ "$?" = "0" ]; then - echo "$NAME (pid $pid) is running" - RETVAL=0 - else - echo "$NAME is stopped" - RETVAL=1 - fi - else - echo "$NAME is stopped" - RETVAL=1 - fi - ;; -restart) - $STOP ; $START - RETVAL=$? - ;; -reload|force-reload) - $RELOAD - RETVAL=$? - ;; -*) - echo "Usage: $0 {start|stop|restart|reload|force-reload|status}" >&2 - RETVAL=1 - ;; -esac -exit $RETVAL - diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock new file mode 100644 index 000000000..e69de29bb diff --git a/systemd/system/multi-user.target.wants/webmin.service b/systemd/system/multi-user.target.wants/webmin.service new file mode 120000 index 000000000..06d82b520 --- /dev/null +++ b/systemd/system/multi-user.target.wants/webmin.service @@ -0,0 +1 @@ +/lib/systemd/system/webmin.service \ No newline at end of file diff --git a/webmin/.reload-init b/webmin/.reload-init new file mode 100755 index 000000000..70b36fdf0 --- /dev/null +++ b/webmin/.reload-init @@ -0,0 +1,4 @@ +#!/bin/sh +echo Reloading Webmin server in /usr/share/webmin +pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'` +kill -USR1 `cat $pidfile` diff --git a/webmin/.restart-by-force-kill-init b/webmin/.restart-by-force-kill-init new file mode 100755 index 000000000..0364d5d75 --- /dev/null +++ b/webmin/.restart-by-force-kill-init @@ -0,0 +1,3 @@ +#!/bin/sh +/etc/webmin/.stop-init --kill +/etc/webmin/.start-init diff --git a/webmin/.restart-init b/webmin/.restart-init new file mode 100755 index 000000000..737bb84af --- /dev/null +++ b/webmin/.restart-init @@ -0,0 +1,3 @@ +#!/bin/sh +/etc/webmin/.stop-init +/etc/webmin/.start-init diff --git a/webmin/.start-init b/webmin/.start-init new file mode 100755 index 000000000..e401b59a8 --- /dev/null +++ b/webmin/.start-init @@ -0,0 +1,10 @@ +#!/bin/sh +echo Starting Webmin server in /usr/share/webmin +trap '' 1 +LANG= +export LANG +unset PERLIO +export PERLIO +PERLLIB=/usr/share/webmin +export PERLLIB +exec '/usr/share/webmin/miniserv.pl' $* /etc/webmin/miniserv.conf diff --git a/webmin/.stop-init b/webmin/.stop-init new file mode 100755 index 000000000..8dc90f5b0 --- /dev/null +++ b/webmin/.stop-init @@ -0,0 +1,21 @@ +#!/bin/sh +if [ "$1" = "--kill" ]; then + echo Force stopping Webmin server in /usr/share/webmin +else + echo Stopping Webmin server in /usr/share/webmin +fi +pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'` +pid=`cat $pidfile` 2>/dev/null +if [ "$pid" != "" ]; then + kill $pid || exit 1 + touch /var/webmin/stop-flag + if [ "$1" = "--kill" ]; then + sleep 1 + ((ps axf | grep "webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash) || kill -9 -- -$pid || kill -9 $pid) 2>/dev/null + fi + exit 0 +else + if [ "$1" = "--kill" ]; then + (ps axf | grep "webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash) 2>/dev/null + fi +fi diff --git a/webmin/acl/config b/webmin/acl/config index c572bfa88..ee9b4c16b 100644 --- a/webmin/acl/config +++ b/webmin/acl/config @@ -1,3 +1,3 @@ +display=1 ssleay=/usr/bin/openssl order=0 -display=1 diff --git a/webmin/adsl-client/config b/webmin/adsl-client/config index bb60ddd39..b3cb22c08 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -stop_cmd=adsl-stop pap_file=/etc/ppp/pap-secrets -status_cmd=adsl-status -pppoe_conf=/etc/ppp/pppoe.conf start_cmd=adsl-start +stop_cmd=adsl-stop pppoe_cmd=pppoe +pppoe_conf=/etc/ppp/pppoe.conf conf_style=0 +status_cmd=adsl-status diff --git a/webmin/ajaxterm/config b/webmin/ajaxterm/config index a31edabcb..003ebb11c 100644 --- 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 46b9bc777..2c9fb00c4 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,25 +1,25 @@ -auto_mods=1 -max_servers=100 +httpd_path=/usr/sbin/apache2 +test_apachectl=1 +srm_conf=/etc/apache2/srm.conf +start_cmd=/etc/init.d/apache2 start +test_config=1 +apply_cmd=/usr/sbin/apache2ctl graceful +httpd_dir=/etc/apache2 test_manual=0 -mime_types=/etc/apache2/mime.types +link_dir=/etc/apache2/sites-enabled apachectl_path=/usr/sbin/apache2ctl -show_names=0 -access_conf=/etc/apache2/access.conf -httpd_conf=/etc/apache2/apache2.conf -test_config=1 -start_cmd=/etc/init.d/apache2 start +defines_name=APACHE_ARGUMENTS +allow_virtualmin=0 +show_order=0 defines_file=/etc/apache2/envvars -link_dir=/etc/apache2/sites-enabled -httpd_path=/usr/sbin/apache2 stop_cmd=/etc/init.d/apache2 stop -httpd_dir=/etc/apache2 +show_names=0 +auto_mods=1 test_always=0 -apply_cmd=/usr/sbin/apache2ctl graceful -allow_virtualmin=0 -srm_conf=/etc/apache2/srm.conf virt_file=/etc/apache2/sites-available -format_config=1 -defines_name=APACHE_ARGUMENTS show_list=0 -test_apachectl=1 -show_order=0 +format_config=1 +max_servers=100 +httpd_conf=/etc/apache2/apache2.conf +access_conf=/etc/apache2/access.conf +mime_types=/etc/apache2/mime.types diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index 7c635574c..f048f9875 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,4 +1,4 @@ -time=1647270094 +time=1651146608 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd version=2.453 diff --git a/webmin/at/config b/webmin/at/config index abf2f6455..6f83c111c 100644 --- a/webmin/at/config +++ b/webmin/at/config @@ -1,2 +1,2 @@ -at_dir=/var/spool/cron/atjobs at_style=linux +at_dir=/var/spool/cron/atjobs diff --git a/webmin/backup-config/config b/webmin/backup-config/config index 5d1c57e87..c6694b382 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -date_subs=0 webmin_subs=0 +date_subs=0 apply=1 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index ba603046b..d7b3e601c 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -pass= +bextract=bextract +bls=bls +user=bacula db=bacula -wait=1 -driver=Pg apply=1 +pass= +bacula_dir=/etc/bacula +wait=1 showdirs=0 -bextract=bextract btape=btape init_start=0 -user=bacula -bls=bls -bacula_dir=/etc/bacula +driver=Pg diff --git a/webmin/bind8/config b/webmin/bind8/config index ba7b684ea..9c9d03759 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,46 +1,46 @@ +allow_underscore=1 +ipv6_mode=1 soa_start=0 -no_pid_chroot=0 -rndcconf_cmd=rndc-confgen -rev_def=0 -reversezonefilename_format=ZONE.rev +forwardzonefilename_format=ZONE.hosts +spf_record=0 max_zones=50 -master_ttl=1 -other_slaves=1 largezones=0 -named_path=/usr/sbin/named -by_view=0 -support_aaaa=1 +checkconf=named-checkconf slave_dir=/var/lib/bind -signzone=dnssec-signzone -updserial_on=1 -rndc_conf=/etc/bind/rndc.conf +other_slaves=1 show_list=0 -forwardzonefilename_format=ZONE.hosts -no_chroot=0 +no_pid_chroot=0 +confirm_zone=1 +soa_style=0 +rndc_cmd=rndc +updserial_man=1 +force_random=0 +updserial_on=1 allow_comments=0 -records_order=0 +reversezonefilename_format=ZONE.rev +zones_file=/etc/bind/named.conf.local +rndcconf_cmd=rndc-confgen +master_ttl=1 whois_cmd=whois +support_aaaa=1 +allow_wild=1 updserial_def=0 -named_conf=/etc/bind/named.conf -ipv6_mode=1 -checkzone=named-checkzone -soa_style=0 -updserial_man=1 +no_chroot=0 +confirm_rec=0 dnssec_info=1 -keygen=dnssec-keygen +relative_paths=0 +short_names=0 +rev_def=0 +named_path=/usr/sbin/named pid_file=/var/run/bind/run/named.pid /var/run/named.pid /var/run/named/named.pid /var/run/bind/run/named/named.pid -checkconf=named-checkconf -confirm_rec=0 -allow_wild=1 -allow_underscore=1 -force_random=0 +records_order=0 +rndc_conf=/etc/bind/rndc.conf allow_long=0 -spf_record=0 -rev_must=0 -short_names=0 -rndc_cmd=rndc +by_view=0 +checkzone=named-checkzone +named_conf=/etc/bind/named.conf master_dir=/var/lib/bind +rev_must=0 ndc_cmd=ndc -zones_file=/etc/bind/named.conf.local -relative_paths=0 -confirm_zone=1 +keygen=dnssec-keygen +signzone=dnssec-signzone diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 2ab4c6af1..294c79b71 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ -input_type=0 -sort_mode=0 max_users=200 +sort_mode=0 +input_type=0 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index 721680af9..66823a62b 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -conf_find_user=1 +conf_host_links=1 +conf_allow_sync=1 table_mode=0 -sort_mode=0 conf_add_user=1 -conf_add_group=1 -conf_allow_sync=1 conf_allow_refresh=1 conf_find_group=1 -conf_host_links=1 +conf_add_group=1 +conf_find_user=1 +sort_mode=0 diff --git a/webmin/cluster-webmin/config b/webmin/cluster-webmin/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-webmin/config +++ b/webmin/cluster-webmin/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/config b/webmin/config index 69df8debb..32980bccc 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,32 @@ -md5pass=1 -dateformat=dd/mon/yyyy -showlogin=0 -hostnamemode=0 -passwd_uindex=0 -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -referers_none=1 -help_width= -product=webmin +sysinfo=0 +feedback_to= help_height= -lang=en.UTF-8 +product=webmin passwd_file=/etc/shadow -os_version=9.0 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +passwd_uindex=0 passwd_pindex=1 -feedback_to= -tempdelete_days=7 +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' log=1 -webprefix= -showhost=0 -real_os_type=Ubuntu Linux -passwd_mindex=4 -theme=authentic-theme -real_os_version=18.04.1 +hostnamemode=0 +os_version=9.0 +help_width= +nofeedbackcc=0 lang_root=de.UTF-8 +theme=authentic-theme +tempdelete_days=7 +passwd_cindex=2 hostnamedisplay= +md5pass=1 +passwd_mindex=4 +showhost=0 ld_env=LD_LIBRARY_PATH -passwd_cindex=2 -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -os_type=debian-linux -nofeedbackcc=0 -sysinfo=0 +webprefix= +real_os_type=Ubuntu Linux +dateformat=dd/mon/yyyy +showlogin=0 by_view=0 +lang=en.UTF-8 +real_os_version=18.04.1 +os_type=debian-linux +referers_none=1 diff --git a/webmin/cpan/config b/webmin/cpan/config index 988ef28b5..170970062 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ +incyum=1 +refresh_days=30 +incpackages=1 packages=http://www.cpan.org/modules/02packages.details.txt.gz cpan=http://www.cpan.org/authors/id -incyum=1 save_partial=0 -incpackages=1 -refresh_days=30 diff --git a/webmin/cron/config b/webmin/cron/config index 0cd2bc204..fd8420f9a 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,26 +1,26 @@ -hourly_only=0 -cron_user_delete_command=crontab -r -max_jobs=100 -cron_delete_command=crontab -u USER -r +cron_input=1 +run_parts=run-parts +cron_deny_all=2 kill_subs=0 -match_user=1 +cron_delete_command=crontab -u USER -r cron_edit_command=crontab -u USER -e -system_crontab=/etc/crontab +cron_user_edit_command=crontab -e +vixie_cron=1 +show_next=0 +cron_dir=/var/spool/cron/crontabs +show_run=0 +cron_user_delete_command=crontab -r cron_allow_file=/var/spool/cron/allow -cron_deny_all=2 -cronfiles_dir=/etc/cron.d +show_comment=0 cron_deny_file=/var/spool/cron/deny -init_name=cron +show_time=0 +cronfiles_dir=/etc/cron.d +match_user=1 match_mode=0 -cron_dir=/var/spool/cron/crontabs -cron_user_get_command=crontab -l -show_next=0 -show_run=0 -run_parts=run-parts cron_get_command=crontab -u USER -l -vixie_cron=1 -cron_input=1 -show_time=0 -show_comment=0 +max_jobs=100 +cron_user_get_command=crontab -l +system_crontab=/etc/crontab +hourly_only=0 +init_name=cron max_len=80 -cron_user_edit_command=crontab -e diff --git a/webmin/custom/config b/webmin/custom/config index 6c90eac06..e04c3678d 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -params_cmd=0 params_file=0 display_mode=0 +params_cmd=0 columns=2 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index d04d02cc7..d6d8ec942 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,17 +1,17 @@ -lease_file=/var/lib/dhcp/dhcpd.leases -lease_tz=0 -group_name=0 -restart_cmd=service isc-dhcp-server restart +display_max=100 +show_mac=0 lease_vendor=0 -stop_cmd=service isc-dhcp-server stop interfaces_type=debian -show_ip=0 -dhcpd_conf=/etc/dhcp/dhcpd.conf -show_mac=0 -display_max=100 -dhcpd_path=/usr/sbin/dhcpd +lease_tz=0 lease_sort=0 -dhcpd_nocols=5 -desc_name=0 +lease_file=/var/lib/dhcp/dhcpd.leases +group_name=0 start_cmd=service isc-dhcp-server start +dhcpd_path=/usr/sbin/dhcpd pid_file=/var/run/dhcpd.pid +restart_cmd=service isc-dhcp-server restart +dhcpd_conf=/etc/dhcp/dhcpd.conf +desc_name=0 +show_ip=0 +stop_cmd=service isc-dhcp-server stop +dhcpd_nocols=5 diff --git a/webmin/dovecot/config b/webmin/dovecot/config index c9ec1754c..6d7e53058 100644 --- 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 +pid_file=/var/run/dovecot/master.pid +init_script=dovecot diff --git a/webmin/exim/config b/webmin/exim/config index be8e38671..41602ebc7 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ -exim_dir=/etc/exim4 +exim_dbmfile=/etc/exim4/local_domains exim_mail_file=Maildir -exim_addrfile=/etc/exim4/email-addresses mail_system=1 exim_aliasfileext= -exim_virt_dir=/etc/exim4/aliases -exim_dbmfile=/etc/exim4/local_domains +exim_addrfile=/etc/exim4/email-addresses exim_dbmext=.dbm +exim_virt_dir=/etc/exim4/aliases +exim_dir=/etc/exim4 diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index d058f9824..cae702a7a 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ -server_cmd=/usr/bin/fail2ban-server -config_dir=/etc/fail2ban init_script=fail2ban +config_dir=/etc/fail2ban +server_cmd=/usr/bin/fail2ban-server client_cmd=/usr/bin/fail2ban-client diff --git a/webmin/fetchmail/config b/webmin/fetchmail/config index ea72bf561..c5e814f90 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ -daemon_user=root -max_users=400 -config_file= -fetchmail_path=fetchmail view_mode=0 +config_file= pid_file=/var/run/fetchmail.pid +fetchmail_path=fetchmail +max_users=400 +daemon_user=root diff --git a/webmin/filter/config b/webmin/filter/config index 458717139..946cd37ec 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases -warn_procmail=1 -virtualmin_config=/etc/webmin/virtual-server reply_force=0 +virtualmin_config=/etc/webmin/virtual-server virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl forward_procmail=0 +warn_procmail=1 diff --git a/webmin/firewall/config b/webmin/firewall/config index b7d38d52e..0dadcf4d4 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -view_condition=1 cluster_mode=1 direct=0 comment_mod=0 -view_comment=0 force_init=0 +view_condition=1 +view_comment=0 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index 27a37b449..e2b36c045 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ +force_init=0 +comment_mod=0 +view_comment=0 view_condition=1 direct=0 cluster_mode=1 -view_comment=0 -force_init=0 -comment_mod=0 diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 0293f7bb5..9b29de11d 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ nonewtape=0 -date_subs=0 -error_email=0 webmin_subs=0 simple_sched=0 -always_tar=0 run_mode=0 +always_tar=0 +error_email=0 +date_subs=0 diff --git a/webmin/grub/config b/webmin/grub/config index 98bdc19a6..49d2d2860 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ -grub_path=grub menu_file=/boot/grub/menu.lst +grub_path=grub install=(hd0) diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index ea4034815..8ed741671 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +serials=/dev/ttyS* +haresources= +ha_dir=/etc/ha.d +req_resource_cmd=/usr/lib/heartbeat/req_resource stop_cmd=/etc/init.d/heartbeat stop heartbeat=/usr/lib/heartbeat/heartbeat -haresources= -apply_cmd=/etc/init.d/heartbeat reload +ha_cf= alt_haresources=/usr/share/doc/packages/heartbeat/haresources resource_d= +start_cmd=/etc/init.d/heartbeat start +authkeys= alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf -req_resource_cmd=/usr/lib/heartbeat/req_resource -ha_cf= pid_file=/var/run/heartbeat.pid -authkeys= -start_cmd=/etc/init.d/heartbeat start -serials=/dev/ttyS* -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys -ha_dir=/etc/ha.d +apply_cmd=/etc/init.d/heartbeat reload diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index e9216a188..ac6b6f22e 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,7 +1,7 @@ +sha1=0 +htaccess=.htaccess htgroups=.htgroups extra_directives= -htaccess=.htaccess -sha1=0 md5=1 htpasswd=.htpasswd digest=1 diff --git a/webmin/idmapd/config b/webmin/idmapd/config index 12c48476c..d6cd4227f 100644 --- a/webmin/idmapd/config +++ b/webmin/idmapd/config @@ -1,3 +1,3 @@ +idmapd_conf=/etc/idmapd.conf restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi idmapd_path=/usr/sbin/rpc.idmapd -idmapd_conf=/etc/idmapd.conf diff --git a/webmin/inetd/config b/webmin/inetd/config index 5c0ffe022..b1a8392f9 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -qm_mode=0 -sort_mode=0 -restart_command=killall -HUP inetd -protocols_file=/etc/protocols -deny_file=/etc/hosts.deny -rpc_inetd=1 -extended_inetd=1 ipv6=0 -tcpd_path=/usr/sbin/tcpd rpc_file=/etc/rpc +restart_command=killall -HUP inetd +deny_file=/etc/hosts.deny +show_empty=1 services_file=/etc/services -inetd_conf_file=/etc/inetd.conf allow_file=/etc/hosts.allow +qm_mode=0 display_max=100 +protocols_file=/etc/protocols +sort_mode=0 +rpc_inetd=1 +tcpd_path=/usr/sbin/tcpd +extended_inetd=1 +inetd_conf_file=/etc/inetd.conf rpc_protocols=tcp udp -show_empty=1 diff --git a/webmin/init/config b/webmin/init/config index f2dab9192..5cdd69395 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ reboot_command=reboot +no_chkconfig=0 +soft_links=1 +inittab_id=id +init_base=/etc/ +init_dir=/etc/init.d +show_opts=0 +expert=0 +init_info=1 desc=1 +status_check=0 order_digits=2 -boot_levels=2 3 5 -init_info=1 -init_dir=/etc/init.d -inittab_id=id -soft_links=1 shutdown_command=poweroff sort_mode=0 -init_base=/etc/ +boot_levels=2 3 5 atboot_product=webmin -status_check=0 order=0 -no_chkconfig=0 -expert=0 -show_opts=0 diff --git a/webmin/inittab/config b/webmin/inittab/config index 31db3e7b1..c2b25728b 100644 --- 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 11066b9a5..d0aa8c90f 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ ipf=ipf view_condition=1 +view_comment=0 +ipnat_conf=/etc/ipf/ipnat.conf +cluster_mode=0 ipf_conf=/etc/ipf/ipf.conf +ipnat=ipnat ipfstat=ipfstat cluster_nat=1 -cluster_mode=0 -ipnat_conf=/etc/ipf/ipnat.conf -ipnat=ipnat -view_comment=0 diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 9a86268c9..1fe9c223f 100644 --- a/webmin/ipfw/config +++ b/webmin/ipfw/config @@ -1,6 +1,6 @@ +view_comment=0 +cluster_mode=0 +view_condition=1 view_counters=0 version=2 -view_comment=0 ipfw=/sbin/ipfw -view_condition=1 -cluster_mode=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index cbeaf6602..0b4223b31 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ file=/etc/ipsec.conf -policies_dir=/etc/ipsec.d/policies +restart_cmd=/etc/init.d/ipsec restart ipsec=/usr/sbin/ipsec -start_cmd=/etc/init.d/ipsec start logfile=/var/log/messages -secrets=/etc/ipsec.secrets stop_cmd=/etc/init.d/ipsec stop -restart_cmd=/etc/init.d/ipsec restart +policies_dir=/etc/ipsec.d/policies +start_cmd=/etc/init.d/ipsec start +secrets=/etc/ipsec.secrets diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index 5a5abf81e..ff8eac0eb 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -init_name=open-iscsi config_file=/etc/iscsi/iscsid.conf iscsiadm=iscsiadm iscsiiname=iscsi-iname -initiator_file=/etc/iscsi/initiatorname.iscsi ifaces_dir=/var/lib/iscsi/ifaces +initiator_file=/etc/iscsi/initiatorname.iscsi +init_name=open-iscsi diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 6d78d09aa..84ae0cb6a 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -targets_file=/etc/iscsi/targets -iscsi_server=/usr/sbin/iscsi-target auths_file=/etc/iscsi/auths -opts_file=/etc/sysconfig/netbsd-iscsi +iscsi_server=/usr/sbin/iscsi-target pid_file=/var/run/iscsi-target.pid +targets_file=/etc/iscsi/targets +opts_file=/etc/sysconfig/netbsd-iscsi init_name=netbsd-iscsi diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 4b46ef9ef..7c517d529 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ -opts_file=/etc/default/iscsitarget -init_name=iscsitarget -pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid -targets_file=/etc/iet/targets.allow +config_file=/etc/iet/ietd.conf initiators_file=/etc/iet/initiators.allow ietadm=ietadm -config_file=/etc/iet/ietd.conf +targets_file=/etc/iet/targets.allow +pid_file=/var/run/iscsi_trgt.pid /var/run/ietd.pid +init_name=iscsitarget +opts_file=/etc/default/iscsitarget diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 853c8fac2..6010bceef 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ tgtadmin=tgt-admin -tgtadm=tgtadm -tgtd=tgtd init_name=tgtd +tgtd=tgtd config_file=/etc/tgt/targets.conf +tgtadm=tgtadm diff --git a/webmin/jabber/config b/webmin/jabber/config index 58993f937..2d3456223 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -start_cmd=/etc/init.d/jabberd start -jabber_dir=/var/lib/jabber +jabber_config=/etc/jabber/jabber.xml stop_cmd=/etc/init.d/jabberd stop jabber_daemon=/usr/sbin/jabberd -jabber_config=/etc/jabber/jabber.xml +start_cmd=/etc/init.d/jabberd start +jabber_dir=/var/lib/jabber diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 4460f14f7..41ce77d5e 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -auth_ldap=/etc/ldap.conf -secret=/etc/ldap.secret init_name=nslcd +secret=/etc/ldap.secret +auth_ldap=/etc/ldap.conf diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index 5074b616c..180728c4c 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ -schema_dir=/etc/ldap/schema -start_cmd=/etc/init.d/slapd start init_name=slapd -attr_count=6 -config_file=/etc/ldap/slapd.d -apply_cmd=/etc/init.d/slapd restart -ldap_user=openldap +start_cmd=/etc/init.d/slapd start stop_cmd=/etc/init.d/slapd stop browse_max=100 slapd=slapd +schema_dir=/etc/ldap/schema +apply_cmd=/etc/init.d/slapd restart +attr_count=6 +ldap_user=openldap +config_file=/etc/ldap/slapd.d diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 1859f5bac..3301f5b63 100644 --- a/webmin/ldap-useradmin/config +++ b/webmin/ldap-useradmin/config @@ -1,24 +1,24 @@ +other_class=inetOrgPerson +imap_foldersep=. +md5=0 +quota_support=0 +membox=0 +given_order=0 +imap_def=0 ldap_tls=0 -person=1 +alias_same=0 samba_class=sambaSamAccount -gecos=1 -membox=0 +samba_gclass=sambaGroup auth_ldap=/etc/ldap.conf +mailfmt=0 +slappasswd=slappasswd given=0 +imap_login=cyrus +gecos=1 shells=fixed,ldap,passwd,shells -imap_foldersep=. imap_folders=old public sent-mail -given_order=0 +secmode=0 multi_fields=0 -md5=0 -imap_login=cyrus -slappasswd=slappasswd -imap_class=SuSEeMailObject -mailfmt=0 -samba_gclass=sambaGroup samba_def=0 -imap_def=0 -other_class=inetOrgPerson -alias_same=0 -quota_support=0 -secmode=0 +imap_class=SuSEeMailObject +person=1 diff --git a/webmin/logrotate/config b/webmin/logrotate/config index 901f855de..b85fb9a25 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -logrotate=logrotate add_file=/etc/logrotate.d -sort_mode=0 logrotate_conf=/etc/logrotate.conf +logrotate=logrotate +sort_mode=0 diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index b279fd33a..612c41c48 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ +gs_path=gs sort_mode=0 -show_status=0 display_mode=0 -gs_lib= -iface_arg= +model_path=/usr/share/foomatic/db /usr/share/ppd +iface_perms=755 start_cmd=/etc/init.d/cupsys start -show_jobs=0 +smbclient_path=smbclient +gs_lib= driver_style=cups -spool_dir=/var/spool/cups -model_path=/usr/share/foomatic/db /usr/share/ppd -stop_cmd=/etc/init.d/cupsys stop iface_owner=lp:lp -iface_perms=755 -gs_fontpath= +show_jobs=0 +show_status=0 +stop_cmd=/etc/init.d/cupsys stop +iface_arg= +spool_dir=/var/spool/cups print_style=cups -smbclient_path=smbclient -gs_path=gs +gs_fontpath= diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index c414194c3..68785822e 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -date_fmt=dmy -view_html=0 -auto=1 -spam_del=0 -vpopmail_dir=/home/vpopmail -maildir_deleted=0 +no_orig_ip=0 +link_mode=0 +from_virtualmin=1 +sync_delete=1 +track_read=0 +sync_perms=0700 +column_count=4 +arrows=1 +ignore_users_enabled=0 mail_usermin=mail -delete_warn=y +sync_modify=1 +fwd_mode=0 +perpage=20 +wrap_width=80 no_crlf=0 +html_edit=0 ignore_users= +show_unread=0 +no_mailer=0 mail_system=3 -arrows=1 -sync_modify=1 +view_html=0 +sync_create=0 +date_fmt=dmy +size_mode=1 html_quote=0 noindex_hostname=0 -show_body=0 -show_sent=0 -sync_perms=0700 -ignore_users_enabled=0 +vpopmail_dir=/home/vpopmail max_records=200 -mail_dir=Maildir -log_read=0 -no_mailer=0 -spam_report= -mailbox_user=.usermin/mailbox -wrap_width=80 -column_count=4 -mail_file=Mailbox -sig_file=* -show_count=0 -sort_mode=1 -no_orig_ip=0 -from_virtualmin=1 -top_buttons=2 -sync_create=0 -html_edit=0 -show_size=1 +maildir_deleted=0 +show_body=0 show_to=0 -link_mode=0 -show_size_below=0 +mail_dir=Maildir open_mode=0 -spam_buttons=mail -show_unread=0 -fwd_mode=0 +spam_del=0 check_mod=1 -sync_delete=1 -mail_style=0 show_delall=0 -perpage=20 -track_read=0 +log_read=0 show_mail=0 -size_mode=1 +spam_buttons=mail +delete_warn=y +show_size_below=0 +show_sent=0 +mail_style=0 +mail_file=Mailbox +sig_file=* +show_size=1 +mailbox_user=.usermin/mailbox +top_buttons=2 +sort_mode=1 +show_count=0 +auto=1 +spam_report= diff --git a/webmin/man/config b/webmin/man/config index 2f6dd539e..6bf4ed50f 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ man_cmd_sect=man SECTION PAGE +search_cmd=man -k PAGE list_cmd_sect=man -w SECTION PAGE -doc_dir=/usr/share/doc man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man -search_cmd=man -k PAGE -man_cmd=man PAGE -kernel_dir=/usr/src/linux/Documentation man2html_path=man2html +kernel_dir=/usr/src/linux/Documentation list_cmd=man -w PAGE +man_cmd=man PAGE +doc_dir=/usr/share/doc diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index 41ba5646c..ddda3347c 100644 --- 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.991 +server=MiniServ/1.994 diff --git a/webmin/mon/config b/webmin/mon/config index a44d82fdc..e80ad00b2 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -start_cmd=/etc/init.d/mon start -pid_file=/var/run/mon.pid cfbasedir=/etc/mon -mon_cgi=/var/www/cgi-bin/mon.cgi restart_cmd=/etc/init.d/mon restart -stop_cmd=/etc/init.d/mon stop +pid_file=/var/run/mon.pid monshow=/usr/bin/monshow +mon_cgi=/var/www/cgi-bin/mon.cgi +start_cmd=/etc/init.d/mon start +stop_cmd=/etc/init.d/mon stop diff --git a/webmin/mount/config b/webmin/mount/config index efcc7a3ce..73eceb067 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -sysinfo=1 +show_used=1 nmblookup_path=nmblookup +sysinfo=1 +smbclient_path=smbclient auto_file=/etc/am-utils/amd.conf -sort_mode=2 -autofs_file=/etc/auto.master +fstab_file=/etc/fstab long_fstypes=1 -smbclient_path=smbclient -show_used=1 +autofs_file=/etc/auto.master +sort_mode=2 nfs_check=1 -fstab_file=/etc/fstab diff --git a/webmin/mysql/config b/webmin/mysql/config index 4b80c4c4d..1d3fb19ca 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -mysql_libs=/usr/local/mysql/lib +webmin_subs=0 +mysql_data=/var/lib/mysql +perpage=25 +mysql=/usr/bin/mysql +access=*: * max_text=1000 +nopwd=0 blob_mode=0 +nodbi=0 +date_subs=0 +mysqladmin=/usr/bin/mysqladmin mysqlshow=/usr/bin/mysqlshow +stop_cmd=service mysql stop add_mode=1 +mysql_libs=/usr/local/mysql/lib max_dbs=50 login=root -access=*: * -mysql_data=/var/lib/mysql -perpage=25 -nodbi=0 -nopwd=0 -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf -stop_cmd=service mysql stop start_cmd=service mysql start +passwd_mode=0 style=0 -mysqladmin=/usr/bin/mysqladmin mysqlimport=/usr/bin/mysqlimport -webmin_subs=0 -mysql=/usr/bin/mysql mysqldump=/usr/bin/mysqldump -date_subs=0 -passwd_mode=0 +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf diff --git a/webmin/mysql/version b/webmin/mysql/version index 4e69dc549..ac7194a35 100644 --- a/webmin/mysql/version +++ b/webmin/mysql/version @@ -1 +1 @@ -8.0.28-0ubuntu0 +8.0.29-0ubuntu0 diff --git a/webmin/nis/config b/webmin/nis/config index efe9f2a66..a1e29aa7b 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ client_conf=/etc/yp.conf +max_size=100 securenets=/etc/ypserv.securenets manual_build=0 nsswitch_conf=/etc/nsswitch.conf -max_size=100 diff --git a/webmin/openslp/config b/webmin/openslp/config index 3a8c287ac..a7a4992c5 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd=/usr/sbin/slpd -slpd_conf=/etc/slp.conf -slpd_log=/var/log/slpd.log slpd_reg=/etc/slp.reg slpd_pid=/var/run/slpd.pid +slpd_conf=/etc/slp.conf +slpd_log=/var/log/slpd.log +slpd=/usr/sbin/slpd diff --git a/webmin/package-updates/config b/webmin/package-updates/config index 226c127d1..195d872e7 100644 --- a/webmin/package-updates/config +++ b/webmin/package-updates/config @@ -1,2 +1,2 @@ -cache_time=6 update_multiple=1 +cache_time=6 diff --git a/webmin/pam/config b/webmin/pam/config index 695267622..b3d9581d6 100644 --- a/webmin/pam/config +++ b/webmin/pam/config @@ -1,4 +1,4 @@ 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 ignore=README -pam_dir=/etc/pam.d diff --git a/webmin/pap/config b/webmin/pap/config index f5aacd02f..f73db29d9 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ -dialin_config=/etc/mgetty+sendfax/dialin.config mgetty=mgetty serials=/dev/ttyS[0-9]* ppp_options=/etc/ppp/options -pap_file=/etc/ppp/pap-secrets +dialin_config=/etc/mgetty+sendfax/dialin.config encrypt_pass=0 pppd=pppd login_config=/etc/mgetty+sendfax/login.config +pap_file=/etc/ppp/pap-secrets diff --git a/webmin/passwd/config b/webmin/passwd/config index 04110de95..75e5ffcde 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -max_users=200 input_type=0 +max_users=200 sort_mode=0 diff --git a/webmin/postfix/config b/webmin/postfix/config index 177706936..1e3e16641 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ -top_buttons=1 postfix_aliases_table_command=/usr/sbin/postalias -sort_mode=0 -postfix_control_command=/usr/sbin/postfix +postcat_cmd=/usr/sbin/postcat +postfix_lookup_table_command=/usr/sbin/postmap mailq_cmd=postqueue -p +max_records=200 show_cmts=0 -columns=2 -delete_confirm=1 -prefix_cmts=0 -delete_warn=1 +index_check=1 postfix_queue_command=postqueue -mailq_dir=/var/spool/postfix -postcat_cmd=/usr/sbin/postcat -mailq_sort=0 -ldap_doms=0 -postfix_newaliases_command=/usr/bin/newaliases postfix_master=/etc/postfix/master.cf +delete_confirm=1 +mailq_dir=/var/spool/postfix check_config=1 -max_records=200 -mailq_count=0 -postfix_lookup_table_command=/usr/sbin/postmap +delete_warn=1 +perpage=20 fwd_mode=0 -max_maps=100 -index_check=1 -postfix_config_command=/usr/sbin/postconf +mailq_count=0 +prefix_cmts=0 postfix_config_file=/etc/postfix/main.cf -perpage=20 +postfix_control_command=/usr/sbin/postfix +columns=2 +max_maps=100 wrap_width=80 +postfix_config_command=/usr/sbin/postconf +mailq_sort=0 +postfix_newaliases_command=/usr/bin/newaliases +sort_mode=0 postfix_super_command=/usr/sbin/postsuper +ldap_doms=0 +top_buttons=1 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index 45b09b205..ebfb54527 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -plib= -pass= -webmin_subs=0 -date_subs=0 hba_conf=/etc/postgresql/*/main/pg_hba.conf rstr_cmd=/usr/bin/pg_restore -access_own=0 style=0 -pid_file=/var/run/postmaster.pid start_cmd=/etc/init.d/postgresql* start +login=postgres sameunix=1 -perpage=25 -simple_sched=0 -access=*: * +psql=/usr/bin/psql +max_dbs=50 +plib= dump_cmd=/usr/bin/pg_dump -login=postgres +pass= add_mode=1 -max_dbs=50 stop_cmd=/etc/init.d/postgresql* stop -nodbi=0 +access_own=0 basedb=template1 +date_subs=0 blob_mode=0 -psql=/usr/bin/psql +nodbi=0 +pid_file=/var/run/postmaster.pid +simple_sched=0 max_text=1000 +access=*: * +perpage=25 +webmin_subs=0 diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index e0a3e10a8..7af13e89f 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ file=/etc/wvdial.conf -wvdialconf=wvdialconf wvdial=wvdial +wvdialconf=wvdialconf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 6d651873c..037866532 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -pptp_options=/etc/ppp/options.pptp -pptp=pptp peers_dir=/etc/ppp/peers +pptp_options=/etc/ppp/options.pptp timeout=30 +pptp=pptp pap_file=/etc/ppp/chap-secrets diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index eb47ed31e..6dfe23ff7 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -pap_file=/etc/ppp/chap-secrets -stop_cmd=/etc/init.d/pptpd stop ppp_options=/etc/ppp/options -pid_file=/var/run/pptpd.pid log_file=/var/log/messages +pptp_ppp_options=/etc/ppp/pptpd-options pptpd=pptpd +stop_cmd=/etc/init.d/pptpd stop start_cmd=/etc/init.d/pptpd start -pptp_ppp_options=/etc/ppp/pptpd-options +pap_file=/etc/ppp/chap-secrets +pid_file=/var/run/pptpd.pid file=/etc/pptpd.conf diff --git a/webmin/proc/config b/webmin/proc/config index 463d06931..dec53dd48 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ -ps_style=linux -base_ppid=1 hide_self=1 cut_length=80 +ps_style=linux default_mode=last trace_java=0 +base_ppid=1 diff --git a/webmin/proftpd/config b/webmin/proftpd/config index b010bddf2..a89f043a0 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ -test_config=1 +test_manual=0 +proftpd_path=/usr/sbin/proftpd +proftpd_conf=/etc/proftpd/proftpd.conf +test_always=0 pid_file=/var/run/proftpd.pid ftpusers=/etc/ftpusers -start_cmd=/etc/init.d/proftpd start -proftpd_conf=/etc/proftpd/proftpd.conf -test_manual=0 stop_cmd=/etc/init.d/proftpd stop -test_always=0 -proftpd_path=/usr/sbin/proftpd +test_config=1 +start_cmd=/etc/init.d/proftpd start diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 504511434..13e39d5c8 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -mailq_count=0 +mail_system=1 +mail_dir_qmail=Maildir +index_min=1000000 +sort_mode=0 mail_dir= +mailq_sort=0 +columns=2 max_records=200 -sort_mode=0 +mailq_count=0 fwd_mode=0 -perpage=20 -index_min=1000000 qmail_dir=/var/qmail -mail_system=1 -columns=2 mail_file=Mailbox -mailq_sort=0 +perpage=20 delete_warn=1 -mail_dir_qmail=Maildir diff --git a/webmin/quota/config b/webmin/quota/config index c29262cb2..d7352efa2 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ -user_edquota_command=edquota -u +group_quotaon_command=quotaon -g +user_repquota_command=repquota -u -v +group_copy_command=edquota -g -p +user_quotaoff_command=quotaoff -u +email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the allowed quota. ${USED} of disk space is being used, out of a maximum of ${QUOTA}. +sort_mode=0 +display_max=100 +quotacheck_command=quotacheck -u -g +group_quotaoff_command=quotaoff -g user_grace_command=edquota -u -t +pc_show=1 +group_setquota_command=setquota -g block_mode=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}. -user_setquota_command=setquota -u user_quota_command=quota -v -u +user_edquota_command=edquota -u +group_edquota_command=edquota -g +user_quotaon_command=quotaon -u +group_grace_command=edquota -g -t +user_setquota_command=setquota -u user_copy_command=edquota -u -p -group_copy_command=edquota -g -p +block_size=1024 show_grace=1 group_repquota_command=repquota -g -v -group_grace_command=edquota -g -t -group_quotaoff_command=quotaoff -g -user_quotaon_command=quotaon -u -user_repquota_command=repquota -u -v -group_quotaon_command=quotaon -g -block_size=1024 hide_uids=0 -group_edquota_command=edquota -g -sort_mode=0 -user_quotaoff_command=quotaoff -u -group_setquota_command=setquota -g -display_max=100 -pc_show=1 group_quota_command=quota -v -g diff --git a/webmin/reload b/webmin/reload index 70b36fdf0..ed85cb533 100755 --- a/webmin/reload +++ b/webmin/reload @@ -1,4 +1,2 @@ #!/bin/sh -echo Reloading Webmin server in /usr/share/webmin -pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'` -kill -USR1 `cat $pidfile` +/etc/webmin/.reload-init >/dev/null 2>&1 diff --git a/webmin/restart b/webmin/restart index a425fffbb..f436041c2 100755 --- a/webmin/restart +++ b/webmin/restart @@ -1,2 +1,2 @@ #!/bin/sh -/etc/webmin/stop --kill && /etc/webmin/start +/bin/systemctl restart webmin diff --git a/webmin/restart-by-force-kill b/webmin/restart-by-force-kill new file mode 100755 index 000000000..4ce26d90e --- /dev/null +++ b/webmin/restart-by-force-kill @@ -0,0 +1,4 @@ +#!/bin/sh +/etc/webmin/.stop-init --kill >/dev/null 2>&1 +/bin/systemctl stop webmin +/bin/systemctl start webmin diff --git a/webmin/samba/config b/webmin/samba/config index 9672ac8b1..343b04835 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ -list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' -pdbedit=/usr/bin/pdbedit sort_mode=0 -dont_convert=-499 -start_cmd=service smbd start ; service nmbd start -run_from_inetd=0 -samba_server=/usr/sbin/smbd -swat=/usr/sbin/swat -stop_cmd=service smbd stop ; service nmbd stop net=/usr/bin/net -name_server=/usr/sbin/nmbd +smb_passwd=/etc/samba/smbpasswd restart_cmd=service smbd restart ; service nmbd restart -smbgroupedit=/usr/bin/smbgroupedit -samba_password_program=/usr/bin/smbpasswd +start_cmd=service smbd start ; service nmbd start +swat=/usr/sbin/swat +list_printers_command=lpc status | grep "[A-z0-9]:" | sed -e 's/://g' smb_conf=/etc/samba/smb.conf +samba_password_program=/usr/bin/smbpasswd text_lists=0 +samba_server=/usr/sbin/smbd +stop_cmd=service smbd stop ; service nmbd stop +run_from_inetd=0 +smbgroupedit=/usr/bin/smbgroupedit samba_status_program=/usr/bin/smbstatus -smb_passwd=/etc/samba/smbpasswd +dont_convert=-499 +name_server=/usr/sbin/nmbd +pdbedit=/usr/bin/pdbedit diff --git a/webmin/sarg/config b/webmin/sarg/config index b9009faeb..a8477b752 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ +clear=1 sarg_conf=/etc/sarg/sarg.conf -sarg=sarg naked=0 -clear=1 +sarg=sarg diff --git a/webmin/sendmail/config b/webmin/sendmail/config index 3e9904b2a..6ee6adc3e 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -sendmail_cf=/etc/mail/sendmail.cf +mailq_count=0 +prefix_cmts=0 perpage=20 -track_read=0 mail_file=mbox -wrap_width=80 -mail_style=0 -mailq_show=Date,From,To,Size,Status -max_records=200 -mailq_count=0 -mail_dir=/var/spool/mail -sendmail_pid=/var/run/sendmail/mta/sendmail.pid -makemap_path=makemap fwd_mode=0 -sendmail_features=/usr/share/sendmail/cf -index_min=1000000 -prefix_cmts=0 -columns=2 -delete_confirm=1 -mailq_sort=0 +mail_style=0 delete_warn=1 -show_to=0 -sendmail_path=/usr/lib/sendmail +index_min=1000000 sort_mode=0 -sendmail_command=/usr/lib/sendmail -bd -q1h -order_mail=0 -sendmail_mc=/etc/mail/sendmail.mc +sendmail_features=/usr/share/sendmail/cf top_buttons=1 +sendmail_pid=/var/run/sendmail/mta/sendmail.pid +mailq_sort=0 +wrap_width=80 +mail_type=0 +columns=2 +sendmail_mc=/etc/mail/sendmail.mc +max_records=200 show_cmts=0 +mailq_show=Date,From,To,Size,Status smrsh_dir=/etc/smrsh -mail_type=0 +makemap_path=makemap +order_mail=0 +sendmail_cf=/etc/mail/sendmail.cf +track_read=0 +show_to=0 +delete_confirm=1 +mail_dir=/var/spool/mail +sendmail_command=/usr/lib/sendmail -bd -q1h +sendmail_path=/usr/lib/sendmail diff --git a/webmin/servers/config b/webmin/servers/config index 700dee00a..f1549a0e1 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -deffast=2 +scan_time=5 +display_mode=0 +sort_mode=0 +show_status=1 show_ip=0 deflink=0 -max_servers=100 -sort_mode=0 +groups_dir=/etc/cluster/groups +deffast=2 resolve=1 -show_status=1 -scan_time=5 +max_servers=100 capath=/usr/share/ca-certificates -display_mode=0 -groups_dir=/etc/cluster/groups diff --git a/webmin/shell/config b/webmin/shell/config index 4b3e40b52..044e158ce 100644 --- a/webmin/shell/config +++ b/webmin/shell/config @@ -1,3 +1,3 @@ +clear_envs=0 max_output=100000 max_runtime=86400 -clear_envs=0 diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 58652372a..5fb82ba27 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -display_zone_descriptions=1 -macros=/usr/share/shorewall -actions=/etc/shorewall/actions /usr/share/shorewall/actions.std config_dir=/etc/shorewall +actions=/etc/shorewall/actions /usr/share/shorewall/actions.std +display_zone_descriptions=1 shorewall=shorewall +macros=/usr/share/shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index ad86c0d80..91ded64c1 100644 --- 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 display_zone_descriptions=1 shorewall6=shorewall6 -config_dir=/etc/shorewall6 +macros=/usr/share/shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index e5c58db0a..89a62e9fe 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ mode=1 +ata=0 smartctl=smartctl attribs=1 -ata=0 diff --git a/webmin/software/config b/webmin/software/config index 9476e6757..abefc9ae1 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ apt_mode=0 -update_system=apt package_system=debian +update_system=apt diff --git a/webmin/spam/config b/webmin/spam/config index 0c7fe6068..db1e375ef 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -warn_procmail=1 -addto=0 -processes=spamd amavisd -mode=0 sa_learn=sa-learn -call_spam=1 -procmailrc=/etc/procmailrc -restart_cmd=/etc/init.d/spamassassin restart -spamassassin=spamassassin +warn_procmail=1 local_cf=/etc/spamassassin/local.cf +call_spam=1 max_awl=200 procmail_cmd=* +spamassassin=spamassassin +mode=0 +addto=0 +processes=spamd amavisd +restart_cmd=/etc/init.d/spamassassin restart +procmailrc=/etc/procmailrc diff --git a/webmin/squid/config b/webmin/squid/config index 6ed5227d1..05c760070 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -pid_file=/var/run/squid.pid -crypt_conf=0 -log_dir=/var/log/squid -squid_stop=service squid stop -sync_create=0 -squidclient=squidclient -sync_delete=0 -cal_fmt=w -sort_conf=0 -restart_pos=0 -squid_path=squid +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi cal_all=1 -cal_max=50000 +squidclient=squidclient +sync_create=0 calamaris=calamaris -squid_start=service squid start cal_args=-aw -squid_conf=/etc/squid/squid.conf +squid_restart=service squid reload cache_dir=/var/spool/squid +sort_conf=0 +sync_delete=0 +log_dir=/var/log/squid +squid_stop=service squid stop +squid_conf=/etc/squid/squid.conf +pid_file=/var/run/squid.pid +cal_max=50000 +restart_pos=0 sync_modify=1 -squid_restart=service squid reload -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +squid_path=squid +crypt_conf=0 +cal_fmt=w +squid_start=service squid start diff --git a/webmin/sshd/config b/webmin/sshd/config index 71f80075d..dac2fab6d 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ -pid_file=/var/run/sshd.pid sync_auth=1 -start_cmd=service ssh start -sync_gnupg=0 -sync_create=0 +stop_cmd=service ssh stop sync_pass=0 -sshd_path=/usr/sbin/sshd +sync_gnupg=0 +sshd_config=/etc/ssh/sshd_config client_config=/etc/ssh/ssh_config keygen_path=/usr/bin/ssh-keygen -sshd_config=/etc/ssh/sshd_config -stop_cmd=service ssh stop +pid_file=/var/run/sshd.pid +start_cmd=service ssh start +sshd_path=/usr/sbin/sshd +sync_create=0 diff --git a/webmin/start b/webmin/start index 6d757eb9f..443754448 100755 --- a/webmin/start +++ b/webmin/start @@ -1,11 +1,2 @@ #!/bin/sh -echo Starting Webmin server in /usr/share/webmin -trap '' 1 -LANG= -export LANG -#PERLIO=:raw -unset PERLIO -export PERLIO -PERLLIB=/usr/share/webmin -export PERLLIB -exec '/usr/share/webmin/miniserv.pl' $* /etc/webmin/miniserv.conf +/bin/systemctl start webmin diff --git a/webmin/status/config b/webmin/status/config index f24b9da15..0f02b6638 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,14 +1,14 @@ -pager_cmd=sms_client -columns=2 snmp_version=2 -history_show=50 -sched_offset=0 +sort_mode=0 +subject_mode=0 +index_status=1 history_purge=30 +sched_offset=0 snmp_trap=1.3.6.1.4.1.10000.1.1 -output=0 +columns=2 +pager_cmd=sms_client +history_show=50 +pinger=linux sysinfo_users=0 -index_status=1 +output=0 sysinfo=0 -subject_mode=0 -sort_mode=0 -pinger=linux diff --git a/webmin/stop b/webmin/stop index c0f841769..d22cf1dff 100755 --- a/webmin/stop +++ b/webmin/stop @@ -1,15 +1,2 @@ #!/bin/sh -echo Stopping Webmin server in /usr/share/webmin -pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'` -pid=`cat $pidfile` -if [ "$pid" != "" ]; then - kill $pid || exit 1 - touch /var/webmin/stop-flag - if [ "$1" = "--kill" ]; then - sleep 2 - (kill -9 -- -$pid || kill -9 $pid) 2>/dev/null - fi - exit 0 -else - exit 1 -fi +/bin/systemctl stop webmin diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index b65ada8b4..38744b2e1 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ lines=20 -syslogng_conf=/etc/syslog-ng/syslog-ng.conf start_cmd=/etc/init.d/syslog-ng start -pid_file=/var/run/syslog-ng.pid -syslogng_cmd=syslog-ng compressed=1 +syslogng_cmd=syslog-ng stop_cmd=/etc/init.d/syslog-ng stop +pid_file=/var/run/syslog-ng.pid +syslogng_conf=/etc/syslog-ng/syslog-ng.conf diff --git a/webmin/syslog/config b/webmin/syslog/config index ea1ad6447..6ba4b67a1 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ +m4_path= +pri_all=1 syslog_conf=/etc/rsyslog.conf -signal_cmd=/usr/sbin/service rsyslog restart -syslogd=/usr/sbin/rsyslogd -pri_dir=1 -tags=0 +socket=0 m4_conf=0 -others=1 +sync=1 +syslogd=/usr/sbin/rsyslogd +compressed=1 +lines=20 reverse=0 +others=1 +tags=0 +signal_cmd=/usr/sbin/service rsyslog restart start_cmd=/usr/sbin/service rsyslog start -pid_file=/var/run/rsyslogd.pid -pri_all=1 +pri_dir=1 restart_cmd=/usr/sbin/service rsyslog restart -socket=0 -compressed=1 -lines=20 -sync=1 -pipe=1 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 -m4_path= +pid_file=/var/run/rsyslogd.pid +pipe=1 diff --git a/webmin/system-status/config b/webmin/system-status/config index b6a7e4155..c627a9fec 100644 --- 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 10eceba4d..c2cea99fc 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ +inetd_services=0 hosts_deny=/etc/hosts.deny hosts_allow=/etc/hosts.allow -inetd_services=0 diff --git a/webmin/telnet/config b/webmin/telnet/config index 173f347e7..164ed233c 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ mode=1 -detach=0 -proxy=0 sizemode=0 no_test=0 +proxy=0 +detach=0 diff --git a/webmin/time/config b/webmin/time/config index 840cc4d44..5a4000f56 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ -lease=5 timeserver_hardware=1 -timeserver=0.pool.ntp.org seconds=1 +timeserver=0.pool.ntp.org ntp_only=1 +lease=5 zone_style=linux diff --git a/webmin/uninstall.sh b/webmin/uninstall.sh index dab59154f..bf73c1287 100755 --- a/webmin/uninstall.sh +++ b/webmin/uninstall.sh @@ -4,6 +4,6 @@ read answer printf "\n" if [ "$answer" = "y" ]; then echo "Removing Webmin package .." - dpkg --remove webmin - echo "Done!" + dpkg --remove --force-depends webmin + echo ".. done" fi diff --git a/webmin/updown/config b/webmin/updown/config index 1c7534ae3..f6605280c 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ -dir=/ duser=root user=root +dir=/ ddir=/ diff --git a/webmin/useradmin/config b/webmin/useradmin/config index 81de8beb6..a73aca4c6 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -shadow_file=/etc/shadow -passwd_progmode=0 -gid_calc=0 -uid_calc=0 -email_type=0 +empty_mode=0 home_base=/home -delete_root=0 -skip_md5=0 -display_mode=1 -sort_mode=0 -random_password=0 +md5=1 +membox=0 +from_files=0 last_show=0 -display_max=400 -group_file=/etc/group -shells=fixed,passwd,shells -uid_mode=1 +passwd_progmode=0 gid_mode=1 -base_gid=1000 +selinux_con=user_u:object_r:user_home_dir_t +homedir_perms=0755 +uid_mode=1 +passwd_same=0 +group_file=/etc/group +default_group=users default_other=1 -passwd_stars=0 +delete_root=0 +passwd_file=/etc/passwd +base_gid=1000 gshadow_file=/etc/gshadow -membox=0 +display_mode=1 extra_real=0 -home_style=0 +alias_check=0 +sort_mode=0 +gid_calc=0 +shadow_file=/etc/shadow +random_password=0 +uid_calc=0 +skip_md5=0 +display_max=400 +new_user_group=0 +delete_only=0 user_files=/etc/skel -passwd_file=/etc/passwd +secmode=0 lock_string=* -from_files=0 -new_user_group=0 +email_type=0 new_user_gid=0 -md5=1 -selinux_con=user_u:object_r:user_home_dir_t -passwd_dict=0 -default_group=users base_uid=1000 -passwd_same=0 -delete_only=0 -secmode=0 -homedir_perms=0755 -empty_mode=0 -alias_check=0 +passwd_dict=0 +home_style=0 +passwd_stars=0 +shells=fixed,passwd,shells diff --git a/webmin/usermin/config b/webmin/usermin/config index d8cbac19c..420489df7 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ updays=1 cron_mode=0 -upshow=1 -usermin_dir=/etc/usermin uphour=4 +usermin_dir=/etc/usermin upmissing=0 +upshow=1 update=0 diff --git a/webmin/version b/webmin/version index 09b638fc2..704ddb287 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.991 +1.994 diff --git a/webmin/vgetty/config b/webmin/vgetty/config index 00f79ad34..bb4eec4d2 100644 --- a/webmin/vgetty/config +++ b/webmin/vgetty/config @@ -1,2 +1,2 @@ -vgetty_config=/etc/mgetty+sendfax/voice.conf vgetty_cmd=vgetty +vgetty_config=/etc/mgetty+sendfax/voice.conf diff --git a/webmin/webalizer/config b/webmin/webalizer/config index dcf70c62c..f0526e5d0 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ -auto=apache,squid,proftpd,wuftpd -naked=0 -skip_old=0 +alt_conf=/etc/webalizer/webalizer.conf.sample webalizer_conf=/etc/webalizer/webalizer.conf +naked=0 +auto=apache,squid,proftpd,wuftpd webalizer=/usr/bin/webalizer -alt_conf=/etc/webalizer/webalizer.conf.sample +skip_old=0 diff --git a/webmin/webmin/config b/webmin/webmin/config index 71fe5cabd..d0f51fd2c 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ +upmins=47 letsencrypt_dns_wait=10 -updays=1 +cron_mode=0 last_version_number=1.900 uphour=23 -update=0 -upmissing=0 -last_version_check=1549050668 -cron_mode=0 -upshow=1 warn_days=7 -upmins=47 osdn=1 +updays=1 +upshow=1 +update=0 +last_version_check=1549050668 +upmissing=0 diff --git a/webmin/wuftpd/config b/webmin/wuftpd/config index bc16cbc23..4ba4f3863 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftpd_path=/usr/sbin/wu-ftpd -ftpusers=/etc/wu-ftpd/ftpusers -ftpconversions=/etc/wu-ftpd/ftpconversions -log_file=/var/log/xferlog ftpgroups=/etc/wu-ftpd/ftpgroups -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 +pid_file=/var/run/ftpd.pids-all +ftpd_path=/usr/sbin/wu-ftpd +ftpusers=/etc/wu-ftpd/ftpusers diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 709f2b49e..9ba1db362 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ pid_file=/var/run/xinetd.pid -xinetd_conf=/etc/xinetd.conf lookup_servs=1 +xinetd_conf=/etc/xinetd.conf start_cmd=/etc/init.d/xinetd start protocols_file=/etc/protocols -- 2.43.0