mirror of
https://github.com/webmin/webmin.git
synced 2026-03-20 08:40:24 +00:00
Merge branch 'master' of github.com:webmin/webmin
This commit is contained in:
Jamie Cameron
@@ -215,7 +215,7 @@ More German translation updates, thanks to Raymond Vetter.
|
||||
---- Changes since 1.730 ----
|
||||
More German translation updates, thanks to Raymond Vetter.
|
||||
Norwegian updates, thanks to Stein-Aksel Basma.
|
||||
The awesome new Authentic Theme by Ilia Rostovtsev is now included in the Webmin package.
|
||||
The awesome new Authentic Theme by @iliajie is now included in the Webmin package.
|
||||
Catalan translation updates from Jaume Badiella.
|
||||
---- Changes since 1.740 ----
|
||||
Norwegian updates, thanks to Stein-Aksel Basma.
|
||||
|
||||
@@ -44,7 +44,7 @@ Complete set of documentation for Webmin and all of its modules can be found at
|
||||
### Contributors
|
||||
|
||||
* [Joe Cooper](https://github.com/swelljoe)
|
||||
* [Ilia Rostovtsev](https://github.com/rostovtsev)
|
||||
* [Ilia Ross](https://github.com/iliajie)
|
||||
* [Kay Marquardt](https://github.com/gnadelwartz)
|
||||
* [Nawawi Jamili](https://github.com/nawawi) + [57 more..](https://github.com/webmin/webmin/graphs/contributors)
|
||||
|
||||
|
||||
@@ -1916,4 +1916,4 @@ Verbosely print processed files and provide detailed output. By detault, verbose
|
||||
|
||||
=head1 LICENSE AND COPYRIGHT
|
||||
|
||||
Copyright 2020 Ilia Rostovtsev <programming@rostovtsev.io>
|
||||
Copyright 2022 Ilia Ross <code@ilia.engineer>
|
||||
|
||||
@@ -236,5 +236,5 @@ Set new user password. Using this option may be unsecure.
|
||||
|
||||
Copyright 2021 Jamie Cameron <jcameron@webmin.com>
|
||||
Joe Cooper <joe@virtualmin.com>
|
||||
Ilia Rostovtsev <ilia@virtualmin.com>
|
||||
Ilia Ross <ilia@virtualmin.com>
|
||||
|
||||
|
||||
@@ -418,8 +418,8 @@ non-0 on error
|
||||
|
||||
=head1 LICENSE AND COPYRIGHT
|
||||
|
||||
Copyright 2021
|
||||
Jamie Cameron <jcameron@webmin.com>,
|
||||
Copyright 2022
|
||||
Jamie Cameron <jamie@virtualmin.com>,
|
||||
Joe Cooper <joe@virtualmin.com>,
|
||||
Ilia Rostovtsev <ilia@rostovtsev.io>.
|
||||
Ilia Ross <ilia@virtualmin.com>.
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@ by_view=0
|
||||
confirm_zone=1
|
||||
confirm_rec=0
|
||||
no_chroot=0
|
||||
chroot=/var/named/chroot
|
||||
relative_paths=0
|
||||
rndc_cmd=rndc
|
||||
master_dir=/var/named
|
||||
@@ -44,6 +43,14 @@ signzone=dnssec-signzone
|
||||
checkconf=named-checkconf
|
||||
other_slaves=1
|
||||
restart_cmd=restart
|
||||
keygen=dnssec-keygen
|
||||
tmpl_dnssec=0
|
||||
dnssec_period=21
|
||||
tmpl_dnssec_dt=1
|
||||
dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
|
||||
dnssectools_rollrec=/var/named/system.rollrec
|
||||
dnssectools_keydir=/var/named/dtkeys
|
||||
dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
|
||||
force_random=0
|
||||
spf_record=0
|
||||
dnssec_info=1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
-- Version 0.9.6 --
|
||||
- Fixed `Undefined subroutine &filemin::ceil
|
||||
Caused on some systems by not including POSIX package in filemin-lib.pl.
|
||||
- Major Authentic interface improvement by Ilia Rostovtsev
|
||||
- Major Authentic interface improvement by @iliajie
|
||||
1. Working sorting files by size (with next Authentic Theme - perfectly, now just alright).
|
||||
This fix will also prevent fatal code breaks despite of user settings
|
||||
2. Store user chose on columns sorting upon page refresh
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#42 fixed:
|
||||
- Fixing conflict with Authentic Theme codeMirror
|
||||
By Ilia.
|
||||
by @iliajie
|
||||
|
||||
#46 fixed:
|
||||
- Module is now installable from Usermin.
|
||||
@@ -29,7 +29,7 @@
|
||||
-- Version 0.9.5 --
|
||||
- Made top level menu items translatable.
|
||||
- Added https://github.com/Real-Gecko/filemin/pull/29
|
||||
Selected rows also highlight on hover + color tweaks, by https://github.com/rostovtsev
|
||||
Selected rows also highlight on hover + color tweaks, by https://github.com/iliajie
|
||||
- Some code cleanup, got rid of Regexp::Common and URI dependencies.
|
||||
Thanks to Jamie Cameron.
|
||||
- Added error message if file saving fails.
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
#21 fixed:
|
||||
- Added Codemirror to module for syntax highlighting, thanks to https://github.com/pabloko for solution.
|
||||
- Under Authentic 14.01 now works too, thanks to https://github.com/rostovtsev for fix.
|
||||
- Under Authentic 14.01 now works too, thanks to https://github.com/iliajie for fix.
|
||||
|
||||
#24 fixed:
|
||||
- Added zip compression method, user now can select between 'zip' and 'tar' compression methods.
|
||||
@@ -169,7 +169,7 @@ Mielstone reached:
|
||||
|
||||
#1 fixed:
|
||||
- After long discussion upper-left toolbar finally looks good in modern interface
|
||||
- Thanks to https://github.com/Goeny for his brilliant solution and https://github.com/rostovtsev for debugging
|
||||
- Thanks to https://github.com/Goeny for his brilliant solution and https://github.com/iliajie for debugging
|
||||
|
||||
#3 fixed:
|
||||
- Some misspellings fixed
|
||||
|
||||
@@ -133,7 +133,7 @@ select, input[type="button"][onclick], button.btn-default.file_chooser_button, b
|
||||
a:hover {
|
||||
cursor:pointer;
|
||||
}
|
||||
/* by https://github.com/rostovtsev */
|
||||
/* by https://github.com/iliajie */
|
||||
#list_form tbody tr.checked:not(.m-active-o):not(.m-not-active):hover,
|
||||
#list_form tbody tr:hover:not(.m-active-o):not(.m-not-active) {
|
||||
background: #d3e4f4 !important;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
#############################################################################
|
||||
# Update webmin/usermin to the latest develop version from GitHub repo
|
||||
# inspired by authentic-theme/theme-update.sh script, thanks @rostovtsev
|
||||
# inspired by authentic-theme/theme-update.sh script, thanks @iliajie
|
||||
#
|
||||
VERS="1.6.9, 2020-06-18"
|
||||
#
|
||||
@@ -117,8 +117,8 @@ Examples:
|
||||
${IAM} -force OR ${IAM} -yes
|
||||
same but without asking,
|
||||
|
||||
${IAM} -force -repo:rostovtsev/webmin
|
||||
update from rostovtsev's repository without asking
|
||||
${IAM} -force -repo:webmin/webmin
|
||||
update from webmin's repository without asking
|
||||
|
||||
${IAM} -file module/module.info
|
||||
pull module.info for given module
|
||||
@@ -132,8 +132,8 @@ Examples:
|
||||
${IAM} -file module/lang/
|
||||
pull all files in lang/ dir of a module
|
||||
|
||||
${IAM} -fore -repo:rostovtsev/webmin -file */lang/
|
||||
pull lang files for all existing */lang/ dirs from rostovtsev
|
||||
${IAM} -fore -repo:webmin/webmin -file */lang/
|
||||
pull lang files for all existing */lang/ dirs from webmin
|
||||
repository without asking
|
||||
|
||||
Exit codes:
|
||||
|
||||
@@ -100,7 +100,7 @@ local $_;
|
||||
&clean_language();
|
||||
open(GPG, "$gpgpath --fingerprint ".quotemeta($_[0]->{'name'}->[0])." 2>/dev/null |");
|
||||
while(<GPG>) {
|
||||
if (/fingerprint\s+=\s+(.*)/) {
|
||||
if (/([0-9A-F]{4}\s+[0-9A-F]{4}\s+[0-9A-F]{4}\s+[0-9A-F]{4}\s+[0-9A-F]{4}\s+[0-9A-F]{4}\s+[0-9A-F]{4}\s+[0-9A-F]{4}\s+[0-9A-F]{4}\s+[0-9A-F]{4})/i) {
|
||||
$fp = $1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1129,7 +1129,7 @@ twofactor_eauthyid=Authy user ID must be a number
|
||||
twofactor_eauthytoken=Authy token must be a number
|
||||
twofactor_eauthyotp=Authy token is invalid
|
||||
twofactor_enrolllink=You can now enroll for two-factor authentication in the <a href='$1'>Webmin Users</a> module.
|
||||
twofactor_url=To learn more about $1, see it's website at <a href='$2' target=_blank>$2</a>.
|
||||
twofactor_url=To learn more about $1, see its website at <a href='$2' target=_blank>$2</a>.
|
||||
twofactor_etotpmodule=The Perl module <tt>$1</tt> needed for two-factor authentication is not installed. Use the <a href='$2'>Perl Modules</a> page in Webmin to install it.
|
||||
twofactor_qrcode=Enter the secret code $1 in the Google Authenticator app, or scan the QR code below.
|
||||
twofactor_etotpid=Invalid TOTP base32-encoded secret
|
||||
|
||||
@@ -42,8 +42,7 @@ our $primary_port = 80;
|
||||
our $webmin_key_email = "jcameron\@webmin.com";
|
||||
our $webmin_key_fingerprint = "1719 003A CE3E 5A41 E2DE 70DF D97A 3AE9 11F6 3C51";
|
||||
|
||||
our $authentic_key_email = "ilia\@rostovtsev.io";
|
||||
our $authentic_key_email_old = "ilia\@rostovtsev.ru";
|
||||
our $authentic_key_email = "gpg\@ilia.engineer";
|
||||
our $authentic_key_fingerprint = "EC60 F3DA 9CB7 9ADC CF56 0D1F 121E 166D D9C8 21AB";
|
||||
|
||||
our $standard_host = $primary_host;
|
||||
@@ -639,8 +638,7 @@ my ($ok, $err) = &import_gnupg_key(
|
||||
return ($ok, $err) if ($ok);
|
||||
|
||||
($ok, $err) = &import_gnupg_key(
|
||||
$authentic_key_email."|".$authentic_key_email_old,
|
||||
$authentic_key_fingerprint,
|
||||
$authentic_key_email, $authentic_key_fingerprint,
|
||||
"$root_directory/authentic-theme/THEME.pgp");
|
||||
return ($ok, $err) if ($ok);
|
||||
|
||||
@@ -661,13 +659,24 @@ return (0) if (!-r $path);
|
||||
my @keys = &list_keys();
|
||||
foreach my $k (@keys) {
|
||||
my $fp = &key_fingerprint($k);
|
||||
return ( 0 ) if ($k->{'email'}->[0] =~ /^$email$/ &&
|
||||
$fp && $fp eq $finger);
|
||||
# Key already been imported with correct contact
|
||||
if ($k->{'email'}->[0] eq $email && $fp && $fp eq $finger) {
|
||||
return (0);
|
||||
}
|
||||
# Key been imported before but contact changed, delete first
|
||||
elsif ($k->{'email'}->[0] ne $email && $fp && $fp eq $finger) {
|
||||
my $lfinger = $finger;
|
||||
$lfinger =~ s/\s+//g;
|
||||
my $out = &backquote_logged("$gpgpath --batch --delete-key ".quotemeta($lfinger)." 2>&1");
|
||||
if ($?) {
|
||||
return (2, $out);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Import it if not
|
||||
&list_keys();
|
||||
my $out = &backquote_logged("$gpgpath --import $path 2>&1");
|
||||
my $out = &backquote_logged("$gpgpath --import ".quotemeta($path)." 2>&1");
|
||||
if ($?) {
|
||||
return (2, $out);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user