From 698ed15a80799a5f3942200b7ff257563123878e Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 22 Jan 2016 05:00:47 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/plugins-available/apache2_plugin.inc.php | 4 ++--
server/plugins-available/nginx_plugin.inc.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 4386a01..4a6437e 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1170,9 +1170,9 @@
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/")) {
+ if(is_dir($webroot . "/.well-known/acme-challenge/")) {
$app->log("Remove old challenge directory", LOGLEVEL_DEBUG);
- $this->_exec("rm -rf " . $webroot . "/.well-known/");
+ $this->_exec("rm -rf " . $webroot . "/.well-known/acme-challenge/");
}
$app->log("Create challenge directory", LOGLEVEL_DEBUG);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index a8ecc74..f4c5f9d 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1290,9 +1290,9 @@
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/")) {
+ if(is_dir($webroot . "/.well-known/acme-challenge/")) {
$app->log("Remove old challenge directory", LOGLEVEL_DEBUG);
- $this->_exec("rm -rf " . $webroot . "/.well-known/");
+ $this->_exec("rm -rf " . $webroot . "/.well-known/acme-challenge/");
}
$app->log("Create challenge directory", LOGLEVEL_DEBUG);
--
Gitblit v1.9.1