Commit 5fa7b215 authored by Marius Burkard's avatar Marius Burkard

- fallback to ww. on letsencrypt path

- typo
parent 0579c7a5
......@@ -50,7 +50,7 @@ if($type == 'getservertype'){
$web_config = $app->getconf->get_server_config($server_id, 'web');
if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
$json .= $server_type;
unset($webconfig);
unset($web_config);
$json .= '"}';
}
......
......@@ -1254,6 +1254,11 @@ class apache2_plugin {
$crt_tmp_file = "/etc/letsencrypt/live/".$domain."/cert.pem";
$key_tmp_file = "/etc/letsencrypt/live/".$domain."/privkey.pem";
$bundle_tmp_file = "/etc/letsencrypt/live/".$domain."/chain.pem";
if(!is_dir("/etc/letsencrypt/live/".$domain)) {
$crt_tmp_file = "/etc/letsencrypt/live/www.".$domain."/fullchain.pem";
$key_tmp_file = "/etc/letsencrypt/live/www.".$domain."/privkey.pem";
$bundle_tmp_file = "/etc/letsencrypt/live/www.".$domain."/chain.pem";
}
$webroot = $data['new']['document_root']."/web";
//* check if we have already a Let's Encrypt cert
......
......@@ -1328,6 +1328,10 @@ class nginx_plugin {
//* TODO: check dns entry is correct
$crt_tmp_file = "/etc/letsencrypt/live/".$domain."/fullchain.pem";
$key_tmp_file = "/etc/letsencrypt/live/".$domain."/privkey.pem";
if(!is_dir("/etc/letsencrypt/live/".$domain)) {
$crt_tmp_file = "/etc/letsencrypt/live/www.".$domain."/fullchain.pem";
$key_tmp_file = "/etc/letsencrypt/live/www.".$domain."/privkey.pem";
}
$webroot = $data['new']['document_root']."/web";
//* check if we have already a Let's Encrypt cert
......
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