From 486e424dfd1c57c4b4fef5c01319aca6d53cd7cf Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:14:51 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/conf/nginx_vhost.conf.master | 2 +-
server/plugins-available/apache2_plugin.inc.php | 2 +-
interface/acme/.well-known/acme-challenge/empty.dir | 0
server/plugins-available/nginx_plugin.inc.php | 2 +-
install/tpl/apache_ispconfig.conf.master | 7 +++++--
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 4a125b1..937c2f5 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -118,14 +118,17 @@
Alias /awstats-icon "/usr/share/awstats/icon"
</tmpl_if>
-Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme-challenge
-<Directory /usr/local/ispconfig/interface/acme-challenge>
+Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
+<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
Require all granted
<tmpl_else>
Order allow,deny
Allow from all
</tmpl_if>
+ RewriteEngine on
+ RewriteCond %{REQUEST_FILENAME} ^/\.well-known/acme-challenge
+ RewriteRule ^.*$ - [END]
</Directory>
NameVirtualHost *:80
diff --git a/interface/acme-challenge/empty.dir b/interface/acme/.well-known/acme-challenge/empty.dir
similarity index 100%
rename from interface/acme-challenge/empty.dir
rename to interface/acme/.well-known/acme-challenge/empty.dir
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 0569674..67f1ee0 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -264,7 +264,7 @@
</tmpl_if>
location /\.well-known/acme-challenge {
- root /usr/local/ispconfig/interface/acme-challenge;
+ root /usr/local/ispconfig/interface/acme/.well-known/acme-challenge;
index index.html index.htm;
try_files $uri =404;
}
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 3a54946..52a8687 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1184,7 +1184,7 @@
$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
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 /usr/local/ispconfig/interface/acme-challenge");
+ $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 /usr/local/ispconfig/interface/acme");
}
};
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index e070725..33d5537 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1304,7 +1304,7 @@
$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
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 /usr/local/ispconfig/interface/acme-challenge");
+ $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 /usr/local/ispconfig/interface/acme");
}
};
--
Gitblit v1.9.1