Commit ecf53783 authored by Marius Burkard's avatar Marius Burkard

- reverted previous commit (partly)

parent 6844de84
......@@ -1166,13 +1166,11 @@ class apache2_plugin {
$bundle_tmp_file = "/etc/letsencrypt/live/".$domain."/chain.pem";
$webroot = $data['new']['document_root']."/web";
$wk_dir_existed = false;
if(is_dir($webroot . '/.well-known')) $wk_dir_existed = true;
//* check if we have already a Let's Encrypt cert
if(!file_exists($crt_tmp_file) && !file_exists($key_tmp_file)) {
$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
if(is_dir($webroot . "/.well-known/acme-challenge/")) {
if(is_dir($webroot . "/.well-known/")) {
$app->log("Remove old challenge directory", LOGLEVEL_DEBUG);
$this->_exec("rm -rf " . $webroot . "/.well-known/acme-challenge/");
}
......@@ -1189,12 +1187,7 @@ class apache2_plugin {
if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
$this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot));
}
}
if($wk_dir_existed == false && is_dir($webroot . '/.well-known')) {
$this->_exec("rm -rf " . $webroot . "/.well-known");
} elseif(is_dir($webroot . "/.well-known/acme-challenge/")) {
$this->_exec("rm -rf " . $webroot . "/.well-known/acme-challenge/");
}
};
//* check is been correctly created
if(file_exists($crt_tmp_file) OR file_exists($key_tmp_file)) {
......
......@@ -1286,13 +1286,11 @@ class nginx_plugin {
$key_tmp_file = "/etc/letsencrypt/live/".$domain."/privkey.pem";
$webroot = $data['new']['document_root']."/web";
$wk_dir_existed = false;
if(is_dir($webroot . '/.well-known')) $wk_dir_existed = true;
//* check if we have already a Let's Encrypt cert
if(!file_exists($crt_tmp_file) && !file_exists($key_tmp_file)) {
$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
if(is_dir($webroot . "/.well-known/acme-challenge/")) {
if(is_dir($webroot . "/.well-known/")) {
$app->log("Remove old challenge directory", LOGLEVEL_DEBUG);
$this->_exec("rm -rf " . $webroot . "/.well-known/acme-challenge/");
}
......@@ -1309,12 +1307,7 @@ class nginx_plugin {
if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
$this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot));
}
}
if($wk_dir_existed == false && is_dir($webroot . '/.well-known')) {
$this->_exec("rm -rf " . $webroot . "/.well-known");
} elseif(is_dir($webroot . "/.well-known/acme-challenge/")) {
$this->_exec("rm -rf " . $webroot . "/.well-known/acme-challenge/");
}
};
//* check is been correctly created
if(file_exists($crt_tmp_file) OR file_exists($key_tmp_file)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment