diff options
| author | Alexandre Alouit <alexandre.alouit@gmail.com> | 2015-11-30 16:03:47 +0100 |
|---|---|---|
| committer | Alexandre Alouit <alexandre.alouit@gmail.com> | 2015-11-30 16:03:47 +0100 |
| commit | cde1917d97281b7e162719de477bf4b65a823491 (patch) | |
| tree | 1e967e10eb22a8ff740fb3f546cc88f8bd92cc95 | |
| parent | 7508d70198192aba9678d7dedc446a1ecb127d8b (diff) | |
bugfix
| -rwxr-xr-x | src/server/plugins-available/apache2_plugin.inc.php | 6 | ||||
| -rwxr-xr-x | src/server/plugins-available/nginx_plugin.inc.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/plugins-available/apache2_plugin.inc.php b/src/server/plugins-available/apache2_plugin.inc.php index 4dbbd78..1b28759 100755 --- a/src/server/plugins-available/apache2_plugin.inc.php +++ b/src/server/plugins-available/apache2_plugin.inc.php @@ -953,13 +953,13 @@ class apache2_plugin { //* Generate Let's Encrypt SSL certificat if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y') { //* be sure to have good domain - $lddomain = (string) "--domains $domain"; + $lddomain = (string) "$domain"; if($data['new']['subdomain'] == "www" OR $data['new']['subdomain'] == "*") { $lddomain .= (string) " --domains www." . $domain; } - $crt_tmp_file = "/etc/letsencrypt/live/".$lddomain."/cert.pem"; - $key_tmp_file = "/etc/letsencrypt/live/".$lddomain."/privkey.pem"; + $crt_tmp_file = "/etc/letsencrypt/live/".$domain."/cert.pem"; + $key_tmp_file = "/etc/letsencrypt/live/".$domain."/privkey.pem"; $webroot = $data['new']['document_root']."/web"; //* check if we have already a Let's Encrypt cert diff --git a/src/server/plugins-available/nginx_plugin.inc.php b/src/server/plugins-available/nginx_plugin.inc.php index 02d9be4..6c2aaa3 100755 --- a/src/server/plugins-available/nginx_plugin.inc.php +++ b/src/server/plugins-available/nginx_plugin.inc.php @@ -1113,15 +1113,15 @@ class nginx_plugin { //* Generate Let's Encrypt SSL certificat if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y') { //* be sure to have good domain - $lddomain = (string) "--domains $domain"; + $lddomain = (string) "$domain"; if($data['new']['subdomain'] == "www" OR $data['new']['subdomain'] == "*") { $lddomain .= (string) " --domains www." . $domain; } $tpl->setVar('ssl_letsencrypt', "y"); //* TODO: check dns entry is correct - $crt_tmp_file = "/etc/letsencrypt/live/".$lddomain."/fullchain.pem"; - $key_tmp_file = "/etc/letsencrypt/live/".$lddomain."/privkey.pem"; + $crt_tmp_file = "/etc/letsencrypt/live/".$domain."/fullchain.pem"; + $key_tmp_file = "/etc/letsencrypt/live/".$domain."/privkey.pem"; $webroot = $data['new']['document_root']."/web"; //* check if we have already a Let's Encrypt cert |