diff --git a/webmin/lang/en b/webmin/lang/en index 3d6f56f95..80e75daea 100644 --- a/webmin/lang/en +++ b/webmin/lang/en @@ -1115,6 +1115,8 @@ letsencrypt_title=Let's Encrypt Certificate Request letsencrypt_err=Failed to request certificate letsencrypt_ecmds=Neither the Let's Encrypt client command letsencrypt-auto or the python command were found on your system letsencrypt_epythonmod=The Python module $1 needed by the built-in Let's Encrypt client is not installed +letsencrypt_epythonver=Failed to get the Python version : $1 +letsencrypt_epythonver2=Python version $1 or above is required, but you only have version $2. letsencrypt_edroot=The Apache virtual host $1 has no document directory! letsencrypt_edom=Missing or invalid domain name letsencrypt_erenew=Missing or non-numeric renewal interval diff --git a/webmin/letsencrypt-lib.pl b/webmin/letsencrypt-lib.pl index 9961756b0..c89320698 100755 --- a/webmin/letsencrypt-lib.pl +++ b/webmin/letsencrypt-lib.pl @@ -39,6 +39,15 @@ my $out = &backquote_command("$python -c 'import argparse' 2>&1"); if ($?) { return &text('letsencrypt_epythonmod', 'argparse'); } +my $ver = &backquote_command("$python --version 2>&1"); +if ($ver !~ /Python\s+([0-9\.]+)/) { + return &text('letsencrypt_epythonver', + "".&html_escape($out).""); + } +$ver = $1; +if ($ver < 2.5) { + return &text('letsencrypt_epythonver2', '2.5', $ver); + } return undef; }