mirror of
https://github.com/webmin/webmin.git
synced 2026-02-03 22:23:28 +00:00
Compare commits
2 Commits
stable
...
dev/sessio
| Author | SHA1 | Date | |
|---|---|---|---|
|
f6b62525f8 | ||
|
|
57138d505b |
@@ -1,14 +0,0 @@
|
||||
# EditorConfig for Perl project
|
||||
# - Indentation: tabs
|
||||
# - Tab width: 8
|
||||
# - Indentation style: Ratliff
|
||||
|
||||
root = true
|
||||
|
||||
[*]
|
||||
charset = utf-8
|
||||
indent_style = tab
|
||||
indent_size = 8
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
49
CHANGELOG.md
49
CHANGELOG.md
@@ -1,49 +1,12 @@
|
||||
## Changelog
|
||||
|
||||
#### 2.501 (September 10, 2025)
|
||||
* Add support for Raspberry Pi sensors #2539 #2517
|
||||
* Add Squid 7 support
|
||||
* Update the Authentic theme to the latest version with the following fixes:
|
||||
- Fix broken editor in "Bootup and Shutdown" module
|
||||
|
||||
#### 2.500 (September 4, 2025)
|
||||
#### 2.403 (June 30, 2025)
|
||||
* Add support for the Webmin webserver to work in both HTTP and HTTPS modes at the same time
|
||||
* Add distinct warning to the login page if the connection is not secure
|
||||
* Add support for timeouts in temporary rules in "FirewallD" module
|
||||
* Add support for the new Dovecot version 2.4
|
||||
* Add support for MariaDB version 12 #2522
|
||||
* Add support for IMAP through a local command for Usermin
|
||||
* Add latest SSLeay support for redirects to SSL work
|
||||
* Add improvements to "Bootup and Shutdown" module for _systemd_ systems
|
||||
* Add field for secondary server key in "BIND DNS Server" module
|
||||
* Add reversible encryption helpers API
|
||||
* Add API to display relative dates
|
||||
* Add API to mask sensitive text, like displayed passwords, unless hovered over
|
||||
* Add status monitor for PHP FPM #2499
|
||||
* Add support for DNF5 format in the "Software Packages" module
|
||||
* Add support for redirecting to the enforced domain when the `musthost_redirect` directive is set
|
||||
* Add option to customize the SMTP login for scheduled background monitoring in the "System and Server Status" module
|
||||
* Change to show relative dates in "Webmin Users: Current Login Sessions" and "Webmin Actions Log: Search Results" pages
|
||||
* Change "Last Logins" on the dashboard to show usernames, relative dates, and all users from the past 3 days
|
||||
* Change to always enable HSTS by default
|
||||
* Add a UI API to mask sensitive text—like displayed passwords, unless hovered over container
|
||||
* Fix MySQL/MariaDB to remove obsolete `set-variable` options that break modern config files #2497
|
||||
* Fix download link in table rows in "MySQL/MariaDB Database Server" module
|
||||
* Fix module not to fail on old MySQL 5.5
|
||||
* Update the Authentic theme to the latest version with various improvements and fixes:
|
||||
- Add support to automatically set the color palette based on OS or browser preferences
|
||||
- Add improvements to tooltips in dark palette
|
||||
- Change the default shortcut key for toggling the light/dark palette
|
||||
- Change the default shortcut key for toggling right slider
|
||||
- Change wording to use "shortcut" instead of "hotkey"
|
||||
- Change the default maximum column width
|
||||
- Fix navigation menu load in proxy mode #2502
|
||||
- Fix navigation menu to always stay in sync with the product switch
|
||||
- Fix sporadic issue where the navigation menu disappeared and the content page was shifted
|
||||
- Fix info alert text color and button color in the dark palette
|
||||
- Fix styling of checkboxes and radios for backup and restore pages in Virtualmin
|
||||
- Fix styling for extra backup destinations in Virtualmin
|
||||
- Fix advanced schedule display in the cron chooser in Virtualmin
|
||||
[More details...](https://github.com/webmin/authentic-theme/releases/tag/25.00)
|
||||
|
||||
|
||||
#### 2.402 (June 16, 2025)
|
||||
* Update the Authentic theme to the latest version with various fixes and improvements
|
||||
@@ -168,7 +131,7 @@
|
||||
* Update the Authentic theme to the latest version with various fixes and improvements
|
||||
|
||||
#### 2.201 (July 24, 2024)
|
||||
* Fix real-time monitoring not updating graphs in the dashboard [#2222](https://github.com/webmin/webmin/issues/2222)
|
||||
* Fix real-time monitoring not updating graphs in the Dashboard [#2222](https://github.com/webmin/webmin/issues/2222)
|
||||
* Fix Terminal module to work correctly with _sudo_-capable users [#2223](https://github.com/webmin/webmin/issues/2223)
|
||||
|
||||
#### 2.200 (July 21, 2024)
|
||||
@@ -281,7 +244,7 @@
|
||||
* Add support for editing ACLs in File Manager
|
||||
* Add support to configure SSL connection for MySQL/MariaDB module
|
||||
* Add support for compressed backups in PostgreSQL module
|
||||
* Add support for displaying inodes too in Disk Usage in the dashboard
|
||||
* Add support for displaying inodes too in Disk Usage in the Dashboard
|
||||
* Add better support for CloudLinux
|
||||
* Fix to always default to RSA key type in Let's Encrypt requests
|
||||
* Fix setup repository script for Oracle
|
||||
@@ -289,7 +252,7 @@
|
||||
* Fix support for SpamAssassin 4
|
||||
* Fix to use system default hashing format for `htpasswd` file
|
||||
* Fix FastRPC issues
|
||||
* Update the Authentic theme to the latest version, with sped-up dashboard performance
|
||||
* Update the Authentic theme to the latest version, with sped-up Dashboard performance
|
||||
|
||||
#### 2.013 (January 19, 2023)
|
||||
* Fix Authentic theme issue with error handling
|
||||
|
||||
@@ -44,7 +44,7 @@ Webmin 可以两种方法安装：
|
||||
### 贡献者
|
||||
|
||||
* [Joe Cooper](https://github.com/swelljoe)
|
||||
* [Ilia Rostovtsev](https://github.com/iliaross)
|
||||
* [Ilia Rostovtsev](https://github.com/iliajie)
|
||||
* [Kay Marquardt](https://github.com/gnadelwartz)
|
||||
* [Nawawi Jamili](https://github.com/nawawi) + [其他无偿奉献的开发者](https://github.com/webmin/webmin/graphs/contributors)
|
||||
|
||||
|
||||
@@ -48,13 +48,13 @@ For detailed installation instructions check our guide on [webmin.com/download](
|
||||
* [Jamie Cameron](https://www.webmin.com/about.html) [](https://www.linkedin.com/in/jamiecameron2)
|
||||
|
||||
### Developers
|
||||
* [Ilia Rostovtsev](https://github.com/iliaross)
|
||||
* [Ilia Rostovtsev](https://github.com/iliajie)
|
||||
* [Joe Cooper](https://github.com/swelljoe)
|
||||
|
||||
### Contributors
|
||||
* [Kay Marquardt](https://github.com/gnadelwartz)
|
||||
* [Nawawi Jamili](https://github.com/nawawi)
|
||||
* [unknown10777](https://github.com/unknown10777) + [90 more...](https://github.com/webmin/webmin/graphs/contributors)
|
||||
* [unknown10777](https://github.com/unknown10777) + [90 more..](https://github.com/webmin/webmin/graphs/contributors)
|
||||
|
||||
## License
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -355,7 +355,6 @@ unix_utable=Allowed Unix users
|
||||
sessions_title=Current Login Sessions
|
||||
sessions_id=Session ID
|
||||
sessions_user=Webmin user
|
||||
sessions_login_ago=Last active ago
|
||||
sessions_login=Last active at
|
||||
sessions_host=IP address
|
||||
sessions_lview=View logs..
|
||||
|
||||
@@ -28,7 +28,7 @@ print &ui_columns_start([ $text{'sessions_id'},
|
||||
$text{'sessions_state'},
|
||||
$text{'sessions_user'},
|
||||
$text{'sessions_host'},
|
||||
$text{'sessions_login_ago'},
|
||||
$text{'sessions_login'},
|
||||
$text{'sessions_actions'},
|
||||
], 100);
|
||||
foreach my $k (sort { my @a = split(/\s+/, $sessiondb{$a});
|
||||
@@ -68,8 +68,7 @@ foreach my $k (sort { my @a = split(/\s+/, $sessiondb{$a});
|
||||
push(@cols, $user);
|
||||
}
|
||||
push(@cols, $lip);
|
||||
push(@cols, &make_date_relative($ltime).
|
||||
" ".&ui_help(&make_date($ltime)));
|
||||
push(@cols, &make_date($ltime));
|
||||
my @links;
|
||||
if ($haslog) {
|
||||
push(@links, ui_link("../webminlog/search.cgi?uall=1&mall=1&tall=1&wall=1&fall=1&sid=$k", $text{'sessions_lview'}));
|
||||
|
||||
@@ -20,12 +20,7 @@ foreach my $k (keys %sessiondb) {
|
||||
next if ($k =~ /^1111111/);
|
||||
next if (!$sessiondb{$k});
|
||||
my ($user, $ltime, $lip) = split(/\s+/, $sessiondb{$k});
|
||||
next if (&webmin_user_is_admin()
|
||||
? ($user eq "!" ||
|
||||
($user ne $remote_user &&
|
||||
# Show all logins for past 3 days for admin
|
||||
$ltime && $ltime < time() - 3*24*60*60))
|
||||
: ($user ne $remote_user && $user ne "!".$remote_user));
|
||||
next if ($user ne $remote_user && $user ne "!".$remote_user);
|
||||
push(@logins, [ $user, $ltime, $lip, $k ]);
|
||||
}
|
||||
if (@logins) {
|
||||
@@ -34,8 +29,7 @@ if (@logins) {
|
||||
@logins = @logins[0..4];
|
||||
}
|
||||
my $html = &ui_columns_start([ $text{'sessions_host'},
|
||||
$text{'sessions_user'},
|
||||
$text{'sessions_login_ago'},
|
||||
$text{'sessions_login'},
|
||||
$text{'sessions_state'},
|
||||
$text{'sessions_action'} ]);
|
||||
my $open = 0;
|
||||
@@ -68,13 +62,9 @@ if (@logins) {
|
||||
&ui_link("@{[&get_webprefix()]}/acl/delete_session.cgi?id=$l->[3]&redirect_ref=1",
|
||||
$text{'sessions_kill'}))
|
||||
}
|
||||
my $user = $l->[0];
|
||||
$user =~ s/^\!//;
|
||||
$html .= &ui_columns_row([
|
||||
$l->[2],
|
||||
$user,
|
||||
&make_date_relative($l->[1]).
|
||||
" ".&ui_help(&make_date($l->[1])),
|
||||
&make_date($l->[1]),
|
||||
$state,
|
||||
&ui_links_row(\@links) ]);
|
||||
}
|
||||
|
||||
@@ -116,4 +116,4 @@ Name of the user to disable two-factor authentication for.
|
||||
|
||||
Copyright 2018 Jamie Cameron <jcameron@webmin.com>
|
||||
Joe Cooper <joe@virtualmin.com>
|
||||
Ilia Ross <ilia@virtualmin.com>
|
||||
Ilia Rostovtsev <ilia@virtualmin.com>
|
||||
|
||||
@@ -260,5 +260,5 @@ Set new user password. Using this option may be unsecure.
|
||||
|
||||
Copyright 2018 Jamie Cameron <jcameron@webmin.com>
|
||||
Joe Cooper <joe@virtualmin.com>
|
||||
Ilia Ross <ilia@virtualmin.com>
|
||||
Ilia Rostovtsev <ilia@virtualmin.com>
|
||||
|
||||
|
||||
@@ -174,5 +174,5 @@ sub root
|
||||
|
||||
Copyright 2018 Jamie Cameron <jcameron@webmin.com>
|
||||
Joe Cooper <joe@virtualmin.com>
|
||||
Ilia Ross <ilia@virtualmin.com>
|
||||
Ilia Rostovtsev <ilia@virtualmin.com>
|
||||
|
||||
|
||||
@@ -457,5 +457,5 @@ Returns Webmin and other modules and themes versions installed (only those for w
|
||||
|
||||
Copyright 2018 Jamie Cameron <jcameron@webmin.com>
|
||||
Joe Cooper <joe@virtualmin.com>
|
||||
Ilia Ross <ilia@virtualmin.com>
|
||||
Ilia Rostovtsev <ilia@virtualmin.com>
|
||||
|
||||
|
||||
@@ -1135,10 +1135,6 @@ elsif ($type eq "CNAME") {
|
||||
print &ui_table_row($text{'value_CNAME1'},
|
||||
&ui_textbox("value0", $v[0], 30)." ($text{'edit_cnamemsg'})", 3);
|
||||
}
|
||||
elsif ($type eq "ALIAS") {
|
||||
print &ui_table_row($text{'value_ALIAS1'},
|
||||
&ui_textbox("value0", $v[0], 30)." ($text{'edit_cnamemsg'})", 3);
|
||||
}
|
||||
elsif ($type eq "MX") {
|
||||
print &ui_table_row($text{'value_MX2'},
|
||||
&ui_textbox("value1", $v[1], 30));
|
||||
@@ -3121,11 +3117,7 @@ $slave_error = $_[0];
|
||||
|
||||
sub get_forward_record_types
|
||||
{
|
||||
return ("A", "NS", "CNAME",
|
||||
$config{'allow_alias'} ? ( "ALIAS" ) : ( ),
|
||||
"MX", "HINFO", "TXT", "SPF", "DMARC", "WKS", "RP", "PTR", "LOC",
|
||||
"SRV", "KEY", "TLSA", "SSHFP", "CAA", "NAPTR", "NSEC3PARAM",
|
||||
$config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
|
||||
return ("A", "NS", "CNAME", "MX", "HINFO", "TXT", "SPF", "DMARC", "WKS", "RP", "PTR", "LOC", "SRV", "KEY", "TLSA", "SSHFP", "CAA", "NAPTR", "NSEC3PARAM", $config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
|
||||
}
|
||||
|
||||
sub get_reverse_record_types
|
||||
|
||||
@@ -52,4 +52,3 @@ stop_cmd=systemctl stop named
|
||||
restart_cmd=systemctl reload named
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ spf_record=0
|
||||
dnssec_info=1
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ stop_cmd=systemctl stop named
|
||||
restart_cmd=systemctl reload named
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ stop_cmd=systemctl stop named
|
||||
restart_cmd=systemctl reload named
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ stop_cmd=systemctl stop named
|
||||
restart_cmd=systemctl reload named
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ stop_cmd=systemctl stop named
|
||||
restart_cmd=systemctl reload named
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -50,4 +50,3 @@ tmpl_dnssec_dt=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ stop_cmd=systemctl stop named
|
||||
restart_cmd=systemctl reload named
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ stop_cmd=systemctl stop named
|
||||
restart_cmd=systemctl reload named
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -47,4 +47,3 @@ restart_cmd=service named restart
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -48,4 +48,3 @@ start_cmd=systemctl start bind9.service
|
||||
stop_cmd=systemctl stop bind9.service
|
||||
restart_cmd=systemctl reload bind9.service
|
||||
dnssec_period=21
|
||||
allow_alias=0
|
||||
|
||||
@@ -48,4 +48,3 @@ start_cmd=systemctl start named.service
|
||||
stop_cmd=systemctl stop named.service
|
||||
restart_cmd=systemctl reload named.service
|
||||
dnssec_period=21
|
||||
allow_alias=0
|
||||
|
||||
@@ -38,4 +38,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -44,4 +44,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -48,4 +48,3 @@ start_cmd=systemctl start bind9.service
|
||||
stop_cmd=systemctl stop bind9.service
|
||||
restart_cmd=systemctl reload bind9.service
|
||||
dnssec_period=21
|
||||
allow_alias=0
|
||||
|
||||
@@ -48,4 +48,3 @@ start_cmd=systemctl start named.service
|
||||
stop_cmd=systemctl stop named.service
|
||||
restart_cmd=systemctl reload named.service
|
||||
dnssec_period=21
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -43,4 +43,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -44,4 +44,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ force_random=0
|
||||
spf_record=0
|
||||
pid_file=/var/run/named/pid
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ force_random=0
|
||||
spf_record=0
|
||||
pid_file=/var/run/named/pid
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -43,4 +43,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ pid_file=/var/run/named/named.pid /private/var/run/named/named.pid
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -43,4 +43,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -43,4 +43,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -42,4 +42,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -42,4 +42,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -48,4 +48,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -42,4 +42,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -45,4 +45,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ stop_cmd=systemctl stop named
|
||||
restart_cmd=systemctl reload named
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -52,4 +52,3 @@ spf_record=0
|
||||
dnssec_info=1
|
||||
chroot=
|
||||
auto_chroot=
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -43,4 +43,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -45,4 +45,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -46,4 +46,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -48,4 +48,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -35,4 +35,3 @@ other_slaves=1
|
||||
updserial_man=1
|
||||
master_ttl=1
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -47,4 +47,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -47,4 +47,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -47,4 +47,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -40,4 +40,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -43,4 +43,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -41,4 +41,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -58,4 +58,3 @@ other_slaves=1
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
allow_alias=0
|
||||
|
||||
@@ -19,7 +19,6 @@ support_aaaa=Support DNS for IPv6 addresses,1,1-Yes,0-No
|
||||
allow_comments=Allow comments for records,1,1-Yes,0-No
|
||||
allow_wild=Allow wildcards?,1,1-Yes,0-No
|
||||
allow_underscore=Allow underscores in record names?,1,1-Yes,0-No
|
||||
allow_alias=Allow ALIAS records?,1,1-Yes,0-No
|
||||
short_names=Convert record names to canonical form?,1,0-Yes,1-No
|
||||
extra_forward=Extra record types for forward zones,0
|
||||
extra_reverse=Extra record types for reverse zones,0
|
||||
|
||||
@@ -57,7 +57,6 @@ foreach my $z (&find("zone", $vconf)) {
|
||||
}
|
||||
}
|
||||
my $masterport = $in{'port_def'} ? undef : $in{'port'};
|
||||
my $masterkey = $in{'key_def'} ? undef : $in{'key'};
|
||||
my @masters = split(/\s+/, $in{'masters'});
|
||||
foreach my $m (@masters) {
|
||||
&check_ipaddress($m) || &check_ip6address($m) ||
|
||||
@@ -107,9 +106,6 @@ my $masters = { 'name' => 'masters',
|
||||
if (defined($masterport)) {
|
||||
$masters->{'values'} = [ 'port', $masterport ];
|
||||
}
|
||||
if ($masterkey) {
|
||||
$masters->{'values'} = [ 'key', $masterkey ];
|
||||
}
|
||||
my $dir = { 'name' => 'zone',
|
||||
'values' => [ $in{'zone'} ],
|
||||
'type' => 1,
|
||||
|
||||
@@ -184,7 +184,6 @@ slave_ecannot=You are not allowed to edit this zone
|
||||
slave_opts=Zone Options
|
||||
slave_masters=Master servers
|
||||
slave_masterport=Server port
|
||||
slave_masterkey=Server key
|
||||
slave_max=Maximum transfer time
|
||||
slave_file=Records file
|
||||
slave_check=Check names?
|
||||
@@ -398,7 +397,6 @@ type_A=Address
|
||||
type_AAAA=IPv6 Address
|
||||
type_NS=Name Server
|
||||
type_CNAME=Name Alias
|
||||
type_ALIAS=Address Alias
|
||||
type_MX=Mail Server
|
||||
type_HINFO=Host Information
|
||||
type_NSEC3PARAM=DNSSEC Parameters
|
||||
@@ -421,7 +419,6 @@ edit_A=Address
|
||||
edit_AAAA=IPv6 Address
|
||||
edit_NS=Name Server
|
||||
edit_CNAME=Name Alias
|
||||
edit_ALIAS=Address Alias
|
||||
edit_MX=Mail Server
|
||||
edit_HINFO=Host Information
|
||||
edit_TXT=Text
|
||||
@@ -444,7 +441,6 @@ recs_A=Address
|
||||
recs_AAAA=IPv6 Address
|
||||
recs_NS=Name Server
|
||||
recs_CNAME=Name Alias
|
||||
recs_ALIAS=Address Alias
|
||||
recs_MX=Mail Server
|
||||
recs_HINFO=Host Information
|
||||
recs_TXT=Text
|
||||
@@ -468,7 +464,6 @@ value_A1=Address
|
||||
value_AAAA1=IPv6 Address
|
||||
value_NS1=Name Server
|
||||
value_CNAME1=Real Name
|
||||
value_ALIAS1=Copy Address From
|
||||
value_MX1=Priority
|
||||
value_MX2=Mail Server
|
||||
value_HINFO1=Hardware
|
||||
@@ -1360,7 +1355,7 @@ xfer_done=.. from $1 : Completed OK
|
||||
xfer_count=Test transfer successfully fetched $1 records from at least one nameserver. Actual transfers by BIND should also succeed.
|
||||
xfer_none=Test transfer appeared to succeed, but didn't actually fetch any records!
|
||||
|
||||
tls_title=SSL Keys and Certificates
|
||||
tls_title=SSL Keys And Certificates
|
||||
tls_ecannot=You are not allowed to edit SSL keys and certificates
|
||||
tls_esupport=SSL keys and certificates are not supported on this system
|
||||
tls_name=Key name
|
||||
@@ -1368,6 +1363,8 @@ tls_key=Key file
|
||||
tls_cert=Certificate file
|
||||
tls_ca=CA certificate file
|
||||
tls_ca_def=None required
|
||||
tls_ecannot=You are not allowed to edit SSL keys and certificates
|
||||
tls_esupport=DNS over SSL is not supported on this system
|
||||
tls_none=No SSL keys have been added yet.
|
||||
tls_add=Add a new SSL key.
|
||||
tls_desc=The SSL keys and certificates listed on this page can be used to enable DNS over SSL/TLS.
|
||||
|
||||
@@ -216,13 +216,6 @@ else {
|
||||
$vals .= ".";
|
||||
}
|
||||
}
|
||||
elsif ($in{'type'} eq "ALIAS") {
|
||||
&valname($vals) ||
|
||||
&error(&text('edit_ecname', $vals));
|
||||
if ($vals =~ /\.\Q$in{'origin'}\E$/) {
|
||||
$vals .= ".";
|
||||
}
|
||||
}
|
||||
elsif ($in{'type'} eq "MX") {
|
||||
&valname($in{'value1'}) ||
|
||||
&error(&text('edit_emx', $in{'value1'}));
|
||||
|
||||
@@ -59,15 +59,6 @@ print &ui_table_row($text{'slave_masterport'},
|
||||
&ui_opt_textbox("port", undef, 5, $text{'default'},
|
||||
$text{'slave_master_port'}), 3);
|
||||
|
||||
# Master key
|
||||
my @keys = &find("key", $conf);
|
||||
if (@keys) {
|
||||
print &ui_table_row($text{'slave_masterkey'},
|
||||
&ui_select("key", undef,
|
||||
[ [ undef, $text{'slave_nokey'} ],
|
||||
(map { $_->{'value'} } @keys) ]));
|
||||
}
|
||||
|
||||
# Create on slave servers?
|
||||
my @servers = grep { $_->{'sec'} } &list_slave_servers();
|
||||
if (@servers && $access{'remote'}) {
|
||||
|
||||
@@ -4,9 +4,9 @@ BEGIN { push(@INC, ".."); };
|
||||
use WebminCore;
|
||||
&init_config();
|
||||
|
||||
@supported_auths = ( "anonymous", "plain", "login", "digest-md5", "cram-md5",
|
||||
"apop", "scram-sha-1", "scram-sha-256", "ntlm",
|
||||
"gss-spnego", "gssapi", "rpa", "otp", "skey", "external",
|
||||
@supported_auths = ( "anonymous", "plain", "digest-md5", "cram-md5", "apop",
|
||||
"scram-sha-1", "scram-sha-256", "ntlm", "gss-spnego",
|
||||
"gssapi", "rpa", "otp", "skey", "external",
|
||||
"oauthbearer", "xoauth2" );
|
||||
@mail_envs = ( undef, "maildir:~/Maildir", "mbox:~/mail/:INBOX=/var/mail/%u",
|
||||
"maildir:~/Maildir:mbox:~/mail/" );
|
||||
@@ -555,16 +555,6 @@ return 0 if (!$ver);
|
||||
return &compare_version_numbers($ver, $wantver) >= 0;
|
||||
}
|
||||
|
||||
# version_below(ver)
|
||||
# Returns 1 if running below some version
|
||||
sub version_below
|
||||
{
|
||||
local ($wantver) = @_;
|
||||
local $ver = &get_dovecot_version();
|
||||
return 0 if (!$ver);
|
||||
return &compare_version_numbers($ver, $wantver) < 0;
|
||||
}
|
||||
|
||||
sub list_lock_methods
|
||||
{
|
||||
local ($forindex) = @_;
|
||||
|
||||
@@ -14,11 +14,7 @@ print &ui_table_row($text{'login_realms'},
|
||||
&ui_opt_textbox("realms", $realms, 40, $text{'login_none'}), 3);
|
||||
|
||||
# Default authentication realm
|
||||
$realm = &find_value(
|
||||
&version_atleast("2.4")
|
||||
? "auth_default_domain"
|
||||
: "auth_default_realm",
|
||||
$conf);
|
||||
$realm = &find_value("auth_default_realm", $conf);
|
||||
print &ui_table_row($text{'login_realm'},
|
||||
&ui_opt_textbox("realm", $realm, 10, $text{'default'}));
|
||||
|
||||
@@ -91,27 +87,25 @@ elsif ($userdb =~ /^sql\s+(.*)/) {
|
||||
else {
|
||||
$other = $userdb;
|
||||
}
|
||||
if (&version_below("2.4")) {
|
||||
print &ui_table_row($text{'login_userdb'},
|
||||
&ui_radio("usermode", $usermode,
|
||||
[ [ "passwd", $text{'login_passwd'}."<br>" ],
|
||||
[ "passwd-file", &text('login_passwdfile',
|
||||
&ui_textbox("passwdfile", $passwdfile, 30))."<br>" ],
|
||||
[ "static", &text('login_static',
|
||||
&ui_textbox("uid", $uid, 6),
|
||||
&ui_textbox("gid", $gid, 6),
|
||||
&ui_textbox("home", $home, 20))."<br>" ],
|
||||
[ "vpopmail", $text{'login_vpopmail'}."<br>" ],
|
||||
[ "ldap", &text('login_ldap',
|
||||
&ui_textbox("ldap", $ldap, 30))."<br>" ],
|
||||
[ "pgsql", &text('login_pgsql',
|
||||
&ui_textbox("pgsql", $pgsql, 30))."<br>" ],
|
||||
[ "sql", &text('login_sql',
|
||||
&ui_textbox("sql", $sql, 30))."<br>" ],
|
||||
[ "", &text('login_other',
|
||||
&ui_textbox("other", $other, 30))."<br>" ],
|
||||
]), 3);
|
||||
}
|
||||
print &ui_table_row($text{'login_userdb'},
|
||||
&ui_radio("usermode", $usermode,
|
||||
[ [ "passwd", $text{'login_passwd'}."<br>" ],
|
||||
[ "passwd-file", &text('login_passwdfile',
|
||||
&ui_textbox("passwdfile", $passwdfile, 30))."<br>" ],
|
||||
[ "static", &text('login_static',
|
||||
&ui_textbox("uid", $uid, 6),
|
||||
&ui_textbox("gid", $gid, 6),
|
||||
&ui_textbox("home", $home, 20))."<br>" ],
|
||||
[ "vpopmail", $text{'login_vpopmail'}."<br>" ],
|
||||
[ "ldap", &text('login_ldap',
|
||||
&ui_textbox("ldap", $ldap, 30))."<br>" ],
|
||||
[ "pgsql", &text('login_pgsql',
|
||||
&ui_textbox("pgsql", $pgsql, 30))."<br>" ],
|
||||
[ "sql", &text('login_sql',
|
||||
&ui_textbox("sql", $sql, 30))."<br>" ],
|
||||
[ "", &text('login_other',
|
||||
&ui_textbox("other", $other, 30))."<br>" ],
|
||||
]), 3);
|
||||
|
||||
# Password authentication system
|
||||
if (&find("auth_passdb", $conf, 2)) {
|
||||
@@ -180,49 +174,46 @@ elsif ($passdb =~ /^checkpassword\s+(.*)$/) {
|
||||
else {
|
||||
$pother = $passdb;
|
||||
}
|
||||
print &ui_table_row($text{'login_passdb'},
|
||||
&ui_radio("passmode", $passmode,
|
||||
[ [ "passwd", $text{'login_passwd2'}."<br>" ],
|
||||
[ "shadow", $text{'login_shadow'}."<br>" ],
|
||||
[ "dpam", &text('login_dpam')."<br>" ],
|
||||
$alpha_opts ?
|
||||
( [ "pam", &text('login_pam2',
|
||||
&ui_textbox("ppam", $ppam, 10),
|
||||
&ui_checkbox("ppam_session", 1,
|
||||
$text{'login_session'}, $psession),
|
||||
&ui_opt_textbox("ppam_ckey", $pckey, 10,
|
||||
$text{'login_none'}))."<br>" ]
|
||||
) :
|
||||
( [ "pam", &text('login_pam',
|
||||
&ui_textbox("ppam", $ppam, 10))."<br>" ]
|
||||
),
|
||||
[ "passwd-file", &text('login_passwdfile',
|
||||
&ui_textbox("ppasswdfile", $ppasswdfile, 30))."<br>" ],
|
||||
[ "vpopmail", $text{'login_vpopmail'}."<br>" ],
|
||||
[ "ldap", &text('login_ldap',
|
||||
&ui_textbox("pldap", $pldap, 30))."<br>" ],
|
||||
[ "pgsql", &text('login_pgsql',
|
||||
&ui_textbox("ppgsql", $ppgsql, 30))."<br>" ],
|
||||
[ "sql", &text('login_sql',
|
||||
&ui_textbox("psql", $psql, 30))."<br>" ],
|
||||
$alpha_opts ?
|
||||
( [ "bsdauth",
|
||||
&text('login_bsdauth',
|
||||
&ui_opt_textbox("bsdauth_ckey", $pbckey, 10,
|
||||
$text{'login_none'}))."<br>" ],
|
||||
[ "checkpassword",
|
||||
&text('login_checkpassword',
|
||||
&ui_textbox("checkpassword", $checkpassword, 40))."<br>" ],
|
||||
) :
|
||||
( ),
|
||||
[ "", &text('login_other',
|
||||
&ui_textbox("pother", $pother, 30))."<br>" ],
|
||||
]), 3);
|
||||
|
||||
if (&version_below("2.4")) {
|
||||
print &ui_table_row($text{'login_passdb'},
|
||||
&ui_radio("passmode", $passmode,
|
||||
[ [ "passwd", $text{'login_passwd2'}."<br>" ],
|
||||
[ "shadow", $text{'login_shadow'}."<br>" ],
|
||||
[ "dpam", &text('login_dpam')."<br>" ],
|
||||
$alpha_opts ?
|
||||
( [ "pam", &text('login_pam2',
|
||||
&ui_textbox("ppam", $ppam, 10),
|
||||
&ui_checkbox("ppam_session", 1,
|
||||
$text{'login_session'}, $psession),
|
||||
&ui_opt_textbox("ppam_ckey", $pckey, 10,
|
||||
$text{'login_none'}))."<br>" ]
|
||||
) :
|
||||
( [ "pam", &text('login_pam',
|
||||
&ui_textbox("ppam", $ppam, 10))."<br>" ]
|
||||
),
|
||||
[ "passwd-file", &text('login_passwdfile',
|
||||
&ui_textbox("ppasswdfile", $ppasswdfile, 30))."<br>" ],
|
||||
[ "vpopmail", $text{'login_vpopmail'}."<br>" ],
|
||||
[ "ldap", &text('login_ldap',
|
||||
&ui_textbox("pldap", $pldap, 30))."<br>" ],
|
||||
[ "pgsql", &text('login_pgsql',
|
||||
&ui_textbox("ppgsql", $ppgsql, 30))."<br>" ],
|
||||
[ "sql", &text('login_sql',
|
||||
&ui_textbox("psql", $psql, 30))."<br>" ],
|
||||
$alpha_opts ?
|
||||
( [ "bsdauth",
|
||||
&text('login_bsdauth',
|
||||
&ui_opt_textbox("bsdauth_ckey", $pbckey, 10,
|
||||
$text{'login_none'}))."<br>" ],
|
||||
[ "checkpassword",
|
||||
&text('login_checkpassword',
|
||||
&ui_textbox("checkpassword", $checkpassword, 40))."<br>" ],
|
||||
) :
|
||||
( ),
|
||||
[ "", &text('login_other',
|
||||
&ui_textbox("pother", $pother, 30))."<br>" ],
|
||||
]), 3);
|
||||
|
||||
print &ui_table_hr();
|
||||
}
|
||||
print &ui_table_hr();
|
||||
|
||||
$fuid = &find_value("first_valid_uid", $conf);
|
||||
print &ui_table_row($text{'login_fuid'},
|
||||
@@ -241,11 +232,7 @@ $lgid = &find_value("last_valid_gid", $conf);
|
||||
print &ui_table_row($text{'login_lgid'},
|
||||
&ui_opt_textbox("lgid", $lgid, 6, &getdef("last_valid_gid", \@mmap)));
|
||||
|
||||
$extra = &find_value(&version_atleast("2")
|
||||
? "mail_access_groups"
|
||||
: "mail_extra_groups",
|
||||
$conf);
|
||||
|
||||
$extra = &find_value("mail_extra_groups", $conf);
|
||||
print &ui_table_row($text{'login_extra'},
|
||||
&ui_opt_textbox("extra", $extra, 50, $text{'login_none'})."\n".
|
||||
&group_chooser_button("extra", 1), 3);
|
||||
|
||||
@@ -13,49 +13,25 @@ $envmode = 4;
|
||||
if (&find("default_mail_env", $conf, 2)) {
|
||||
$env = &find_value("default_mail_env", $conf);
|
||||
}
|
||||
elsif (&find("mail_path", $conf, 2)) {
|
||||
$env = &find_value("mail_path", $conf);
|
||||
}
|
||||
else {
|
||||
$env = &find_value("mail_location", $conf);
|
||||
}
|
||||
if ($env =~ s/:INDEX=([^:]+)//) {
|
||||
$index = $1;
|
||||
}
|
||||
elsif (&find("mail_index_path", $conf, 2)) {
|
||||
$index = &find_value("mail_index_path", $conf);
|
||||
}
|
||||
if ($env =~ s/:CONTROL=([^:]+)//) {
|
||||
$control = $1;
|
||||
}
|
||||
elsif (&find("mail_control_path", $conf, 2)) {
|
||||
$control = &find_value("mail_control_path", $conf);
|
||||
}
|
||||
for($i=0; $i<@mail_envs; $i++) {
|
||||
$envmode = $i if ($mail_envs[$i] eq $env);
|
||||
}
|
||||
print &ui_table_row($text{'mail_env'},
|
||||
&ui_radio("envmode", $envmode,
|
||||
[ ( map { [ $_, $text{'mail_env'.$_}."<br>" ] } (
|
||||
&version_atleast("2.4") ? (0) : (0 .. 3)) ),
|
||||
[ ( map { [ $_, $text{'mail_env'.$_}."<br>" ] } (0.. 3) ),
|
||||
[ 4, &text('mail_env4',
|
||||
&ui_textbox("other", $envmode == 4 ? $env : undef, 40)) ] ],
|
||||
), 3);
|
||||
|
||||
# Mail file format
|
||||
if (&version_atleast("2.4")) {
|
||||
$driver = &find_value("mail_driver", $conf);
|
||||
print &ui_table_row($text{'mail_driver'},
|
||||
&ui_radio("driver", $driver,
|
||||
[ [ "", $text{'mail_driver_def'} ],
|
||||
[ "auto", $text{'mail_driver_auto'} ],
|
||||
[ "mbox", $text{'mail_driver_mbox'} ],
|
||||
[ "maildir", $text{'mail_driver_maildir'} ],
|
||||
[ "dbox", $text{'mail_driver_dbox'} ],
|
||||
[ "imapc", $text{'mail_driver_imapc'} ],
|
||||
[ "pop3c", $text{'mail_driver_auto'} ] ]));
|
||||
}
|
||||
|
||||
# Index files location
|
||||
$indexmode = $index eq 'MEMORY' ? 1 :
|
||||
$index ? 2 : 0;
|
||||
@@ -113,10 +89,26 @@ print &ui_table_row($text{'mail_change'},
|
||||
[ "", &getdef($dirty, \@opts) ] ]), 3);
|
||||
|
||||
# Permissions on files
|
||||
if (&version_below("2")) {
|
||||
$umask = &find_value("umask", $conf);
|
||||
print &ui_table_row($text{'mail_umask'},
|
||||
&ui_opt_textbox("umask", $umask, 5, &getdef("umask")), 3);
|
||||
$umask = &find_value("umask", $conf);
|
||||
print &ui_table_row($text{'mail_umask'},
|
||||
&ui_opt_textbox("umask", $umask, 5, &getdef("umask")), 3);
|
||||
|
||||
# UIDL format
|
||||
if (&find("pop3_uidl_format", $conf, 2)) {
|
||||
$uidl = &find_value("pop3_uidl_format", $conf);
|
||||
@opts = ( $uidl ? ( ) : ( [ "", $text{'mail_uidl_none'} ] ),
|
||||
[ "%v.%u", $text{'mail_uidl_dovecot'} ],
|
||||
[ "%08Xv%08Xu", $text{'mail_uidl_uw'} ],
|
||||
[ "%f", $text{'mail_uidl_courier0'} ],
|
||||
[ "%u", $text{'mail_uidl_courier1'} ],
|
||||
[ "%v-%u", $text{'mail_uidl_courier2'} ],
|
||||
[ "%Mf", $text{'mail_uidl_tpop3d'} ] );
|
||||
($got) = grep { $_->[0] eq $uidl } @opts;
|
||||
print &ui_table_row($text{'mail_uidl'},
|
||||
&ui_select("pop3_uidl_format", $got ? $uidl : "*",
|
||||
[ @opts, [ "*", $text{'mail_uidl_other'} ] ])."\n".
|
||||
&ui_textbox("pop3_uidl_format_other", $got ? "" : $uidl, 10),
|
||||
3);
|
||||
}
|
||||
|
||||
# Allow POP3 last command
|
||||
|
||||
@@ -9,11 +9,7 @@ print &ui_form_start("save_ssl.cgi", "post");
|
||||
print &ui_table_start($text{'ssl_header'}, "width=100%", 4);
|
||||
|
||||
# SSL cert and key files
|
||||
if (&version_atleast("2.4")) {
|
||||
$cert = &find_value('ssl_server_cert_file', $conf, 0, "");
|
||||
$cert =~ s/^<//;
|
||||
}
|
||||
elsif (&find_value("ssl_cert", $conf, 2) || &version_atleast("2.2")) {
|
||||
if (&find_value("ssl_cert", $conf, 2) || &version_atleast("2.2")) {
|
||||
$cert = &find_value("ssl_cert", $conf, 0, "");
|
||||
$cert =~ s/^<//;
|
||||
}
|
||||
@@ -24,11 +20,7 @@ print &ui_table_row($text{'ssl_cert'},
|
||||
&ui_opt_textbox("cert", $cert, 40, &getdef("ssl_cert_file")), 3,
|
||||
[ undef, "nowrap" ]);
|
||||
|
||||
if (&version_atleast("2.4")) {
|
||||
$key = &find_value('ssl_server_key_file', $conf, 0, "");
|
||||
$key =~ s/^<//;
|
||||
}
|
||||
elsif (&find_value("ssl_key", $conf, 2) || &version_atleast("2.2")) {
|
||||
if (&find_value("ssl_key", $conf, 2) || &version_atleast("2.2")) {
|
||||
$key = &find_value("ssl_key", $conf, 0, "");
|
||||
$key =~ s/^<//;
|
||||
}
|
||||
@@ -39,12 +31,14 @@ print &ui_table_row($text{'ssl_key'},
|
||||
&ui_opt_textbox("key", $key, 40, &getdef("ssl_key_file")), 3,
|
||||
[ undef, "nowrap" ]);
|
||||
|
||||
# SSL key password
|
||||
$pass = &find_value("ssl_key_password", $conf);
|
||||
print &ui_table_row($text{'ssl_pass'},
|
||||
&ui_opt_textbox("pass", $pass, 20, $text{'ssl_prompt'}), 3,
|
||||
[ undef, "nowrap" ]);
|
||||
|
||||
# SSL CA file
|
||||
if (&version_atleast("2.4")) {
|
||||
$ca = &find_value('ssl_server_ca_file', $conf, 0, "");
|
||||
$ca =~ s/^<//;
|
||||
}
|
||||
elsif (&find_value("ssl_ca", $conf, 2) || &version_atleast("2.2")) {
|
||||
if (&find_value("ssl_ca", $conf, 2) || &version_atleast("2.2")) {
|
||||
$ca = &find_value("ssl_ca", $conf, 0, "");
|
||||
$ca =~ s/^<//;
|
||||
}
|
||||
@@ -56,41 +50,20 @@ print &ui_table_row($text{'ssl_ca'},
|
||||
&getdef("ssl_ca_file", [ [ "", $text{'ssl_none'} ] ])), 3,
|
||||
[ undef, "nowrap" ]);
|
||||
|
||||
# SSL key password
|
||||
my $passdir = &version_atleast("2.4")
|
||||
? "ssl_server_key_password"
|
||||
: "ssl_key_password";
|
||||
$pass = &find_value($passdir, $conf);
|
||||
print &ui_table_row($text{'ssl_pass'},
|
||||
&ui_opt_textbox("pass", $pass, 20, $text{'ssl_prompt'}), 3,
|
||||
[ undef, "nowrap" ]);
|
||||
|
||||
# Parameter regen time
|
||||
if (&version_below("2.4")) {
|
||||
$regen = &find_value("ssl_parameters_regenerate", $conf);
|
||||
print &ui_table_row($text{'ssl_regen'},
|
||||
&ui_opt_textbox("regen", $regen, 5,
|
||||
&getdef("ssl_parameters_regenerate")).
|
||||
" ".$text{'ssl_hours'}, 3);
|
||||
}
|
||||
$regen = &find_value("ssl_parameters_regenerate", $conf);
|
||||
print &ui_table_row($text{'ssl_regen'},
|
||||
&ui_opt_textbox("regen", $regen, 5,
|
||||
&getdef("ssl_parameters_regenerate")).
|
||||
" ".$text{'ssl_hours'}, 3);
|
||||
|
||||
# Disable plaintext passwords when not SSL
|
||||
if (&find_value("auth_allow_cleartext", $conf, 2)) {
|
||||
@opts = ( [ 'yes', $text{'yes'} ], [ 'no', $text{'no'} ] );
|
||||
$plain = &find_value("auth_allow_cleartext", $conf);
|
||||
print &ui_table_row($text{'ssl_plain2'},
|
||||
&ui_radio("plain", $plain,
|
||||
[ @opts,
|
||||
[ '', "$text{'default'} (No)" ] ]), 3);
|
||||
}
|
||||
else {
|
||||
@opts = ( [ 'yes', $text{'yes'} ], [ 'no', $text{'no'} ] );
|
||||
$plain = &find_value("disable_plaintext_auth", $conf);
|
||||
print &ui_table_row($text{'ssl_plain'},
|
||||
&ui_radio("plain", $plain,
|
||||
[ @opts,
|
||||
[ '', &getdef("disable_plaintext_auth", \@opts) ] ]), 3);
|
||||
}
|
||||
@opts = ( [ 'yes', $text{'yes'} ], [ 'no', $text{'no'} ] );
|
||||
$plain = &find_value("disable_plaintext_auth", $conf);
|
||||
print &ui_table_row($text{'ssl_plain'},
|
||||
&ui_radio("plain", $plain,
|
||||
[ @opts,
|
||||
[ '', &getdef("disable_plaintext_auth", \@opts) ] ]), 3);
|
||||
|
||||
print &ui_table_end();
|
||||
print &ui_form_end([ [ "save", $text{'save'} ] ]);
|
||||
|
||||
@@ -56,7 +56,6 @@ ssl_regen=Interval between SSL parameter regeneration
|
||||
ssl_hours=hours
|
||||
ssl_none=None
|
||||
ssl_plain=Disallow plaintext authentication in non-SSL mode?
|
||||
ssl_plain2=Allow plaintext authentication in non-SSL mode?
|
||||
ssl_err=Failed to save SSL configuration
|
||||
ssl_ekey=Missing or non-existent private key file
|
||||
ssl_ecert=Missing or non-existent certificate file
|
||||
@@ -135,14 +134,6 @@ mail_env1=Inbox and folders in <tt>~/Maildir</tt>
|
||||
mail_env2=Inbox under <tt>/var/mail</tt>, folders in <tt>~/mail</tt>
|
||||
mail_env3=Inbox in <tt>~/Maildir</tt>, folders in <tt>~/mail</tt>
|
||||
mail_env4=Other Dovecot location $1
|
||||
mail_driver=Mail file format
|
||||
mail_driver_def=Dovecot default
|
||||
mail_driver_auto=Detect automatically
|
||||
mail_driver_mbox=mbox (one file per folder)
|
||||
mail_driver_maildir=Maildir (one file per message)
|
||||
mail_driver_dbox=Dbox (Dovecot's custom format)
|
||||
mail_driver_imapc=Remote IMAP server
|
||||
mail_driver_pop3c=Remote POP3 server
|
||||
mail_index=Index files location
|
||||
mail_index0=Default (in Maildir directory)
|
||||
mail_index1=In memory only
|
||||
@@ -161,6 +152,16 @@ mail_eenv=Missing or invalid-looking mail location
|
||||
mail_echeck=Missing or non-numeric number of seconds between checks
|
||||
mail_eidle=Missing or non-numeric number of seconds between checks when idle
|
||||
mail_eumask=Missing or invalid four-digit octal Umask
|
||||
mail_uidl=UIDL format
|
||||
mail_uidl_other=Other..
|
||||
mail_uidl_none=Not set (WARNING - Dove may not start)
|
||||
mail_uidl_dovecot=Old Dovecot, new Cyrus
|
||||
mail_uidl_uw=UW ipop3d
|
||||
mail_uidl_courier0=Courier version 0
|
||||
mail_uidl_courier1=Courier version 1, old Cyrus
|
||||
mail_uidl_courier2=Courier version 2
|
||||
mail_uidl_tpop3d=tpop3d
|
||||
mail_euidl=Missing or invalid UIDL format
|
||||
mail_last=Allow use of POP3 LAST command?
|
||||
mail_lock=Index files locking method
|
||||
mail_fcntl=fcntl function
|
||||
|
||||
@@ -10,151 +10,144 @@ $conf = &get_config();
|
||||
# Allowed and default realm
|
||||
&save_directive($conf, "auth_realms",
|
||||
$in{'realms_def'} ? undef : $in{'realms'});
|
||||
&save_directive($conf,
|
||||
&version_atleast("2.4")
|
||||
? "auth_default_domain"
|
||||
: "auth_default_realm",
|
||||
&save_directive($conf, "auth_default_realm",
|
||||
$in{'realm_def'} ? undef : $in{'realm'});
|
||||
|
||||
# Authentication mechanisms
|
||||
if (&find("auth_mechanisms", $conf, 2)) {
|
||||
&save_directive($conf, "auth_mechanisms",
|
||||
$in{'mechs'}
|
||||
? join(" ", split(/\0/, $in{'mechs'}))
|
||||
: undef);
|
||||
join(" ", split(/\0/, $in{'mechs'})));
|
||||
}
|
||||
else {
|
||||
&save_directive($conf, "mechanisms",
|
||||
join(" ", split(/\0/, $in{'mechs'})), "auth","default");
|
||||
}
|
||||
|
||||
if (&version_below("2.4")) {
|
||||
# User database
|
||||
$userdb = $in{'usermode'};
|
||||
if ($in{'usermode'} eq 'passwd-file') {
|
||||
-r $in{'passwdfile'} || &error($text{'login_epasswdfile'});
|
||||
$userdb .= " ".$in{'passwdfile'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq 'static') {
|
||||
$in{'uid'} =~ /^\d+$/ || &error($text{'login_euid'});
|
||||
$in{'gid'} =~ /^\d+$/ || &error($text{'login_egid'});
|
||||
$in{'home'} || &error($text{'login_ehome'});
|
||||
$userdb .= " uid=".$in{'uid'}." gid=".$in{'gid'}.
|
||||
" home=".$in{'home'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq 'ldap') {
|
||||
-r $in{'ldap'} || &error($text{'login_eldap'});
|
||||
$userdb .= " ".$in{'ldap'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq 'pgsql') {
|
||||
-r $in{'pgsql'} || &error($text{'login_epgsql'});
|
||||
$userdb .= " ".$in{'pgsql'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq 'sql') {
|
||||
-r $in{'sql'} || &error($text{'login_esql'});
|
||||
$userdb .= " ".$in{'sql'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq '') {
|
||||
$userdb = $in{'other'};
|
||||
}
|
||||
if ($usec = &find_section("userdb", $conf, undef, "auth", "default")) {
|
||||
# Version 1.0.alpha format, which has a userdb *section*
|
||||
($svalue, $args) = split(/\s+/, $userdb, 2);
|
||||
$usec->{'value'} = $svalue;
|
||||
$usec->{'members'} = [ grep { $_->{'name'} ne 'args' }
|
||||
@{$usec->{'members'}} ];
|
||||
if ($args) {
|
||||
$usec->{'members'} = [ { 'name' => 'args',
|
||||
'value' => $args } ];
|
||||
}
|
||||
&save_section($conf, $usec);
|
||||
}
|
||||
elsif (&find("auth_userdb", $conf, 2)) {
|
||||
# Version 0.99 format
|
||||
&save_directive($conf, "auth_userdb", $userdb);
|
||||
}
|
||||
elsif (&find_value("driver", $conf, 2, "userdb")) {
|
||||
# Version 2.0 format
|
||||
$args = $userdb =~ s/\s+(\S.*)$// ? $1 : undef;
|
||||
&save_directive($conf, "driver", $userdb, "userdb");
|
||||
&save_directive($conf, "args", $args, "userdb");
|
||||
}
|
||||
else {
|
||||
# Version 1.0 format
|
||||
&save_directive($conf, "userdb", $userdb, "auth", "default");
|
||||
# User database
|
||||
$userdb = $in{'usermode'};
|
||||
if ($in{'usermode'} eq 'passwd-file') {
|
||||
-r $in{'passwdfile'} || &error($text{'login_epasswdfile'});
|
||||
$userdb .= " ".$in{'passwdfile'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq 'static') {
|
||||
$in{'uid'} =~ /^\d+$/ || &error($text{'login_euid'});
|
||||
$in{'gid'} =~ /^\d+$/ || &error($text{'login_egid'});
|
||||
$in{'home'} || &error($text{'login_ehome'});
|
||||
$userdb .= " uid=".$in{'uid'}." gid=".$in{'gid'}.
|
||||
" home=".$in{'home'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq 'ldap') {
|
||||
-r $in{'ldap'} || &error($text{'login_eldap'});
|
||||
$userdb .= " ".$in{'ldap'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq 'pgsql') {
|
||||
-r $in{'pgsql'} || &error($text{'login_epgsql'});
|
||||
$userdb .= " ".$in{'pgsql'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq 'sql') {
|
||||
-r $in{'sql'} || &error($text{'login_esql'});
|
||||
$userdb .= " ".$in{'sql'};
|
||||
}
|
||||
elsif ($in{'usermode'} eq '') {
|
||||
$userdb = $in{'other'};
|
||||
}
|
||||
if ($usec = &find_section("userdb", $conf, undef, "auth", "default")) {
|
||||
# Version 1.0.alpha format, which has a userdb *section*
|
||||
($svalue, $args) = split(/\s+/, $userdb, 2);
|
||||
$usec->{'value'} = $svalue;
|
||||
$usec->{'members'} = [ grep { $_->{'name'} ne 'args' }
|
||||
@{$usec->{'members'}} ];
|
||||
if ($args) {
|
||||
$usec->{'members'} = [ { 'name' => 'args',
|
||||
'value' => $args } ];
|
||||
}
|
||||
&save_section($conf, $usec);
|
||||
}
|
||||
elsif (&find("auth_userdb", $conf, 2)) {
|
||||
# Version 0.99 format
|
||||
&save_directive($conf, "auth_userdb", $userdb);
|
||||
}
|
||||
elsif (&find_value("driver", $conf, 2, "userdb")) {
|
||||
# Version 2.0 format
|
||||
$args = $userdb =~ s/\s+(\S.*)$// ? $1 : undef;
|
||||
&save_directive($conf, "driver", $userdb, "userdb");
|
||||
&save_directive($conf, "args", $args, "userdb");
|
||||
}
|
||||
else {
|
||||
# Version 1.0 format
|
||||
&save_directive($conf, "userdb", $userdb, "auth", "default");
|
||||
}
|
||||
|
||||
# Password mode
|
||||
$passdb = $in{'passmode'};
|
||||
if ($in{'passmode'} eq 'dpam') {
|
||||
$passdb = "pam";
|
||||
# Password mode
|
||||
$passdb = $in{'passmode'};
|
||||
if ($in{'passmode'} eq 'dpam') {
|
||||
$passdb = "pam";
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'pam') {
|
||||
$in{'ppam'} =~ /^\S+$/ || &error($text{'login_edpam'});
|
||||
if (defined($in{'ppam_ckey'}) && !$in{'ppam_ckey_def'}) {
|
||||
$ckey = $in{'ppam_ckey'};
|
||||
$ckey =~ /^\S+$/ || &error($text{'login_eckey'});
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'pam') {
|
||||
$in{'ppam'} =~ /^\S+$/ || &error($text{'login_edpam'});
|
||||
if (defined($in{'ppam_ckey'}) && !$in{'ppam_ckey_def'}) {
|
||||
$ckey = $in{'ppam_ckey'};
|
||||
$ckey =~ /^\S+$/ || &error($text{'login_eckey'});
|
||||
}
|
||||
$passdb .= ($in{'ppam_session'} ? " -session" : "").
|
||||
($ckey ? " cache_key=$ckey" : "").
|
||||
" ".$in{'ppam'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'passwd-file') {
|
||||
-r $in{'ppasswdfile'} || &error($text{'login_epasswdfile'});
|
||||
$passdb .= " ".$in{'ppasswdfile'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'ldap') {
|
||||
-r $in{'pldap'} || &error($text{'login_eldap'});
|
||||
$passdb .= " ".$in{'pldap'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'pgsql') {
|
||||
-r $in{'ppgsql'} || &error($text{'login_epgsql'});
|
||||
$passdb .= " ".$in{'ppgsql'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'sql') {
|
||||
-r $in{'psql'} || &error($text{'login_esql'});
|
||||
$passdb .= " ".$in{'psql'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'bsdauth') {
|
||||
$in{'bsdauth_ckey_def'} || $in{'bsdauth_ckey'} =~ /^\S+$/ ||
|
||||
&error($text{'login_eckey'});
|
||||
$passdb .= " cache_key=$in{'bsdauth_ckey'}"
|
||||
if (!$in{'bsdauth_ckey_def'});
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'checkpassword') {
|
||||
-x $in{'checkpassword'} || &error($text{'login_echeckpassword'});
|
||||
$passdb .= " ".$in{'checkpassword'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq '') {
|
||||
$passdb = $in{'other'};
|
||||
}
|
||||
# XXX other modes
|
||||
if ($psec = &find_section("passdb", $conf, undef, "auth", "default")) {
|
||||
# Version 1.0.alpha format
|
||||
($svalue, $args) = split(/\s+/, $passdb, 2);
|
||||
$psec->{'value'} = $svalue;
|
||||
$psec->{'members'} = [ grep { $_->{'name'} ne 'args' }
|
||||
@{$psec->{'members'}} ];
|
||||
if ($args) {
|
||||
$psec->{'members'} = [ { 'name' => 'args',
|
||||
'value' => $args } ];
|
||||
}
|
||||
&save_section($conf, $psec);
|
||||
}
|
||||
elsif (&find("auth_passdb", $conf, 2)) {
|
||||
# Version 0.99 format
|
||||
&save_directive($conf, "auth_passdb", $passdb);
|
||||
}
|
||||
elsif (&find_value("driver", $conf, 2, "passdb")) {
|
||||
# Version 2.0 format
|
||||
$args = $passdb =~ s/\s+(\S.*)$// ? $1 : undef;
|
||||
&save_directive($conf, "driver", $passdb, "passdb");
|
||||
&save_directive($conf, "args", $args, "passdb");
|
||||
}
|
||||
else {
|
||||
# Version 1.0 format
|
||||
&save_directive($conf, "passdb", $passdb, "auth", "default");
|
||||
$passdb .= ($in{'ppam_session'} ? " -session" : "").
|
||||
($ckey ? " cache_key=$ckey" : "").
|
||||
" ".$in{'ppam'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'passwd-file') {
|
||||
-r $in{'ppasswdfile'} || &error($text{'login_epasswdfile'});
|
||||
$passdb .= " ".$in{'ppasswdfile'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'ldap') {
|
||||
-r $in{'pldap'} || &error($text{'login_eldap'});
|
||||
$passdb .= " ".$in{'pldap'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'pgsql') {
|
||||
-r $in{'ppgsql'} || &error($text{'login_epgsql'});
|
||||
$passdb .= " ".$in{'ppgsql'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'sql') {
|
||||
-r $in{'psql'} || &error($text{'login_esql'});
|
||||
$passdb .= " ".$in{'psql'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'bsdauth') {
|
||||
$in{'bsdauth_ckey_def'} || $in{'bsdauth_ckey'} =~ /^\S+$/ ||
|
||||
&error($text{'login_eckey'});
|
||||
$passdb .= " cache_key=$in{'bsdauth_ckey'}"
|
||||
if (!$in{'bsdauth_ckey_def'});
|
||||
}
|
||||
elsif ($in{'passmode'} eq 'checkpassword') {
|
||||
-x $in{'checkpassword'} || &error($text{'login_echeckpassword'});
|
||||
$passdb .= " ".$in{'checkpassword'};
|
||||
}
|
||||
elsif ($in{'passmode'} eq '') {
|
||||
$passdb = $in{'other'};
|
||||
}
|
||||
# XXX other modes
|
||||
if ($psec = &find_section("passdb", $conf, undef, "auth", "default")) {
|
||||
# Version 1.0.alpha format
|
||||
($svalue, $args) = split(/\s+/, $passdb, 2);
|
||||
$psec->{'value'} = $svalue;
|
||||
$psec->{'members'} = [ grep { $_->{'name'} ne 'args' }
|
||||
@{$psec->{'members'}} ];
|
||||
if ($args) {
|
||||
$psec->{'members'} = [ { 'name' => 'args',
|
||||
'value' => $args } ];
|
||||
}
|
||||
&save_section($conf, $psec);
|
||||
}
|
||||
elsif (&find("auth_passdb", $conf, 2)) {
|
||||
# Version 0.99 format
|
||||
&save_directive($conf, "auth_passdb", $passdb);
|
||||
}
|
||||
elsif (&find_value("driver", $conf, 2, "passdb")) {
|
||||
# Version 2.0 format
|
||||
$args = $passdb =~ s/\s+(\S.*)$// ? $1 : undef;
|
||||
&save_directive($conf, "driver", $passdb, "passdb");
|
||||
&save_directive($conf, "args", $args, "passdb");
|
||||
}
|
||||
else {
|
||||
# Version 1.0 format
|
||||
&save_directive($conf, "passdb", $passdb, "auth", "default");
|
||||
}
|
||||
|
||||
# Allowed UIDs and GIDs
|
||||
@@ -174,10 +167,7 @@ $in{'lgid_def'} || $in{'lgid'} =~ /^\d+$/ || &error($text{'login_elgid'});
|
||||
&save_directive($conf, "last_valid_gid",
|
||||
$in{'lgid_def'} ? undef : $in{'lgid'});
|
||||
|
||||
&save_directive($conf,
|
||||
&version_atleast("2")
|
||||
? "mail_access_groups"
|
||||
: "mail_extra_groups",
|
||||
&save_directive($conf, "mail_extra_groups",
|
||||
$in{'extra_def'} ? undef : $in{'extra'});
|
||||
|
||||
$in{'chroot_def'} || -d $in{'chroot'} || &error($text{'login_echroot'});
|
||||
|
||||
@@ -17,59 +17,27 @@ else {
|
||||
}
|
||||
|
||||
# Add index file location
|
||||
if (&version_below("2.4")) {
|
||||
$env || !$in{'indexmode'} || &error($text{'mail_eindexmode'});
|
||||
$env || !$in{'controlmode'} || &error($text{'mail_econtrolmode'});
|
||||
if ($in{'indexmode'} == 1) {
|
||||
$env .= ":INDEX=MEMORY";
|
||||
}
|
||||
elsif ($in{'indexmode'} == 2) {
|
||||
$in{'index'} =~ /^\/\S+$/ || &error($text{'mail_eindex'});
|
||||
$env .= ":INDEX=".$in{'index'};
|
||||
}
|
||||
if ($in{'controlmode'}) {
|
||||
$in{'control'} =~ /^\/\S+$/ || &error($text{'mail_econtrol'});
|
||||
$env .= ":CONTROL=".$in{'control'};
|
||||
}
|
||||
$env || !$in{'indexmode'} || &error($text{'mail_eindexmode'});
|
||||
$env || !$in{'controlmode'} || &error($text{'mail_econtrolmode'});
|
||||
if ($in{'indexmode'} == 1) {
|
||||
$env .= ":INDEX=MEMORY";
|
||||
}
|
||||
else {
|
||||
# Parse index and control first
|
||||
if ($in{'indexmode'} == 1) {
|
||||
$index = "MEMORY";
|
||||
}
|
||||
elsif ($in{'indexmode'} == 2) {
|
||||
$in{'index'} =~ /^\/\S+$/ || $in{'index'} =~ /^~\S+$/ ||
|
||||
&error($text{'mail_eindex'});
|
||||
$index = $in{'index'};
|
||||
}
|
||||
if ($in{'controlmode'}) {
|
||||
$in{'control'} =~ /^\/\S+$/ || $in{'control'} =~ /^~\S+$/ ||
|
||||
&error($text{'mail_econtrol'});
|
||||
$control = $in{'control'};
|
||||
}
|
||||
# Directly save dedicated mail_index_path and mail_control_path
|
||||
&save_directive($conf, "mail_index_path",
|
||||
$index eq "" ? undef : $index);
|
||||
&save_directive($conf, "mail_control_path",
|
||||
$control eq "" ? undef : $control);
|
||||
elsif ($in{'indexmode'} == 2) {
|
||||
$in{'index'} =~ /^\/\S+$/ || &error($text{'mail_eindex'});
|
||||
$env .= ":INDEX=".$in{'index'};
|
||||
}
|
||||
if ($in{'controlmode'}) {
|
||||
$in{'control'} =~ /^\/\S+$/ || &error($text{'mail_econtrol'});
|
||||
$env .= ":CONTROL=".$in{'control'};
|
||||
}
|
||||
|
||||
if (&find("default_mail_env", $conf, 2)) {
|
||||
&save_directive($conf, "default_mail_env", $env eq "" ? undef : $env);
|
||||
}
|
||||
elsif (&find("mail_path", $conf, 2)) {
|
||||
&save_directive($conf, "mail_path", $env eq "" ? undef : $env);
|
||||
}
|
||||
else {
|
||||
&save_directive($conf, "mail_location", $env eq "" ? undef : $env);
|
||||
}
|
||||
|
||||
# Mail file format
|
||||
if (&version_atleast("2.4")) {
|
||||
my $driver = $in{'driver'};
|
||||
&save_directive($conf, "mail_driver", $driver eq "" ? undef : $driver);
|
||||
}
|
||||
|
||||
# Idle intervals
|
||||
$in{'idle'} != 2 || $in{'idlei'} =~ /^\d+$/ || &error($text{'mail_eidle'});
|
||||
&save_directive($conf, "mailbox_idle_check_interval",
|
||||
@@ -89,12 +57,17 @@ else {
|
||||
$in{'change'} ? $in{'change'} : undef);
|
||||
}
|
||||
|
||||
if (&version_below("2")) {
|
||||
# Umask
|
||||
$in{'umask_def'} || $in{'umask'} =~ /^[0-7]{4}$/ ||
|
||||
&error($text{'mail_eumask'});
|
||||
&save_directive($conf, "umask",
|
||||
$in{'umask_def'} ? undef : $in{'umask'});
|
||||
# Umask
|
||||
$in{'umask_def'} || $in{'umask'} =~ /^[0-7]{4}$/ ||&error($text{'mail_eumask'});
|
||||
&save_directive($conf, "umask",
|
||||
$in{'umask_def'} ? undef : $in{'umask'});
|
||||
|
||||
# UIDL format
|
||||
if (&find("pop3_uidl_format", $conf, 2)) {
|
||||
$uidl = $in{'pop3_uidl_format'} eq '*' ?
|
||||
$in{'pop3_uidl_format_other'} : $in{'pop3_uidl_format'};
|
||||
$uidl =~ /^\S+$/ || &error($text{'mail_euidl'});
|
||||
&save_directive($conf, "pop3_uidl_format", $uidl);
|
||||
}
|
||||
|
||||
# LAST command
|
||||
|
||||
@@ -7,14 +7,10 @@ require './dovecot-lib.pl';
|
||||
$conf = &get_config();
|
||||
&lock_dovecot_files($conf);
|
||||
|
||||
# Save SSL cert
|
||||
# Save SSL cert and key
|
||||
$in{'cert_def'} || -r $in{'cert'} || $in{'cert'} =~ /^[<>\|]/ ||
|
||||
&error($text{'ssl_ecert'});
|
||||
if (&version_atleast("2.4")) {
|
||||
&save_directive($conf, "ssl_server_cert_file",
|
||||
$in{'cert_def'} ? undef : $in{'cert'}, "");
|
||||
}
|
||||
elsif (&find_value("ssl_cert", $conf, 2) || &version_atleast("2.2")) {
|
||||
if (&find_value("ssl_cert", $conf, 2) || &version_atleast("2.2")) {
|
||||
$in{'cert'} = "<".$in{'cert'} if ($in{'cert'} =~ /^\//);
|
||||
&save_directive($conf, "ssl_cert",
|
||||
$in{'cert_def'} ? undef : $in{'cert'}, "");
|
||||
@@ -24,14 +20,9 @@ else {
|
||||
$in{'cert_def'} ? undef : $in{'cert'});
|
||||
}
|
||||
|
||||
# Save SSL key
|
||||
$in{'key_def'} || -r $in{'key'} || $in{'key'} =~ /^[<>\|]/ ||
|
||||
&error($text{'ssl_ekey'});
|
||||
if (&version_atleast("2.4")) {
|
||||
&save_directive($conf, "ssl_server_key_file",
|
||||
$in{'key_def'} ? undef : $in{'key'}, "");
|
||||
}
|
||||
elsif (&find_value("ssl_key", $conf, 2) || &version_atleast("2.2")) {
|
||||
if (&find_value("ssl_key", $conf, 2) || &version_atleast("2.2")) {
|
||||
$in{'key'} = "<".$in{'key'} if ($in{'key'} =~ /^\//);
|
||||
&save_directive($conf, "ssl_key",
|
||||
$in{'key_def'} ? undef : $in{'key'}, "");
|
||||
@@ -44,11 +35,7 @@ else {
|
||||
# Save SSL CA cert
|
||||
$in{'ca_def'} || -r $in{'ca'} || $in{'ca'} =~ /^[<>\|]/ ||
|
||||
&error($text{'ssl_eca'});
|
||||
if (&version_atleast("2.4")) {
|
||||
&save_directive($conf, "ssl_server_ca_file",
|
||||
$in{'ca_def'} ? undef : $in{'ca'}, "");
|
||||
}
|
||||
elsif (&find_value("ssl_ca", $conf, 2) || &version_atleast("2.2")) {
|
||||
if (&find_value("ssl_ca", $conf, 2) || &version_atleast("2.2")) {
|
||||
$in{'ca'} = "<".$in{'ca'} if ($in{'ca'} =~ /^\//);
|
||||
&save_directive($conf, "ssl_ca",
|
||||
$in{'ca_def'} ? undef : $in{'ca'}, "");
|
||||
@@ -60,29 +47,15 @@ else {
|
||||
|
||||
# Save SSL key password
|
||||
$in{'pass_def'} || $in{'pass'} =~ /\S/ || &error($text{'ssl_epass'});
|
||||
&save_directive($conf,
|
||||
&version_atleast("2.4")
|
||||
? "ssl_server_key_password"
|
||||
: "ssl_key_password",
|
||||
$in{'pass_def'} ? undef : $in{'pass'});
|
||||
&save_directive($conf, "ssl_key_password",
|
||||
$in{'pass_def'} ? undef : $in{'pass'});
|
||||
|
||||
# Save SSL parameter regeneration time
|
||||
if (&version_below("2.4")) {
|
||||
$in{'regen_def'} || $in{'regen'} =~ /^\d+$/ ||
|
||||
&error($text{'ssl_eregen'});
|
||||
&save_directive($conf, "ssl_parameters_regenerate",
|
||||
$in{'regen_def'} ? undef : $in{'regen'});
|
||||
}
|
||||
$in{'regen_def'} || $in{'regen'} =~ /^\d+$/ || &error($text{'ssl_eregen'});
|
||||
&save_directive($conf, "ssl_parameters_regenerate",
|
||||
$in{'regen_def'} ? undef : $in{'regen'});
|
||||
|
||||
# Save plaintext password setting
|
||||
if (&find_value("auth_allow_cleartext", $conf, 2)) {
|
||||
&save_directive($conf, "auth_allow_cleartext",
|
||||
$in{'plain'} ? $in{'plain'} : undef);
|
||||
}
|
||||
else {
|
||||
&save_directive($conf, "disable_plaintext_auth",
|
||||
$in{'plain'} ? $in{'plain'} : undef);
|
||||
}
|
||||
&save_directive($conf, "disable_plaintext_auth",
|
||||
$in{'plain'} ? $in{'plain'} : undef);
|
||||
|
||||
&flush_file_lines();
|
||||
&unlock_dovecot_files($conf);
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
firewall_cmd=firewall-cmd
|
||||
init_name=firewalld
|
||||
config_dir=/etc/firewalld
|
||||
packet_handling=0
|
||||
timeout=0
|
||||
packet_handling=drop
|
||||
|
||||
@@ -2,4 +2,3 @@ firewall_cmd=Full path to firewall-cmd program,0
|
||||
init_name=FirewallD init script name,0
|
||||
config_dir=FirewallD configuration directory,0
|
||||
packet_handling=Default packet handling action,1,0-<tt>drop</tt>,1-<tt>reject</tt>
|
||||
timeout=Timeout for temporary rules,15,timeout_data
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
require './firewalld-lib.pl';
|
||||
|
||||
# show_timeout_data(value, config-option-name)
|
||||
# Returns a radio button and a select box for timeout values
|
||||
sub show_timeout_data
|
||||
{
|
||||
my ($value, $name) = @_;
|
||||
$name = &format_option_name($name);
|
||||
my $radio = &ui_radio(
|
||||
"${name}_def", !$value ? 1 : 0,
|
||||
[ [ 1, $text{'config_timeout_none'} ],
|
||||
[ 0, ' ' ] ] );
|
||||
my @list = &get_timeouts();
|
||||
my @opts = map { [ $_, $text{"config_timeout_$_"} ] } @list;
|
||||
my $select = &ui_select($name, !$value ? $list[3] : $value, \@opts);
|
||||
return $radio . ' ' . $select;
|
||||
}
|
||||
|
||||
# parse_timeout_data(old-value, config-option-name)
|
||||
# Parses the timeout value from the form input
|
||||
sub parse_timeout_data
|
||||
{
|
||||
my ($oldval, $name) = @_;
|
||||
$name = &format_option_name($name);
|
||||
my $val = $in{$name} // '';
|
||||
return 0 if ($in{"${name}_def"});
|
||||
my %valid = map { $_ => 1 } &get_timeouts();
|
||||
&error(&text('config_timeout_err', $val)) unless($valid{$val});
|
||||
return $val;
|
||||
}
|
||||
|
||||
# get_timeouts
|
||||
# Returns a list of valid timeout values for the select box
|
||||
sub get_timeouts
|
||||
{
|
||||
return qw(1m 5m 15m 30m 1h 3h 6h 12h 1d 3d 7d 30d);
|
||||
}
|
||||
|
||||
# format_option_name(name)
|
||||
# Formats the option name for use in HTML element names
|
||||
sub format_option_name
|
||||
{
|
||||
my ($name) = @_;
|
||||
$name =~ s/\s+/_/g;
|
||||
$name =~ s/[^\x00-\x7F]/_/g;
|
||||
$name = lc($name);
|
||||
return $name;
|
||||
}
|
||||
@@ -540,14 +540,6 @@ if (!$zone) {
|
||||
$zone = $zone->{'name'};
|
||||
}
|
||||
|
||||
# Timeout
|
||||
my $timeout = $opts->{'timeout'};
|
||||
if ($timeout) {
|
||||
# Validate timeout format
|
||||
&error(&text('config_timeout_err', $timeout))
|
||||
if ($timeout !~ /^(\d+)([smhd]?)$/);
|
||||
}
|
||||
|
||||
# Permanent rule
|
||||
my $permanent = $opts->{'permanent'};
|
||||
|
||||
@@ -556,8 +548,7 @@ my $get_cmd = sub {
|
||||
my ($rtype) = @_;
|
||||
my $type = $rtype ? " --permanent" : "";
|
||||
return "$config{'firewall_cmd'} --zone=\"".quotemeta($zone)."\"".
|
||||
"$type --".quotemeta($action)."-rich-rule='$opts->{'rule'}'".
|
||||
($timeout ? " --timeout=".quotemeta($timeout) : "");
|
||||
"$type --".quotemeta($action)."-rich-rule='$opts->{'rule'}'";
|
||||
};
|
||||
|
||||
for my $type (0..1) {
|
||||
|
||||
@@ -50,21 +50,6 @@ index_dependent=Failed to restart $1 dependent service
|
||||
index_manual=Edit Config Files.
|
||||
index_downrules=FirewallD rules cannot be created or edited and are not enforced unless the server is running.
|
||||
|
||||
config_timeout_none=None
|
||||
config_timeout_1m=1 minute
|
||||
config_timeout_5m=5 minutes
|
||||
config_timeout_15m=15 minutes
|
||||
config_timeout_30m=30 minutes
|
||||
config_timeout_1h=1 hour
|
||||
config_timeout_3h=3 hours
|
||||
config_timeout_6h=6 hours
|
||||
config_timeout_12h=12 hours
|
||||
config_timeout_1d=1 day
|
||||
config_timeout_3d=3 days
|
||||
config_timeout_7d=7 days
|
||||
config_timeout_30d=30 days
|
||||
config_timeout_err=Invalid timeout value <tt>$1</tt>
|
||||
|
||||
manual_title=Edit Config Files
|
||||
manual_editsel=Edit FirewallD configuration file
|
||||
manual_err=Failed to save config file
|
||||
|
||||
@@ -6,7 +6,7 @@ use warnings;
|
||||
no warnings 'redefine';
|
||||
no warnings 'uninitialized';
|
||||
require './firewalld-lib.pl';
|
||||
our (%in, %text, %config);
|
||||
our (%in, %text);
|
||||
&ReadParse();
|
||||
|
||||
# Setup error messages
|
||||
@@ -31,7 +31,6 @@ $ip =~ s/\Q$mask\E// if ($mask);
|
||||
|
||||
# Block the IP
|
||||
my $perm = $in{'permanent'} ? 'perm' : '';
|
||||
my $timeout = $config{'timeout'} unless ($perm && $config{'timeout'});
|
||||
my ($out, $rs) = &rich_rule('add',
|
||||
{ 'rule' =>
|
||||
&construct_rich_rule(
|
||||
@@ -39,8 +38,7 @@ my ($out, $rs) = &rich_rule('add',
|
||||
'action' => $allow ? 'accept' : undef,
|
||||
'priority' => $allow ? -32767 : -32766,
|
||||
),
|
||||
'zone' => $zone->{'name'}, 'permanent' => $perm,
|
||||
'timeout' => $timeout });
|
||||
'zone' => $zone->{'name'}, 'permanent' => $perm });
|
||||
&error($out) if ($rs);
|
||||
&apply_firewalld() if ($perm);
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 2.4 KiB |
@@ -15,9 +15,6 @@ table.formsection, table.ui_table, table.loginform {
|
||||
table.ui_table .ui_table {
|
||||
border: none;
|
||||
}
|
||||
table.shrinkwrapper > tbody > tr > td > .ui_table {
|
||||
table-layout: fixed;
|
||||
}
|
||||
img, a img { border:0; }
|
||||
tr.row0 {background-color:#e8e8ea;}
|
||||
tr.row1 {background-color:#f8f8fa;}
|
||||
@@ -143,16 +140,11 @@ div.wrapper {
|
||||
background-color:#D9D9D9;
|
||||
}
|
||||
.goArrow { margin-bottom: -4px; }
|
||||
.ui_checked_columns .ui_checked_checkbox {
|
||||
min-width: 20px;
|
||||
}
|
||||
|
||||
.ui_form_label{
|
||||
text-align:right;
|
||||
vertical-align:top;
|
||||
}
|
||||
.ui_form_pair .ui_form_value {
|
||||
padding-left: 8px;
|
||||
}
|
||||
.ui_form_pair td {padding:4px;}
|
||||
.ui_form_pair td table.ui_radio_table tr td {padding:2px;}
|
||||
.ui_form_pair td table tr td {padding:0px;}
|
||||
@@ -228,16 +220,8 @@ br[data-x-br] {
|
||||
opacity: .8;
|
||||
}
|
||||
|
||||
tr:has(.ui_help) td:not(:hover) .ui_help {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
tr:has(.ui_help) td.ui_form_label .ui_help {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
td:not(:hover) .ui_link_help {
|
||||
visibility: hidden;
|
||||
.ui_text_wrap {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.ui_link_help {
|
||||
@@ -246,13 +230,12 @@ td:not(:hover) .ui_link_help {
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.ui_text_wrap {
|
||||
float: right;
|
||||
td:not(:hover) .ui_link_help {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
[data-tooltip][aria-label] {
|
||||
position: relative;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
[data-tooltip][aria-label]::after {
|
||||
@@ -439,10 +422,6 @@ details.ui_hidden_table_start > summary::-webkit-details-marker {
|
||||
color: #a1acc0;
|
||||
}
|
||||
|
||||
details:not([open]).on-hover:not(:hover) summary::after {
|
||||
visibility: hidden !important;
|
||||
}
|
||||
|
||||
details.inline {
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
@@ -459,23 +438,6 @@ details.inline > summary + span {
|
||||
line-height: 1.33;
|
||||
}
|
||||
|
||||
details.inline.inlined > summary,
|
||||
details.inline.inlined {
|
||||
display: inline !important;
|
||||
}
|
||||
|
||||
details > span .ui_alert_box {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
details > span .ui_alert_box:not(:has(+p)) {
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
details.inline.inlined > span {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
details.inline > summary + span > tt {
|
||||
font-size: 96%;
|
||||
}
|
||||
@@ -499,12 +461,6 @@ details[open].inline > summary:after {
|
||||
content: '⏷';
|
||||
}
|
||||
|
||||
details.inline.fit > summary + span span,
|
||||
details.inline.fit > summary + span {
|
||||
width: fit-content;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
[data-second-print]:has(details) + br:has(+[data-x-br]) {
|
||||
display: none;
|
||||
}
|
||||
@@ -863,31 +819,7 @@ body > .mode > b[data-mode="server-manager"] > a > .ff-cloudmin {
|
||||
filter: grayscale(1) contrast(1);
|
||||
}
|
||||
.not-secure {
|
||||
color: #c40000;
|
||||
color: #f00a38;
|
||||
float: right;
|
||||
}
|
||||
.inherit-color::after,
|
||||
.inherit-color::before,
|
||||
.inherit-color:focus::after,
|
||||
.inherit-color:focus::before,
|
||||
.inherit-color:active::after,
|
||||
.inherit-color:active::before,
|
||||
.inherit-color:hover::after,
|
||||
.inherit-color:hover::before,
|
||||
.inherit-color:focus,
|
||||
.inherit-color:active,
|
||||
.inherit-color:hover,
|
||||
.inherit-color {
|
||||
color: inherit !important;
|
||||
}
|
||||
.table-simple {
|
||||
width: auto !important;
|
||||
max-width: 100%;
|
||||
}
|
||||
.table-simple tr td {
|
||||
padding: 0 4px !important;
|
||||
}
|
||||
.field-sizing-content {
|
||||
field-sizing: content !important;
|
||||
min-width: 40px !important;
|
||||
cursor: help;
|
||||
}
|
||||
|
||||
@@ -335,13 +335,11 @@ elsif ($init_mode eq "systemd" && $access{'bootup'}) {
|
||||
&select_invert_link("d"),
|
||||
&ui_link("edit_systemd.cgi?new=1", $text{'index_sadd'}) );
|
||||
print &ui_links_row(\@links);
|
||||
print &ui_columns_start([ "", $text{'systemd_name'},
|
||||
$config{'desc'} ? $text{'systemd_desc'} : (),
|
||||
$text{'systemd_type'},
|
||||
$text{'systemd_status'},
|
||||
$text{'systemd_boot'},
|
||||
$text{'index_ustatus'} ]);
|
||||
my $units_piped = join('|', map { quotemeta } &get_systemd_unit_types());
|
||||
print &ui_columns_start([ "", $text{'index_uname'},
|
||||
$text{'index_udesc'},
|
||||
$text{'index_ucstatus'},
|
||||
$text{'index_uboot'},
|
||||
$text{'index_ustatus'}, ]);
|
||||
foreach $u (&list_systemd_services()) {
|
||||
if ($u->{'legacy'}) {
|
||||
$l = "edit_action.cgi?0+".&urlize($u->{'name'});
|
||||
@@ -349,23 +347,12 @@ elsif ($init_mode eq "systemd" && $access{'bootup'}) {
|
||||
else {
|
||||
$l = "edit_systemd.cgi?name=".&urlize($u->{'name'});
|
||||
}
|
||||
my $sname = $u->{'name'};
|
||||
my ($type) = $sname =~ /\.([^.]+)$/;
|
||||
if (defined($type) && $type =~ /^(?:$units_piped)$/) {
|
||||
$sname =~ s/\.$type$//;
|
||||
}
|
||||
else {
|
||||
$type = '';
|
||||
}
|
||||
my $title = ($u->{'boot'} == -1 ?
|
||||
&html_escape($sname) :
|
||||
&ui_link($l, &html_escape($sname)));
|
||||
my $desc = $config{'desc'} ? &html_escape($u->{'desc'}) : undef;
|
||||
print &ui_columns_row([
|
||||
&ui_checkbox("d", $u->{'name'}, undef),
|
||||
$title,
|
||||
$desc // (),
|
||||
$type,
|
||||
$u->{'boot'} == -1 ?
|
||||
&html_escape($u->{'name'}) :
|
||||
&ui_link($l, &html_escape($u->{'name'})),
|
||||
&html_escape($u->{'desc'}),
|
||||
$u->{'fullstatus'} || "<i>$text{'index_unknown'}</i>",
|
||||
$u->{'boot'} == 1 ?
|
||||
&ui_text_color("$text{'yes'}", 'success') :
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user