Merge pull request 'Fixes' (#90) from unstable into master

Reviewed-on: #90
This commit is contained in:
Mathieu Trossevin 2023-12-06 10:49:02 +01:00
commit 5a22490dc8
3 changed files with 6 additions and 1 deletions

View File

@ -20,6 +20,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
### Fixed
* letsencrypt: Add required check when retrieving certificate. (Avoid TypeError.)
### Removed
### Security

View File

@ -157,6 +157,9 @@ class LetsEncrypt
{
$stream = stream_context_create(array("ssl" => array("capture_peer_cert" => true)));
$read = stream_socket_client("ssl://" . $domain . ":443", $errno, $errstr, 10, STREAM_CLIENT_CONNECT, $stream);
if ($read === false) {
return false;
}
$cont = stream_context_get_params($read);
return $cont;

View File

@ -766,7 +766,7 @@ op_del() {
# Deactivate web vhost (apache or nginx)
if [ "$WEB_SERVER" == "apache" ]; then
if a2query -s test12 >/dev/null 2&>1; then
if a2query -s "${login}" >/dev/null 2&>1; then
a2dissite "${login}.conf"
fi
rm -f /etc/apache2/sites-available/"$login.conf"