From 9893457e577227429d8d4c7c736416e374e285de Mon Sep 17 00:00:00 2001 From: mhoellein Date: Fri, 1 Jul 2022 11:15:50 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -curl 7.68.0-1ubuntu2.11 amd64 +curl 7.68.0-1ubuntu2.12 amd64 -icinga2 2.13.3-1.focal amd64 -icinga2-bin 2.13.3-1.focal amd64 -icinga2-common 2.13.3-1.focal all -icinga2-doc 2.13.3-1.focal all -icinga2-ido-mysql 2.13.3-1.focal amd64 +icinga2 2.13.4-1.focal amd64 +icinga2-bin 2.13.4-1.focal amd64 +icinga2-common 2.13.4-1.focal all +icinga2-doc 2.13.4-1.focal all +icinga2-ido-mysql 2.13.4-1.focal amd64 -libcurl3-gnutls 7.68.0-1ubuntu2.11 amd64 -libcurl4 7.68.0-1ubuntu2.11 amd64 +libcurl3-gnutls 7.68.0-1ubuntu2.12 amd64 +libcurl4 7.68.0-1ubuntu2.12 amd64 -ubuntu-advantage-tools 27.8~20.04.1 amd64 +ubuntu-advantage-tools 27.9~20.04.1 amd64 -vim-icinga2 2.13.3-1.focal all +vim-icinga2 2.13.4-1.focal all -webmin 1.994 all +webmin 1.995 all --- .etckeeper | 4 + .../ua-license-check.path | 1 - .../ubuntu-advantage.service | 1 + ubuntu-advantage/uaclient.conf | 1 + webmin/acl/config | 2 +- webmin/adsl-client/config | 10 +-- webmin/apache/config | 38 ++++----- webmin/apache/httpd-info | 6 +- webmin/backup-config/config | 4 +- webmin/bacula-backup/config | 16 ++-- webmin/bandwidth/config | 2 +- webmin/bind8/config | 72 ++++++++--------- webmin/cluster-passwd/config | 2 +- webmin/cluster-software/config | 2 +- webmin/cluster-useradmin/config | 8 +- webmin/config | 51 ++++++------ webmin/cpan/config | 8 +- webmin/cron/config | 34 ++++---- webmin/custom/config | 4 +- webmin/dhcpd/config | 22 +++--- webmin/dovecot/config | 2 +- webmin/exim/config | 8 +- webmin/fail2ban/config | 2 +- webmin/fetchmail/config | 4 +- webmin/filter/config | 4 +- webmin/firewall/config | 6 +- webmin/firewall6/config | 8 +- webmin/firewalld/config | 2 +- webmin/fsdump/config | 8 +- webmin/grub/config | 2 +- webmin/heartbeat/config | 20 ++--- webmin/htaccess-htpasswd/config | 8 +- webmin/idmapd/config | 2 +- webmin/inetd/config | 22 +++--- webmin/init/config | 20 ++--- webmin/inittab/config | 2 +- webmin/installed.cache | 1 + webmin/ipfilter/config | 8 +- webmin/ipfw/config | 6 +- webmin/ipsec/config | 8 +- webmin/iscsi-client/config | 8 +- webmin/iscsi-server/config | 4 +- webmin/iscsi-target/config | 6 +- webmin/iscsi-tgtd/config | 4 +- webmin/jabber/config | 6 +- webmin/ldap-client/config | 4 +- webmin/ldap-server/config | 12 +-- webmin/ldap-useradmin/config | 34 ++++---- webmin/logrotate/config | 4 +- webmin/logviewer/config | 3 + webmin/lpadmin/config | 22 +++--- webmin/mailboxes/config | 78 +++++++++---------- webmin/man/config | 10 +-- webmin/miniserv.conf | 2 +- webmin/mon/config | 8 +- webmin/mount/config | 10 +-- webmin/mysql/config | 32 ++++---- webmin/nis/config | 4 +- webmin/openslp/config | 4 +- webmin/package-updates/config | 2 +- webmin/pam/config | 4 +- webmin/pap/config | 6 +- webmin/passwd/config | 2 +- webmin/postfix/config | 42 +++++----- webmin/postgresql/config | 32 ++++---- webmin/ppp-client/config | 2 +- webmin/pptp-client/config | 8 +- webmin/pptp-server/config | 8 +- webmin/proc/config | 6 +- webmin/procmail/config | 4 +- webmin/proftpd/config | 12 +-- webmin/qmailadmin/config | 18 ++--- webmin/quota/config | 36 ++++----- webmin/raid/config | 2 +- webmin/reload | 2 +- webmin/restart-by-force-kill | 2 +- webmin/samba/config | 20 ++--- webmin/sarg/config | 2 +- webmin/sendmail/config | 44 +++++------ webmin/servers/config | 14 ++-- webmin/shorewall/config | 6 +- webmin/shorewall6/config | 6 +- webmin/smart-status/config | 2 +- webmin/software/config | 2 +- webmin/spam/config | 12 +-- webmin/squid/config | 30 +++---- webmin/sshd/config | 14 ++-- webmin/status/config | 14 ++-- webmin/syslog-ng/config | 8 +- webmin/syslog/config | 26 +++---- webmin/system-status/config | 2 +- webmin/tcpwrappers/config | 2 +- webmin/telnet/config | 6 +- webmin/time/config | 6 +- webmin/updown/config | 2 +- webmin/useradmin/config | 66 ++++++++-------- webmin/usermin/config | 6 +- webmin/version | 2 +- webmin/webalizer/config | 4 +- webmin/webmin.acl | 2 +- webmin/webmin/config | 14 ++-- webmin/wuftpd/config | 8 +- webmin/xinetd/config | 2 +- 103 files changed, 603 insertions(+), 593 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/ua-license-check.path create mode 120000 systemd/system/multi-user.target.wants/ubuntu-advantage.service create mode 100644 webmin/logviewer/config diff --git a/.etckeeper b/.etckeeper index 0098aa429..fcbf1f999 100755 --- a/.etckeeper +++ b/.etckeeper @@ -11487,6 +11487,10 @@ maybe chgrp 'bin' 'webmin/logrotate' maybe chmod 0711 'webmin/logrotate' maybe chgrp 'bin' 'webmin/logrotate/config' maybe chmod 0600 'webmin/logrotate/config' +maybe chgrp 'bin' 'webmin/logviewer' +maybe chmod 0711 'webmin/logviewer' +maybe chgrp 'bin' 'webmin/logviewer/config' +maybe chmod 0600 'webmin/logviewer/config' maybe chgrp 'bin' 'webmin/lpadmin' maybe chmod 0711 'webmin/lpadmin' maybe chgrp 'bin' 'webmin/lpadmin/config' diff --git a/systemd/system/multi-user.target.wants/ua-license-check.path b/systemd/system/multi-user.target.wants/ua-license-check.path deleted file mode 120000 index d0f60ae55..000000000 --- a/systemd/system/multi-user.target.wants/ua-license-check.path +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/ua-license-check.path \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/ubuntu-advantage.service b/systemd/system/multi-user.target.wants/ubuntu-advantage.service new file mode 120000 index 000000000..d7d5cd645 --- /dev/null +++ b/systemd/system/multi-user.target.wants/ubuntu-advantage.service @@ -0,0 +1 @@ +/lib/systemd/system/ubuntu-advantage.service \ No newline at end of file diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf index d86fc1087..ec088bdb7 100644 --- a/ubuntu-advantage/uaclient.conf +++ b/ubuntu-advantage/uaclient.conf @@ -8,6 +8,7 @@ log_file: /var/log/ubuntu-advantage.log log_level: debug security_url: https://ubuntu.com/security timer_log_file: /var/log/ubuntu-advantage-timer.log +daemon_log_file: /var/log/ubuntu-advantage-daemon.log ua_config: apt_http_proxy: null apt_https_proxy: null diff --git a/webmin/acl/config b/webmin/acl/config index ee9b4c16b..c572bfa88 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 b3cb22c08..7955fec78 100644 --- a/webmin/adsl-client/config +++ b/webmin/adsl-client/config @@ -1,7 +1,7 @@ -pap_file=/etc/ppp/pap-secrets -start_cmd=adsl-start -stop_cmd=adsl-stop -pppoe_cmd=pppoe pppoe_conf=/etc/ppp/pppoe.conf -conf_style=0 +pppoe_cmd=pppoe +stop_cmd=adsl-stop status_cmd=adsl-status +conf_style=0 +start_cmd=adsl-start +pap_file=/etc/ppp/pap-secrets diff --git a/webmin/apache/config b/webmin/apache/config index 2c9fb00c4..70e74169f 100644 --- a/webmin/apache/config +++ b/webmin/apache/config @@ -1,25 +1,25 @@ -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 -link_dir=/etc/apache2/sites-enabled -apachectl_path=/usr/sbin/apache2ctl -defines_name=APACHE_ARGUMENTS -allow_virtualmin=0 -show_order=0 -defines_file=/etc/apache2/envvars stop_cmd=/etc/init.d/apache2 stop +max_servers=100 show_names=0 +mime_types=/etc/apache2/mime.types +format_config=1 +test_config=1 +apachectl_path=/usr/sbin/apache2ctl +access_conf=/etc/apache2/access.conf +test_apachectl=1 auto_mods=1 -test_always=0 +httpd_path=/usr/sbin/apache2 +show_order=0 +link_dir=/etc/apache2/sites-enabled +test_manual=0 virt_file=/etc/apache2/sites-available -show_list=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 +show_list=0 +allow_virtualmin=0 +httpd_dir=/etc/apache2 +defines_name=APACHE_ARGUMENTS +srm_conf=/etc/apache2/srm.conf +start_cmd=/etc/init.d/apache2 start +defines_file=/etc/apache2/envvars +test_always=0 diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index f048f9875..85b3852ec 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,5 +1,5 @@ -time=1651146608 +time=1654703947 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd -version=2.453 -fullversion=2.4.53 +version=2.454 +fullversion=2.4.54 diff --git a/webmin/backup-config/config b/webmin/backup-config/config index c6694b382..7f0472b86 100644 --- a/webmin/backup-config/config +++ b/webmin/backup-config/config @@ -1,3 +1,3 @@ -webmin_subs=0 -date_subs=0 apply=1 +date_subs=0 +webmin_subs=0 diff --git a/webmin/bacula-backup/config b/webmin/bacula-backup/config index d7b3e601c..4ddad4ba8 100644 --- a/webmin/bacula-backup/config +++ b/webmin/bacula-backup/config @@ -1,12 +1,12 @@ -bextract=bextract -bls=bls +driver=Pg +btape=btape user=bacula db=bacula -apply=1 pass= -bacula_dir=/etc/bacula -wait=1 -showdirs=0 -btape=btape +apply=1 init_start=0 -driver=Pg +bextract=bextract +showdirs=0 +wait=1 +bls=bls +bacula_dir=/etc/bacula diff --git a/webmin/bandwidth/config b/webmin/bandwidth/config index da72c415d..db38d7751 100644 --- 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 9c9d03759..cffb0b93b 100644 --- a/webmin/bind8/config +++ b/webmin/bind8/config @@ -1,46 +1,46 @@ -allow_underscore=1 -ipv6_mode=1 -soa_start=0 -forwardzonefilename_format=ZONE.hosts -spf_record=0 +keygen=dnssec-keygen +force_random=0 max_zones=50 -largezones=0 -checkconf=named-checkconf -slave_dir=/var/lib/bind -other_slaves=1 -show_list=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 -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 -no_chroot=0 -confirm_rec=0 -dnssec_info=1 -relative_paths=0 +slave_dir=/var/lib/bind +named_conf=/etc/bind/named.conf 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 -records_order=0 +reversezonefilename_format=ZONE.rev rndc_conf=/etc/bind/rndc.conf -allow_long=0 +named_path=/usr/sbin/named +confirm_zone=1 +confirm_rec=0 +ndc_cmd=ndc by_view=0 +no_chroot=0 +dnssec_info=1 +allow_wild=1 +updserial_on=1 checkzone=named-checkzone -named_conf=/etc/bind/named.conf +ipv6_mode=1 +checkconf=named-checkconf +updserial_man=1 +whois_cmd=whois +allow_comments=0 +allow_long=0 +other_slaves=1 +rev_def=0 +soa_start=0 +largezones=0 +updserial_def=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 master_dir=/var/lib/bind +show_list=0 +forwardzonefilename_format=ZONE.hosts rev_must=0 -ndc_cmd=ndc -keygen=dnssec-keygen +spf_record=0 +zones_file=/etc/bind/named.conf.local +rndcconf_cmd=rndc-confgen signzone=dnssec-signzone +relative_paths=0 +soa_style=0 +support_aaaa=1 +no_pid_chroot=0 +allow_underscore=1 +records_order=0 diff --git a/webmin/cluster-passwd/config b/webmin/cluster-passwd/config index 294c79b71..04110de95 100644 --- a/webmin/cluster-passwd/config +++ b/webmin/cluster-passwd/config @@ -1,3 +1,3 @@ max_users=200 -sort_mode=0 input_type=0 +sort_mode=0 diff --git a/webmin/cluster-software/config b/webmin/cluster-software/config index 470eaee86..fd788cb1e 100644 --- a/webmin/cluster-software/config +++ b/webmin/cluster-software/config @@ -1,2 +1,2 @@ -sort_mode=0 table_mode=0 +sort_mode=0 diff --git a/webmin/cluster-useradmin/config b/webmin/cluster-useradmin/config index 66823a62b..1e3e7d823 100644 --- a/webmin/cluster-useradmin/config +++ b/webmin/cluster-useradmin/config @@ -1,9 +1,9 @@ -conf_host_links=1 -conf_allow_sync=1 table_mode=0 +conf_allow_sync=1 conf_add_user=1 +conf_find_user=1 conf_allow_refresh=1 -conf_find_group=1 +conf_host_links=1 conf_add_group=1 -conf_find_user=1 +conf_find_group=1 sort_mode=0 diff --git a/webmin/config b/webmin/config index 32980bccc..b70167756 100644 --- a/webmin/config +++ b/webmin/config @@ -1,32 +1,33 @@ -sysinfo=0 -feedback_to= -help_height= -product=webmin -passwd_file=/etc/shadow -path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -passwd_uindex=0 -passwd_pindex=1 -find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' -log=1 +showlogin=0 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= +dateformat=dd/mon/yyyy md5pass=1 -passwd_mindex=4 showhost=0 -ld_env=LD_LIBRARY_PATH webprefix= +ld_env=LD_LIBRARY_PATH +nofeedbackcc=0 +path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin +real_os_version=18.04.1 +passwd_pindex=1 +help_width= +passwd_file=/etc/shadow +feedback_to= +product=webmin +lang=en.UTF-8 +referers_none=1 +os_version=9.0 +passwd_mindex=4 +hostnamedisplay= +sysinfo=0 real_os_type=Ubuntu Linux -dateformat=dd/mon/yyyy -showlogin=0 by_view=0 -lang=en.UTF-8 -real_os_version=18.04.1 +find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }' +log=1 +passwd_cindex=2 +theme=authentic-theme +lang_root=de.UTF-8 +passwd_uindex=0 +help_height= os_type=debian-linux -referers_none=1 +tempdelete_days=7 +md5pass=0 diff --git a/webmin/cpan/config b/webmin/cpan/config index 170970062..2eb974be6 100644 --- a/webmin/cpan/config +++ b/webmin/cpan/config @@ -1,6 +1,6 @@ -incyum=1 +save_partial=0 refresh_days=30 -incpackages=1 -packages=http://www.cpan.org/modules/02packages.details.txt.gz cpan=http://www.cpan.org/authors/id -save_partial=0 +packages=http://www.cpan.org/modules/02packages.details.txt.gz +incyum=1 +incpackages=1 diff --git a/webmin/cron/config b/webmin/cron/config index fd8420f9a..00ff8a0be 100644 --- a/webmin/cron/config +++ b/webmin/cron/config @@ -1,26 +1,26 @@ +max_len=80 +kill_subs=0 +cron_dir=/var/spool/cron/crontabs +init_name=cron cron_input=1 +cron_get_command=crontab -u USER -l run_parts=run-parts +system_crontab=/etc/crontab cron_deny_all=2 -kill_subs=0 -cron_delete_command=crontab -u USER -r -cron_edit_command=crontab -u USER -e -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 -show_comment=0 -cron_deny_file=/var/spool/cron/deny +cron_user_get_command=crontab -l show_time=0 -cronfiles_dir=/etc/cron.d match_user=1 -match_mode=0 -cron_get_command=crontab -u USER -l -max_jobs=100 -cron_user_get_command=crontab -l -system_crontab=/etc/crontab +cron_edit_command=crontab -u USER -e hourly_only=0 -init_name=cron -max_len=80 +cron_allow_file=/var/spool/cron/allow +cron_delete_command=crontab -u USER -r +max_jobs=100 +cronfiles_dir=/etc/cron.d +match_mode=0 +cron_user_edit_command=crontab -e +vixie_cron=1 +show_comment=0 +cron_deny_file=/var/spool/cron/deny diff --git a/webmin/custom/config b/webmin/custom/config index e04c3678d..14aa50381 100644 --- a/webmin/custom/config +++ b/webmin/custom/config @@ -1,4 +1,4 @@ -params_file=0 display_mode=0 -params_cmd=0 +params_file=0 columns=2 +params_cmd=0 diff --git a/webmin/dhcpd/config b/webmin/dhcpd/config index d6d8ec942..d37d98d9b 100644 --- a/webmin/dhcpd/config +++ b/webmin/dhcpd/config @@ -1,17 +1,17 @@ -display_max=100 -show_mac=0 -lease_vendor=0 -interfaces_type=debian -lease_tz=0 -lease_sort=0 -lease_file=/var/lib/dhcp/dhcpd.leases group_name=0 +dhcpd_conf=/etc/dhcp/dhcpd.conf 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 +pid_file=/var/run/dhcpd.pid +show_mac=0 +display_max=100 desc_name=0 +interfaces_type=debian show_ip=0 -stop_cmd=service isc-dhcp-server stop +lease_file=/var/lib/dhcp/dhcpd.leases +lease_tz=0 +lease_sort=0 +dhcpd_path=/usr/sbin/dhcpd dhcpd_nocols=5 +stop_cmd=service isc-dhcp-server stop +lease_vendor=0 diff --git a/webmin/dovecot/config b/webmin/dovecot/config index 6d7e53058..3b7bed0ed 100644 --- a/webmin/dovecot/config +++ b/webmin/dovecot/config @@ -1,4 +1,4 @@ dovecot_config=/etc/dovecot/dovecot.conf -dovecot=/usr/sbin/dovecot pid_file=/var/run/dovecot/master.pid init_script=dovecot +dovecot=/usr/sbin/dovecot diff --git a/webmin/exim/config b/webmin/exim/config index 41602ebc7..ef1ee9d12 100644 --- a/webmin/exim/config +++ b/webmin/exim/config @@ -1,8 +1,8 @@ exim_dbmfile=/etc/exim4/local_domains -exim_mail_file=Maildir -mail_system=1 -exim_aliasfileext= exim_addrfile=/etc/exim4/email-addresses -exim_dbmext=.dbm exim_virt_dir=/etc/exim4/aliases exim_dir=/etc/exim4 +exim_aliasfileext= +exim_dbmext=.dbm +exim_mail_file=Maildir +mail_system=1 diff --git a/webmin/fail2ban/config b/webmin/fail2ban/config index cae702a7a..0d1a71684 100644 --- a/webmin/fail2ban/config +++ b/webmin/fail2ban/config @@ -1,4 +1,4 @@ +server_cmd=/usr/bin/fail2ban-server 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 c5e814f90..8009c89b3 100644 --- a/webmin/fetchmail/config +++ b/webmin/fetchmail/config @@ -1,6 +1,6 @@ view_mode=0 -config_file= -pid_file=/var/run/fetchmail.pid fetchmail_path=fetchmail +config_file= max_users=400 daemon_user=root +pid_file=/var/run/fetchmail.pid diff --git a/webmin/filter/config b/webmin/filter/config index 946cd37ec..a551ef711 100644 --- a/webmin/filter/config +++ b/webmin/filter/config @@ -1,6 +1,6 @@ -alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases reply_force=0 -virtualmin_config=/etc/webmin/virtual-server virtualmin_spam=/etc/webmin/virtual-server/lookup-domain.pl forward_procmail=0 warn_procmail=1 +virtualmin_config=/etc/webmin/virtual-server +alias_files=/etc/aliases /etc/postfix/aliases /etc/mail/aliases diff --git a/webmin/firewall/config b/webmin/firewall/config index 0dadcf4d4..dd0788880 100644 --- a/webmin/firewall/config +++ b/webmin/firewall/config @@ -1,6 +1,6 @@ -cluster_mode=1 -direct=0 -comment_mod=0 force_init=0 view_condition=1 +cluster_mode=1 +comment_mod=0 +direct=0 view_comment=0 diff --git a/webmin/firewall6/config b/webmin/firewall6/config index e2b36c045..0dadcf4d4 100644 --- a/webmin/firewall6/config +++ b/webmin/firewall6/config @@ -1,6 +1,6 @@ -force_init=0 +cluster_mode=1 +direct=0 comment_mod=0 -view_comment=0 +force_init=0 view_condition=1 -direct=0 -cluster_mode=1 +view_comment=0 diff --git a/webmin/firewalld/config b/webmin/firewalld/config index 0aae64fac..ff329a00d 100644 --- a/webmin/firewalld/config +++ b/webmin/firewalld/config @@ -1,2 +1,2 @@ -init_name=firewalld firewall_cmd=firewall-cmd +init_name=firewalld diff --git a/webmin/fsdump/config b/webmin/fsdump/config index 9b29de11d..2d0c473a0 100644 --- a/webmin/fsdump/config +++ b/webmin/fsdump/config @@ -1,7 +1,7 @@ -nonewtape=0 -webmin_subs=0 +date_subs=0 simple_sched=0 +error_email=0 +webmin_subs=0 +nonewtape=0 run_mode=0 always_tar=0 -error_email=0 -date_subs=0 diff --git a/webmin/grub/config b/webmin/grub/config index 49d2d2860..2bb2e4e49 100644 --- a/webmin/grub/config +++ b/webmin/grub/config @@ -1,3 +1,3 @@ -menu_file=/boot/grub/menu.lst grub_path=grub install=(hd0) +menu_file=/boot/grub/menu.lst diff --git a/webmin/heartbeat/config b/webmin/heartbeat/config index 8ed741671..71f56c61d 100644 --- a/webmin/heartbeat/config +++ b/webmin/heartbeat/config @@ -1,15 +1,15 @@ -alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +authkeys= +alt_ha_cf=/usr/share/doc/packages/heartbeat/ha.cf +ha_cf= serials=/dev/ttyS* -haresources= +start_cmd=/etc/init.d/heartbeat start +pid_file=/var/run/heartbeat.pid ha_dir=/etc/ha.d +resource_d= req_resource_cmd=/usr/lib/heartbeat/req_resource -stop_cmd=/etc/init.d/heartbeat stop -heartbeat=/usr/lib/heartbeat/heartbeat -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 -pid_file=/var/run/heartbeat.pid +alt_authkeys=/usr/share/doc/packages/heartbeat/authkeys +heartbeat=/usr/lib/heartbeat/heartbeat apply_cmd=/etc/init.d/heartbeat reload +haresources= +stop_cmd=/etc/init.d/heartbeat stop diff --git a/webmin/htaccess-htpasswd/config b/webmin/htaccess-htpasswd/config index ac6b6f22e..dacc158d0 100644 --- a/webmin/htaccess-htpasswd/config +++ b/webmin/htaccess-htpasswd/config @@ -1,8 +1,8 @@ -sha1=0 -htaccess=.htaccess -htgroups=.htgroups -extra_directives= md5=1 +extra_directives= htpasswd=.htpasswd +htgroups=.htgroups +htaccess=.htaccess digest=1 sort=0 +sha1=0 diff --git a/webmin/idmapd/config b/webmin/idmapd/config index d6cd4227f..bbb774e0d 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 +restart_command=if killall -HUP rpc.idmapd; then /bin/true; else rpc.idmapd; fi diff --git a/webmin/inetd/config b/webmin/inetd/config index b1a8392f9..9d2722284 100644 --- a/webmin/inetd/config +++ b/webmin/inetd/config @@ -1,16 +1,16 @@ -ipv6=0 +tcpd_path=/usr/sbin/tcpd +display_max=100 rpc_file=/etc/rpc -restart_command=killall -HUP inetd -deny_file=/etc/hosts.deny -show_empty=1 -services_file=/etc/services 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 +services_file=/etc/services inetd_conf_file=/etc/inetd.conf +sort_mode=0 +ipv6=0 +deny_file=/etc/hosts.deny +restart_command=killall -HUP inetd +protocols_file=/etc/protocols +qm_mode=0 +show_empty=1 rpc_protocols=tcp udp +extended_inetd=1 diff --git a/webmin/init/config b/webmin/init/config index 5cdd69395..cb4095d8e 100644 --- a/webmin/init/config +++ b/webmin/init/config @@ -1,17 +1,17 @@ -reboot_command=reboot -no_chkconfig=0 +show_opts=0 +order=0 soft_links=1 +init_info=1 inittab_id=id +atboot_product=webmin init_base=/etc/ -init_dir=/etc/init.d -show_opts=0 -expert=0 -init_info=1 -desc=1 +no_chkconfig=0 status_check=0 order_digits=2 -shutdown_command=poweroff +init_dir=/etc/init.d sort_mode=0 boot_levels=2 3 5 -atboot_product=webmin -order=0 +shutdown_command=poweroff +reboot_command=reboot +desc=1 +expert=0 diff --git a/webmin/inittab/config b/webmin/inittab/config index c2b25728b..31db3e7b1 100644 --- a/webmin/inittab/config +++ b/webmin/inittab/config @@ -1,2 +1,2 @@ -telinit=telinit inittab_file=/etc/inittab +telinit=telinit diff --git a/webmin/installed.cache b/webmin/installed.cache index bb22db244..1cba4560a 100644 --- a/webmin/installed.cache +++ b/webmin/installed.cache @@ -109,3 +109,4 @@ mailboxes=1 logrotate=1 postfix=1 init=1 +logviewer=1 diff --git a/webmin/ipfilter/config b/webmin/ipfilter/config index d0aa8c90f..0c4481112 100644 --- a/webmin/ipfilter/config +++ b/webmin/ipfilter/config @@ -1,9 +1,9 @@ -ipf=ipf -view_condition=1 +ipfstat=ipfstat +ipf_conf=/etc/ipf/ipf.conf view_comment=0 ipnat_conf=/etc/ipf/ipnat.conf +ipf=ipf cluster_mode=0 -ipf_conf=/etc/ipf/ipf.conf ipnat=ipnat -ipfstat=ipfstat +view_condition=1 cluster_nat=1 diff --git a/webmin/ipfw/config b/webmin/ipfw/config index 1fe9c223f..b92066caa 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 ipfw=/sbin/ipfw +view_condition=1 +view_comment=0 +cluster_mode=0 diff --git a/webmin/ipsec/config b/webmin/ipsec/config index 0b4223b31..9b88cffbb 100644 --- a/webmin/ipsec/config +++ b/webmin/ipsec/config @@ -1,8 +1,8 @@ file=/etc/ipsec.conf -restart_cmd=/etc/init.d/ipsec restart +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 +stop_cmd=/etc/init.d/ipsec stop +logfile=/var/log/messages +restart_cmd=/etc/init.d/ipsec restart start_cmd=/etc/init.d/ipsec start -secrets=/etc/ipsec.secrets diff --git a/webmin/iscsi-client/config b/webmin/iscsi-client/config index ff8eac0eb..192a65bef 100644 --- a/webmin/iscsi-client/config +++ b/webmin/iscsi-client/config @@ -1,6 +1,6 @@ -config_file=/etc/iscsi/iscsid.conf -iscsiadm=iscsiadm iscsiiname=iscsi-iname -ifaces_dir=/var/lib/iscsi/ifaces -initiator_file=/etc/iscsi/initiatorname.iscsi init_name=open-iscsi +initiator_file=/etc/iscsi/initiatorname.iscsi +iscsiadm=iscsiadm +config_file=/etc/iscsi/iscsid.conf +ifaces_dir=/var/lib/iscsi/ifaces diff --git a/webmin/iscsi-server/config b/webmin/iscsi-server/config index 84ae0cb6a..ccccd47c8 100644 --- a/webmin/iscsi-server/config +++ b/webmin/iscsi-server/config @@ -1,6 +1,6 @@ -auths_file=/etc/iscsi/auths iscsi_server=/usr/sbin/iscsi-target -pid_file=/var/run/iscsi-target.pid targets_file=/etc/iscsi/targets +pid_file=/var/run/iscsi-target.pid opts_file=/etc/sysconfig/netbsd-iscsi +auths_file=/etc/iscsi/auths init_name=netbsd-iscsi diff --git a/webmin/iscsi-target/config b/webmin/iscsi-target/config index 7c517d529..7f92b205c 100644 --- a/webmin/iscsi-target/config +++ b/webmin/iscsi-target/config @@ -1,7 +1,7 @@ config_file=/etc/iet/ietd.conf -initiators_file=/etc/iet/initiators.allow ietadm=ietadm -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 +targets_file=/etc/iet/targets.allow +initiators_file=/etc/iet/initiators.allow +init_name=iscsitarget diff --git a/webmin/iscsi-tgtd/config b/webmin/iscsi-tgtd/config index 6010bceef..32ef099ea 100644 --- a/webmin/iscsi-tgtd/config +++ b/webmin/iscsi-tgtd/config @@ -1,5 +1,5 @@ -tgtadmin=tgt-admin +tgtadm=tgtadm init_name=tgtd tgtd=tgtd +tgtadmin=tgt-admin config_file=/etc/tgt/targets.conf -tgtadm=tgtadm diff --git a/webmin/jabber/config b/webmin/jabber/config index 2d3456223..ca2b8b95c 100644 --- a/webmin/jabber/config +++ b/webmin/jabber/config @@ -1,5 +1,5 @@ -jabber_config=/etc/jabber/jabber.xml -stop_cmd=/etc/init.d/jabberd stop -jabber_daemon=/usr/sbin/jabberd start_cmd=/etc/init.d/jabberd start jabber_dir=/var/lib/jabber +jabber_daemon=/usr/sbin/jabberd +jabber_config=/etc/jabber/jabber.xml +stop_cmd=/etc/init.d/jabberd stop diff --git a/webmin/ldap-client/config b/webmin/ldap-client/config index 41ce77d5e..4460f14f7 100644 --- a/webmin/ldap-client/config +++ b/webmin/ldap-client/config @@ -1,3 +1,3 @@ -init_name=nslcd -secret=/etc/ldap.secret auth_ldap=/etc/ldap.conf +secret=/etc/ldap.secret +init_name=nslcd diff --git a/webmin/ldap-server/config b/webmin/ldap-server/config index 180728c4c..f947f9b77 100644 --- a/webmin/ldap-server/config +++ b/webmin/ldap-server/config @@ -1,10 +1,10 @@ -init_name=slapd +schema_dir=/etc/ldap/schema +config_file=/etc/ldap/slapd.d +browse_max=100 +attr_count=6 start_cmd=/etc/init.d/slapd start stop_cmd=/etc/init.d/slapd stop -browse_max=100 -slapd=slapd -schema_dir=/etc/ldap/schema +init_name=slapd apply_cmd=/etc/init.d/slapd restart -attr_count=6 +slapd=slapd ldap_user=openldap -config_file=/etc/ldap/slapd.d diff --git a/webmin/ldap-useradmin/config b/webmin/ldap-useradmin/config index 3301f5b63..5e7d7c86d 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 -alias_same=0 samba_class=sambaSamAccount -samba_gclass=sambaGroup -auth_ldap=/etc/ldap.conf -mailfmt=0 -slappasswd=slappasswd given=0 -imap_login=cyrus -gecos=1 +membox=0 shells=fixed,ldap,passwd,shells +md5=0 imap_folders=old public sent-mail +gecos=1 +mailfmt=0 +imap_foldersep=. +alias_same=0 +other_class=inetOrgPerson secmode=0 -multi_fields=0 -samba_def=0 +samba_gclass=sambaGroup +auth_ldap=/etc/ldap.conf +given_order=0 imap_class=SuSEeMailObject +samba_def=0 +slappasswd=slappasswd +imap_def=0 +quota_support=0 +ldap_tls=0 +multi_fields=0 person=1 +imap_login=cyrus diff --git a/webmin/logrotate/config b/webmin/logrotate/config index b85fb9a25..13d7f4354 100644 --- a/webmin/logrotate/config +++ b/webmin/logrotate/config @@ -1,4 +1,4 @@ -add_file=/etc/logrotate.d logrotate_conf=/etc/logrotate.conf -logrotate=logrotate sort_mode=0 +logrotate=logrotate +add_file=/etc/logrotate.d diff --git a/webmin/logviewer/config b/webmin/logviewer/config new file mode 100644 index 000000000..0a13fef3d --- /dev/null +++ b/webmin/logviewer/config @@ -0,0 +1,3 @@ +lines=100 +reverse=1 +others=1 diff --git a/webmin/lpadmin/config b/webmin/lpadmin/config index 612c41c48..a3883876d 100644 --- a/webmin/lpadmin/config +++ b/webmin/lpadmin/config @@ -1,17 +1,17 @@ -gs_path=gs -sort_mode=0 -display_mode=0 +spool_dir=/var/spool/cups +smbclient_path=smbclient model_path=/usr/share/foomatic/db /usr/share/ppd iface_perms=755 -start_cmd=/etc/init.d/cupsys start -smbclient_path=smbclient -gs_lib= driver_style=cups -iface_owner=lp:lp -show_jobs=0 -show_status=0 stop_cmd=/etc/init.d/cupsys stop -iface_arg= -spool_dir=/var/spool/cups +display_mode=0 +show_jobs=0 +sort_mode=0 print_style=cups +show_status=0 +gs_path=gs gs_fontpath= +iface_owner=lp:lp +gs_lib= +iface_arg= +start_cmd=/etc/init.d/cupsys start diff --git a/webmin/mailboxes/config b/webmin/mailboxes/config index 68785822e..d0abe3a4d 100644 --- a/webmin/mailboxes/config +++ b/webmin/mailboxes/config @@ -1,52 +1,52 @@ -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 +top_buttons=2 sync_modify=1 +show_size_below=0 +delete_warn=y 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 -view_html=0 -sync_create=0 -date_fmt=dmy -size_mode=1 -html_quote=0 -noindex_hostname=0 +link_mode=0 vpopmail_dir=/home/vpopmail -max_records=200 -maildir_deleted=0 -show_body=0 +show_mail=0 +show_size=1 +show_delall=0 +no_orig_ip=0 show_to=0 +spam_report= +show_count=0 +check_mod=1 +html_edit=0 +no_crlf=0 +date_fmt=dmy +from_virtualmin=1 +show_unread=0 mail_dir=Maildir -open_mode=0 +ignore_users_enabled=0 +mailbox_user=.usermin/mailbox +sync_delete=1 +sort_mode=1 +spam_buttons=mail spam_del=0 -check_mod=1 -show_delall=0 +open_mode=0 +maildir_deleted=0 +track_read=0 +max_records=200 +no_mailer=0 +view_html=0 +perpage=20 log_read=0 -show_mail=0 -spam_buttons=mail -delete_warn=y -show_size_below=0 +show_body=0 +html_quote=0 +column_count=4 +mail_usermin=mail +auto=1 +sync_perms=0700 +sync_create=0 show_sent=0 +size_mode=1 +arrows=1 +noindex_hostname=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= +ignore_users= diff --git a/webmin/man/config b/webmin/man/config index 6bf4ed50f..bb0375975 100644 --- a/webmin/man/config +++ b/webmin/man/config @@ -1,9 +1,9 @@ +man_cmd=man PAGE man_cmd_sect=man SECTION PAGE -search_cmd=man -k PAGE -list_cmd_sect=man -w SECTION PAGE -man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man man2html_path=man2html kernel_dir=/usr/src/linux/Documentation -list_cmd=man -w PAGE -man_cmd=man PAGE doc_dir=/usr/share/doc +list_cmd_sect=man -w SECTION PAGE +search_cmd=man -k PAGE +list_cmd=man -w PAGE +man_dir=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index ddda3347c..ca55960ae 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.994 +server=MiniServ/1.995 diff --git a/webmin/mon/config b/webmin/mon/config index e80ad00b2..36e33c561 100644 --- a/webmin/mon/config +++ b/webmin/mon/config @@ -1,7 +1,7 @@ -cfbasedir=/etc/mon -restart_cmd=/etc/init.d/mon restart pid_file=/var/run/mon.pid -monshow=/usr/bin/monshow -mon_cgi=/var/www/cgi-bin/mon.cgi +restart_cmd=/etc/init.d/mon restart start_cmd=/etc/init.d/mon start +cfbasedir=/etc/mon +monshow=/usr/bin/monshow stop_cmd=/etc/init.d/mon stop +mon_cgi=/var/www/cgi-bin/mon.cgi diff --git a/webmin/mount/config b/webmin/mount/config index 73eceb067..4aa74d305 100644 --- a/webmin/mount/config +++ b/webmin/mount/config @@ -1,10 +1,10 @@ -show_used=1 -nmblookup_path=nmblookup +long_fstypes=1 sysinfo=1 -smbclient_path=smbclient +nmblookup_path=nmblookup auto_file=/etc/am-utils/amd.conf fstab_file=/etc/fstab -long_fstypes=1 autofs_file=/etc/auto.master -sort_mode=2 +show_used=1 nfs_check=1 +sort_mode=2 +smbclient_path=smbclient diff --git a/webmin/mysql/config b/webmin/mysql/config index 1d3fb19ca..cbc913633 100644 --- a/webmin/mysql/config +++ b/webmin/mysql/config @@ -1,23 +1,23 @@ -webmin_subs=0 -mysql_data=/var/lib/mysql +mysqldump=/usr/bin/mysqldump +nopwd=0 +max_dbs=50 +mysqlshow=/usr/bin/mysqlshow perpage=25 mysql=/usr/bin/mysql -access=*: * -max_text=1000 -nopwd=0 -blob_mode=0 +start_cmd=service mysql start +add_mode=1 nodbi=0 +blob_mode=0 +max_text=1000 +login=root +my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf +stop_cmd=service mysql stop +webmin_subs=0 date_subs=0 +mysqlimport=/usr/bin/mysqlimport +mysql_data=/var/lib/mysql +passwd_mode=0 +access=*: * 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 -start_cmd=service mysql start -passwd_mode=0 style=0 -mysqlimport=/usr/bin/mysqlimport -mysqldump=/usr/bin/mysqldump -my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf diff --git a/webmin/nis/config b/webmin/nis/config index a1e29aa7b..e646d3aea 100644 --- a/webmin/nis/config +++ b/webmin/nis/config @@ -1,5 +1,5 @@ +nsswitch_conf=/etc/nsswitch.conf client_conf=/etc/yp.conf -max_size=100 securenets=/etc/ypserv.securenets +max_size=100 manual_build=0 -nsswitch_conf=/etc/nsswitch.conf diff --git a/webmin/openslp/config b/webmin/openslp/config index a7a4992c5..d5b561a8c 100644 --- a/webmin/openslp/config +++ b/webmin/openslp/config @@ -1,5 +1,5 @@ -slpd_reg=/etc/slp.reg -slpd_pid=/var/run/slpd.pid slpd_conf=/etc/slp.conf +slpd_pid=/var/run/slpd.pid +slpd_reg=/etc/slp.reg slpd_log=/var/log/slpd.log slpd=/usr/sbin/slpd diff --git a/webmin/package-updates/config b/webmin/package-updates/config index 195d872e7..226c127d1 100644 --- 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 b3d9581d6..2d867ee25 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 +pam_dir=/etc/pam.d +mod_equiv=pam_unix_acct.so=pam_pwdb.so pam_unix_auth.so=pam_pwdb.so pam_unix_passwd.so=pam_pwdb.so pam_unix_session.so=pam_pwdb.so pam_unix_sess.so=pam_pwdb.so pam_unix.so=pam_pwdb.so ignore=README diff --git a/webmin/pap/config b/webmin/pap/config index f73db29d9..660b0a595 100644 --- a/webmin/pap/config +++ b/webmin/pap/config @@ -1,8 +1,8 @@ +login_config=/etc/mgetty+sendfax/login.config mgetty=mgetty -serials=/dev/ttyS[0-9]* ppp_options=/etc/ppp/options dialin_config=/etc/mgetty+sendfax/dialin.config encrypt_pass=0 -pppd=pppd -login_config=/etc/mgetty+sendfax/login.config +serials=/dev/ttyS[0-9]* pap_file=/etc/ppp/pap-secrets +pppd=pppd diff --git a/webmin/passwd/config b/webmin/passwd/config index 75e5ffcde..294c79b71 100644 --- a/webmin/passwd/config +++ b/webmin/passwd/config @@ -1,3 +1,3 @@ -input_type=0 max_users=200 sort_mode=0 +input_type=0 diff --git a/webmin/postfix/config b/webmin/postfix/config index 1e3e16641..bde43bcef 100644 --- a/webmin/postfix/config +++ b/webmin/postfix/config @@ -1,29 +1,29 @@ -postfix_aliases_table_command=/usr/sbin/postalias -postcat_cmd=/usr/sbin/postcat -postfix_lookup_table_command=/usr/sbin/postmap -mailq_cmd=postqueue -p -max_records=200 -show_cmts=0 -index_check=1 -postfix_queue_command=postqueue postfix_master=/etc/postfix/master.cf +sort_mode=0 delete_confirm=1 -mailq_dir=/var/spool/postfix -check_config=1 -delete_warn=1 -perpage=20 -fwd_mode=0 +mailq_sort=0 mailq_count=0 -prefix_cmts=0 -postfix_config_file=/etc/postfix/main.cf +mailq_cmd=postqueue -p +ldap_doms=0 +postfix_aliases_table_command=/usr/sbin/postalias +index_check=1 +max_maps=100 +postfix_super_command=/usr/sbin/postsuper +mailq_dir=/var/spool/postfix postfix_control_command=/usr/sbin/postfix +postfix_config_file=/etc/postfix/main.cf +prefix_cmts=0 +postfix_config_command=/usr/sbin/postconf +perpage=20 +postcat_cmd=/usr/sbin/postcat +show_cmts=0 columns=2 -max_maps=100 +postfix_lookup_table_command=/usr/sbin/postmap +delete_warn=1 wrap_width=80 -postfix_config_command=/usr/sbin/postconf -mailq_sort=0 +postfix_queue_command=postqueue +fwd_mode=0 postfix_newaliases_command=/usr/bin/newaliases -sort_mode=0 -postfix_super_command=/usr/sbin/postsuper -ldap_doms=0 +check_config=1 top_buttons=1 +max_records=200 diff --git a/webmin/postgresql/config b/webmin/postgresql/config index ebfb54527..add92b298 100644 --- a/webmin/postgresql/config +++ b/webmin/postgresql/config @@ -1,24 +1,24 @@ -hba_conf=/etc/postgresql/*/main/pg_hba.conf -rstr_cmd=/usr/bin/pg_restore -style=0 +perpage=25 +pid_file=/var/run/postmaster.pid start_cmd=/etc/init.d/postgresql* start +add_mode=1 +simple_sched=0 +blob_mode=0 +nodbi=0 +rstr_cmd=/usr/bin/pg_restore +max_text=1000 login=postgres -sameunix=1 -psql=/usr/bin/psql max_dbs=50 -plib= dump_cmd=/usr/bin/pg_dump pass= -add_mode=1 -stop_cmd=/etc/init.d/postgresql* stop -access_own=0 +plib= +hba_conf=/etc/postgresql/*/main/pg_hba.conf +sameunix=1 basedb=template1 +style=0 +stop_cmd=/etc/init.d/postgresql* stop +webmin_subs=0 date_subs=0 -blob_mode=0 -nodbi=0 -pid_file=/var/run/postmaster.pid -simple_sched=0 -max_text=1000 +access_own=0 +psql=/usr/bin/psql access=*: * -perpage=25 -webmin_subs=0 diff --git a/webmin/ppp-client/config b/webmin/ppp-client/config index 7af13e89f..5fd0f800c 100644 --- a/webmin/ppp-client/config +++ b/webmin/ppp-client/config @@ -1,3 +1,3 @@ +wvdialconf=wvdialconf file=/etc/wvdial.conf wvdial=wvdial -wvdialconf=wvdialconf diff --git a/webmin/pptp-client/config b/webmin/pptp-client/config index 037866532..6525162d6 100644 --- a/webmin/pptp-client/config +++ b/webmin/pptp-client/config @@ -1,5 +1,5 @@ -peers_dir=/etc/ppp/peers -pptp_options=/etc/ppp/options.pptp -timeout=30 -pptp=pptp pap_file=/etc/ppp/chap-secrets +pptp=pptp +timeout=30 +pptp_options=/etc/ppp/options.pptp +peers_dir=/etc/ppp/peers diff --git a/webmin/pptp-server/config b/webmin/pptp-server/config index 6dfe23ff7..b4bc0bd31 100644 --- a/webmin/pptp-server/config +++ b/webmin/pptp-server/config @@ -1,9 +1,9 @@ -ppp_options=/etc/ppp/options -log_file=/var/log/messages pptp_ppp_options=/etc/ppp/pptpd-options +file=/etc/pptpd.conf +pap_file=/etc/ppp/chap-secrets +ppp_options=/etc/ppp/options pptpd=pptpd stop_cmd=/etc/init.d/pptpd stop +log_file=/var/log/messages start_cmd=/etc/init.d/pptpd start -pap_file=/etc/ppp/chap-secrets pid_file=/var/run/pptpd.pid -file=/etc/pptpd.conf diff --git a/webmin/proc/config b/webmin/proc/config index dec53dd48..3743d078f 100644 --- a/webmin/proc/config +++ b/webmin/proc/config @@ -1,6 +1,6 @@ +trace_java=0 hide_self=1 cut_length=80 -ps_style=linux -default_mode=last -trace_java=0 base_ppid=1 +default_mode=last +ps_style=linux diff --git a/webmin/procmail/config b/webmin/procmail/config index 9b36ccfbe..d5df94749 100644 --- a/webmin/procmail/config +++ b/webmin/procmail/config @@ -1,3 +1,3 @@ -procmail=procmail -procmailrc=/etc/procmailrc includes=0 +procmailrc=/etc/procmailrc +procmail=procmail diff --git a/webmin/proftpd/config b/webmin/proftpd/config index a89f043a0..7745c8c4d 100644 --- a/webmin/proftpd/config +++ b/webmin/proftpd/config @@ -1,9 +1,9 @@ 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 stop_cmd=/etc/init.d/proftpd stop -test_config=1 +ftpusers=/etc/ftpusers start_cmd=/etc/init.d/proftpd start +pid_file=/var/run/proftpd.pid +test_always=0 +proftpd_path=/usr/sbin/proftpd +test_config=1 +proftpd_conf=/etc/proftpd/proftpd.conf diff --git a/webmin/qmailadmin/config b/webmin/qmailadmin/config index 13e39d5c8..da1b17541 100644 --- a/webmin/qmailadmin/config +++ b/webmin/qmailadmin/config @@ -1,14 +1,14 @@ -mail_system=1 -mail_dir_qmail=Maildir -index_min=1000000 +mailq_sort=0 sort_mode=0 +mail_file=Mailbox mail_dir= -mailq_sort=0 -columns=2 -max_records=200 -mailq_count=0 -fwd_mode=0 +index_min=1000000 +mail_system=1 +mail_dir_qmail=Maildir qmail_dir=/var/qmail -mail_file=Mailbox +mailq_count=0 perpage=20 +fwd_mode=0 +columns=2 delete_warn=1 +max_records=200 diff --git a/webmin/quota/config b/webmin/quota/config index d7352efa2..d0c2eaf2f 100644 --- a/webmin/quota/config +++ b/webmin/quota/config @@ -1,25 +1,25 @@ 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 -user_quota_command=quota -v -u user_edquota_command=edquota -u -group_edquota_command=edquota -g -user_quotaon_command=quotaon -u +display_max=100 group_grace_command=edquota -g -t +user_grace_command=edquota -u -t +email_msg=Disk usage for user ${USER} on filesystem ${FS} has reached ${PERCENT}% of the allowed quota. ${USED} of disk space is being used, out of a maximum of ${QUOTA}. user_setquota_command=setquota -u +group_repquota_command=repquota -g -v +user_quotaoff_command=quotaoff -u +user_repquota_command=repquota -u -v user_copy_command=edquota -u -p +user_quotaon_command=quotaon -u +group_edquota_command=edquota -g +group_setquota_command=setquota -g +user_quota_command=quota -v -u +block_mode=1 block_size=1024 -show_grace=1 -group_repquota_command=repquota -g -v -hide_uids=0 group_quota_command=quota -v -g +pc_show=1 +quotacheck_command=quotacheck -u -g +hide_uids=0 +group_quotaoff_command=quotaoff -g +sort_mode=0 +group_copy_command=edquota -g -p +show_grace=1 diff --git a/webmin/raid/config b/webmin/raid/config index 4bd2da90e..7e973e1af 100644 --- a/webmin/raid/config +++ b/webmin/raid/config @@ -1,3 +1,3 @@ -mdstat=/proc/mdstat raidtab=/etc/raidtab +mdstat=/proc/mdstat mdadm=/etc/mdadm/mdadm.conf diff --git a/webmin/reload b/webmin/reload index ed85cb533..cc05564b4 100755 --- a/webmin/reload +++ b/webmin/reload @@ -1,2 +1,2 @@ #!/bin/sh -/etc/webmin/.reload-init >/dev/null 2>&1 +/bin/systemctl reload webmin diff --git a/webmin/restart-by-force-kill b/webmin/restart-by-force-kill index 4ce26d90e..b88aa3319 100755 --- a/webmin/restart-by-force-kill +++ b/webmin/restart-by-force-kill @@ -1,4 +1,4 @@ #!/bin/sh -/etc/webmin/.stop-init --kill >/dev/null 2>&1 /bin/systemctl stop webmin +/etc/webmin/.stop-init --kill >/dev/null 2>&1 /bin/systemctl start webmin diff --git a/webmin/samba/config b/webmin/samba/config index 343b04835..e2a27a0d6 100644 --- a/webmin/samba/config +++ b/webmin/samba/config @@ -1,18 +1,18 @@ +samba_password_program=/usr/bin/smbpasswd sort_mode=0 -net=/usr/bin/net -smb_passwd=/etc/samba/smbpasswd -restart_cmd=service smbd restart ; service nmbd restart -start_cmd=service smbd start ; service nmbd start +pdbedit=/usr/bin/pdbedit +name_server=/usr/sbin/nmbd 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 +text_lists=0 +restart_cmd=service smbd restart ; service nmbd restart +start_cmd=service smbd start ; service nmbd start run_from_inetd=0 smbgroupedit=/usr/bin/smbgroupedit samba_status_program=/usr/bin/smbstatus +net=/usr/bin/net dont_convert=-499 -name_server=/usr/sbin/nmbd -pdbedit=/usr/bin/pdbedit +smb_conf=/etc/samba/smb.conf +stop_cmd=service smbd stop ; service nmbd stop +smb_passwd=/etc/samba/smbpasswd diff --git a/webmin/sarg/config b/webmin/sarg/config index a8477b752..2afcf8310 100644 --- a/webmin/sarg/config +++ b/webmin/sarg/config @@ -1,4 +1,4 @@ -clear=1 sarg_conf=/etc/sarg/sarg.conf naked=0 sarg=sarg +clear=1 diff --git a/webmin/sendmail/config b/webmin/sendmail/config index 6ee6adc3e..47bb253a3 100644 --- a/webmin/sendmail/config +++ b/webmin/sendmail/config @@ -1,30 +1,30 @@ -mailq_count=0 -prefix_cmts=0 -perpage=20 +delete_confirm=1 +mailq_sort=0 mail_file=mbox -fwd_mode=0 +sort_mode=0 +smrsh_dir=/etc/smrsh +mail_dir=/var/spool/mail mail_style=0 -delete_warn=1 index_min=1000000 -sort_mode=0 -sendmail_features=/usr/share/sendmail/cf -top_buttons=1 +mailq_count=0 +sendmail_path=/usr/lib/sendmail sendmail_pid=/var/run/sendmail/mta/sendmail.pid -mailq_sort=0 -wrap_width=80 +makemap_path=makemap +sendmail_cf=/etc/mail/sendmail.cf +sendmail_command=/usr/lib/sendmail -bd -q1h +show_to=0 mail_type=0 -columns=2 -sendmail_mc=/etc/mail/sendmail.mc -max_records=200 +sendmail_features=/usr/share/sendmail/cf show_cmts=0 -mailq_show=Date,From,To,Size,Status -smrsh_dir=/etc/smrsh -makemap_path=makemap +prefix_cmts=0 order_mail=0 -sendmail_cf=/etc/mail/sendmail.cf +mailq_show=Date,From,To,Size,Status +perpage=20 +fwd_mode=0 +wrap_width=80 +columns=2 +delete_warn=1 +max_records=200 +sendmail_mc=/etc/mail/sendmail.mc +top_buttons=1 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 f1549a0e1..83ead12c0 100644 --- a/webmin/servers/config +++ b/webmin/servers/config @@ -1,11 +1,11 @@ -scan_time=5 +show_ip=0 +deffast=2 +capath=/usr/share/ca-certificates display_mode=0 +max_servers=100 +scan_time=5 +deflink=0 +resolve=1 sort_mode=0 show_status=1 -show_ip=0 -deflink=0 groups_dir=/etc/cluster/groups -deffast=2 -resolve=1 -max_servers=100 -capath=/usr/share/ca-certificates diff --git a/webmin/shorewall/config b/webmin/shorewall/config index 5fb82ba27..c7f719b0e 100644 --- a/webmin/shorewall/config +++ b/webmin/shorewall/config @@ -1,5 +1,5 @@ -config_dir=/etc/shorewall -actions=/etc/shorewall/actions /usr/share/shorewall/actions.std +macros=/usr/share/shorewall display_zone_descriptions=1 +actions=/etc/shorewall/actions /usr/share/shorewall/actions.std +config_dir=/etc/shorewall shorewall=shorewall -macros=/usr/share/shorewall diff --git a/webmin/shorewall6/config b/webmin/shorewall6/config index 91ded64c1..96f657a01 100644 --- a/webmin/shorewall6/config +++ b/webmin/shorewall6/config @@ -1,5 +1,5 @@ -actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std -config_dir=/etc/shorewall6 +macros=/usr/share/shorewall6 display_zone_descriptions=1 +config_dir=/etc/shorewall6 +actions=/etc/shorewall6/actions /usr/share/shorewall6/actions.std shorewall6=shorewall6 -macros=/usr/share/shorewall6 diff --git a/webmin/smart-status/config b/webmin/smart-status/config index 89a62e9fe..d018e42e0 100644 --- a/webmin/smart-status/config +++ b/webmin/smart-status/config @@ -1,4 +1,4 @@ +smartctl=smartctl mode=1 ata=0 -smartctl=smartctl attribs=1 diff --git a/webmin/software/config b/webmin/software/config index abefc9ae1..bf587ee21 100644 --- a/webmin/software/config +++ b/webmin/software/config @@ -1,3 +1,3 @@ -apt_mode=0 package_system=debian update_system=apt +apt_mode=0 diff --git a/webmin/spam/config b/webmin/spam/config index db1e375ef..bde53ec28 100644 --- a/webmin/spam/config +++ b/webmin/spam/config @@ -1,12 +1,12 @@ -sa_learn=sa-learn -warn_procmail=1 +processes=spamd amavisd local_cf=/etc/spamassassin/local.cf +restart_cmd=/etc/init.d/spamassassin restart call_spam=1 -max_awl=200 procmail_cmd=* spamassassin=spamassassin +max_awl=200 mode=0 -addto=0 -processes=spamd amavisd -restart_cmd=/etc/init.d/spamassassin restart +sa_learn=sa-learn procmailrc=/etc/procmailrc +warn_procmail=1 +addto=0 diff --git a/webmin/squid/config b/webmin/squid/config index 05c760070..a8d5fb8db 100644 --- a/webmin/squid/config +++ b/webmin/squid/config @@ -1,21 +1,21 @@ -cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi -cal_all=1 -squidclient=squidclient -sync_create=0 -calamaris=calamaris -cal_args=-aw -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_args=-aw +calamaris=calamaris cal_max=50000 restart_pos=0 +pid_file=/var/run/squid.pid +squid_restart=service squid reload +squid_conf=/etc/squid/squid.conf +cal_all=1 +cachemgr_path=/usr/lib/cgi-bin/cachemgr.cgi +cache_dir=/var/spool/squid +squid_start=service squid start +cal_fmt=w +sync_create=0 +squidclient=squidclient sync_modify=1 -squid_path=squid crypt_conf=0 -cal_fmt=w -squid_start=service squid start +log_dir=/var/log/squid +squid_stop=service squid stop +squid_path=squid diff --git a/webmin/sshd/config b/webmin/sshd/config index dac2fab6d..817a6a025 100644 --- a/webmin/sshd/config +++ b/webmin/sshd/config @@ -1,11 +1,11 @@ +sshd_path=/usr/sbin/sshd sync_auth=1 -stop_cmd=service ssh stop -sync_pass=0 -sync_gnupg=0 -sshd_config=/etc/ssh/sshd_config -client_config=/etc/ssh/ssh_config -keygen_path=/usr/bin/ssh-keygen pid_file=/var/run/sshd.pid start_cmd=service ssh start -sshd_path=/usr/sbin/sshd +sync_pass=0 +stop_cmd=service ssh stop +keygen_path=/usr/bin/ssh-keygen sync_create=0 +sshd_config=/etc/ssh/sshd_config +sync_gnupg=0 +client_config=/etc/ssh/ssh_config diff --git a/webmin/status/config b/webmin/status/config index 0f02b6638..ae1fa3bad 100644 --- a/webmin/status/config +++ b/webmin/status/config @@ -1,14 +1,14 @@ +sysinfo=0 snmp_version=2 +sched_offset=0 +sysinfo_users=0 +output=0 +history_show=50 sort_mode=0 subject_mode=0 +snmp_trap=1.3.6.1.4.1.10000.1.1 index_status=1 +pager_cmd=sms_client history_purge=30 -sched_offset=0 -snmp_trap=1.3.6.1.4.1.10000.1.1 columns=2 -pager_cmd=sms_client -history_show=50 pinger=linux -sysinfo_users=0 -output=0 -sysinfo=0 diff --git a/webmin/syslog-ng/config b/webmin/syslog-ng/config index 38744b2e1..b2856685d 100644 --- a/webmin/syslog-ng/config +++ b/webmin/syslog-ng/config @@ -1,7 +1,7 @@ -lines=20 start_cmd=/etc/init.d/syslog-ng start -compressed=1 -syslogng_cmd=syslog-ng -stop_cmd=/etc/init.d/syslog-ng stop pid_file=/var/run/syslog-ng.pid +stop_cmd=/etc/init.d/syslog-ng stop +lines=20 syslogng_conf=/etc/syslog-ng/syslog-ng.conf +compressed=1 +syslogng_cmd=syslog-ng diff --git a/webmin/syslog/config b/webmin/syslog/config index 6ba4b67a1..dcb5b15d1 100644 --- a/webmin/syslog/config +++ b/webmin/syslog/config @@ -1,19 +1,19 @@ +pipe=1 m4_path= -pri_all=1 -syslog_conf=/etc/rsyslog.conf -socket=0 -m4_conf=0 -sync=1 -syslogd=/usr/sbin/rsyslogd -compressed=1 -lines=20 +tags=0 reverse=0 others=1 -tags=0 -signal_cmd=/usr/sbin/service rsyslog restart +sync=1 start_cmd=/usr/sbin/service rsyslog start -pri_dir=1 restart_cmd=/usr/sbin/service rsyslog restart -facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 pid_file=/var/run/rsyslogd.pid -pipe=1 +signal_cmd=/usr/sbin/service rsyslog restart +syslog_conf=/etc/rsyslog.conf +pri_all=1 +compressed=1 +lines=20 +syslogd=/usr/sbin/rsyslogd +facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 +socket=0 +m4_conf=0 +pri_dir=1 diff --git a/webmin/system-status/config b/webmin/system-status/config index c627a9fec..b6a7e4155 100644 --- a/webmin/system-status/config +++ b/webmin/system-status/config @@ -1,2 +1,2 @@ -collect_pkgs=1 collect_interval=5 +collect_pkgs=1 diff --git a/webmin/tcpwrappers/config b/webmin/tcpwrappers/config index c2cea99fc..9539a8514 100644 --- a/webmin/tcpwrappers/config +++ b/webmin/tcpwrappers/config @@ -1,3 +1,3 @@ -inetd_services=0 hosts_deny=/etc/hosts.deny +inetd_services=0 hosts_allow=/etc/hosts.allow diff --git a/webmin/telnet/config b/webmin/telnet/config index 164ed233c..a1751326a 100644 --- a/webmin/telnet/config +++ b/webmin/telnet/config @@ -1,5 +1,5 @@ -mode=1 +detach=0 sizemode=0 -no_test=0 proxy=0 -detach=0 +no_test=0 +mode=1 diff --git a/webmin/time/config b/webmin/time/config index 5a4000f56..49e693e7b 100644 --- a/webmin/time/config +++ b/webmin/time/config @@ -1,6 +1,6 @@ -timeserver_hardware=1 seconds=1 -timeserver=0.pool.ntp.org ntp_only=1 -lease=5 +timeserver_hardware=1 zone_style=linux +lease=5 +timeserver=0.pool.ntp.org diff --git a/webmin/updown/config b/webmin/updown/config index f6605280c..1f8745078 100644 --- a/webmin/updown/config +++ b/webmin/updown/config @@ -1,4 +1,4 @@ -duser=root user=root dir=/ ddir=/ +duser=root diff --git a/webmin/useradmin/config b/webmin/useradmin/config index a73aca4c6..2b13dbc9c 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -1,41 +1,41 @@ -empty_mode=0 -home_base=/home -md5=1 -membox=0 -from_files=0 -last_show=0 -passwd_progmode=0 gid_mode=1 -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 -delete_root=0 +membox=0 passwd_file=/etc/passwd -base_gid=1000 -gshadow_file=/etc/gshadow -display_mode=1 -extra_real=0 -alias_check=0 +shells=fixed,passwd,shells sort_mode=0 -gid_calc=0 -shadow_file=/etc/shadow +home_style=0 +alias_check=0 +passwd_dict=0 +md5=1 random_password=0 +default_other=1 +delete_root=0 +default_group=users uid_calc=0 -skip_md5=0 -display_max=400 -new_user_group=0 -delete_only=0 -user_files=/etc/skel -secmode=0 -lock_string=* -email_type=0 new_user_gid=0 +extra_real=0 +empty_mode=0 +email_type=0 base_uid=1000 -passwd_dict=0 -home_style=0 +skip_md5=0 +from_files=0 +homedir_perms=0755 +passwd_progmode=0 +uid_mode=1 +secmode=0 passwd_stars=0 -shells=fixed,passwd,shells +user_files=/etc/skel +display_mode=1 +lock_string=* +home_base=/home +selinux_con=user_u:object_r:user_home_dir_t +shadow_file=/etc/shadow +last_show=0 +gshadow_file=/etc/gshadow +passwd_same=0 +new_user_group=0 +delete_only=0 +display_max=400 +base_gid=1000 +gid_calc=0 +group_file=/etc/group diff --git a/webmin/usermin/config b/webmin/usermin/config index 420489df7..47ae3413f 100644 --- a/webmin/usermin/config +++ b/webmin/usermin/config @@ -1,7 +1,7 @@ +upmissing=0 updays=1 -cron_mode=0 uphour=4 -usermin_dir=/etc/usermin -upmissing=0 +cron_mode=0 upshow=1 +usermin_dir=/etc/usermin update=0 diff --git a/webmin/version b/webmin/version index 704ddb287..edb5242b5 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -1.994 +1.995 diff --git a/webmin/webalizer/config b/webmin/webalizer/config index f0526e5d0..5480b3db4 100644 --- a/webmin/webalizer/config +++ b/webmin/webalizer/config @@ -1,6 +1,6 @@ +auto=apache,squid,proftpd,wuftpd alt_conf=/etc/webalizer/webalizer.conf.sample +webalizer=/usr/bin/webalizer webalizer_conf=/etc/webalizer/webalizer.conf naked=0 -auto=apache,squid,proftpd,wuftpd -webalizer=/usr/bin/webalizer skip_old=0 diff --git a/webmin/webmin.acl b/webmin/webmin.acl index 437b7eed8..354cf64ee 100644 --- a/webmin/webmin.acl +++ b/webmin/webmin.acl @@ -1 +1 @@ -root: acl adsl-client ajaxterm apache at backup-config bacula-backup bandwidth bind8 burner change-user cluster-copy cluster-cron cluster-passwd cluster-shell cluster-software cluster-useradmin cluster-usermin cluster-webmin cpan cron custom dfsadmin dhcpd dovecot exim exports fail2ban fdisk fetchmail file filemin filter firewall firewall6 firewalld fsdump grub heartbeat htaccess-htpasswd idmapd inetd init inittab ipfilter ipfw ipsec iscsi-client iscsi-server iscsi-target iscsi-tgtd jabber krb5 ldap-client ldap-server ldap-useradmin logrotate lpadmin lvm mailboxes mailcap man mon mount mysql net nis openslp package-updates pam pap passwd phpini postfix postgresql ppp-client pptp-client pptp-server proc procmail proftpd qmailadmin quota raid samba sarg sendmail servers shell shorewall shorewall6 smart-status smf software spam squid sshd status stunnel syslog-ng syslog system-status tcpwrappers telnet time tunnel updown useradmin usermin vgetty webalizer webmin webmincron webminlog wuftpd xinetd +root: acl adsl-client ajaxterm apache at backup-config bacula-backup bandwidth bind8 burner change-user cluster-copy cluster-cron cluster-passwd cluster-shell cluster-software cluster-useradmin cluster-usermin cluster-webmin cpan cron custom dfsadmin dhcpd dovecot exim exports fail2ban fdisk fetchmail file filemin filter firewall firewall6 firewalld fsdump grub heartbeat htaccess-htpasswd idmapd inetd init inittab ipfilter ipfw ipsec iscsi-client iscsi-server iscsi-target iscsi-tgtd jabber krb5 ldap-client ldap-server ldap-useradmin logrotate lpadmin lvm mailboxes mailcap man mon mount mysql net nis openslp package-updates pam pap passwd phpini postfix postgresql ppp-client pptp-client pptp-server proc procmail proftpd qmailadmin quota raid samba sarg sendmail servers shell shorewall shorewall6 smart-status smf software spam squid sshd status stunnel syslog-ng syslog system-status tcpwrappers telnet time tunnel updown useradmin usermin vgetty webalizer webmin webmincron webminlog wuftpd xinetd logviewer diff --git a/webmin/webmin/config b/webmin/webmin/config index d0f51fd2c..520e56c8b 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -1,12 +1,12 @@ +uphour=23 +last_version_check=1549050668 +cron_mode=0 +upshow=1 +update=0 upmins=47 letsencrypt_dns_wait=10 -cron_mode=0 +updays=1 +upmissing=0 last_version_number=1.900 -uphour=23 warn_days=7 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 4ba4f3863..c613b3cc8 100644 --- a/webmin/wuftpd/config +++ b/webmin/wuftpd/config @@ -1,8 +1,8 @@ -ftpgroups=/etc/wu-ftpd/ftpgroups -log_file=/var/log/xferlog +ftpd_path=/usr/sbin/wu-ftpd 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 +log_file=/var/log/xferlog +ftpaccess=/etc/wu-ftpd/ftpaccess +ftpgroups=/etc/wu-ftpd/ftpgroups ftpusers=/etc/wu-ftpd/ftpusers diff --git a/webmin/xinetd/config b/webmin/xinetd/config index 9ba1db362..915498a30 100644 --- a/webmin/xinetd/config +++ b/webmin/xinetd/config @@ -1,5 +1,5 @@ -pid_file=/var/run/xinetd.pid lookup_servs=1 xinetd_conf=/etc/xinetd.conf +pid_file=/var/run/xinetd.pid start_cmd=/etc/init.d/xinetd start protocols_file=/etc/protocols -- 2.43.0