From 5fa7b2152d12e683771ae0912f4cc7cc80bbe62c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 16 Jun 2017 09:43:28 +0200
Subject: [PATCH] - fallback to ww. on letsencrypt path - typo
---
interface/web/sites/ajax_get_json.php | 2 +-
server/plugins-available/apache2_plugin.inc.php | 5 +++++
server/plugins-available/nginx_plugin.inc.php | 4 ++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index c115b17c6f..913a81abf4 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -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 .= '"}';
}
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 31952c3c3c..a39e208053 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -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
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 25060962f3..849b8a9319 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -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
--
GitLab