Merge branch 'stable-3.1'

Marius Burkard

2016-01-22 698ed15a80799a5f3942200b7ff257563123878e

Merge branch 'stable-3.1'

 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);

 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);