Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-18 324bfbde30d632bcd19009dbca1cb68cb160fbc1

 server/plugins-available/apache2_plugin.inc.php

@@ -1052,6 +1052,10 @@
                        }
                     }
                  }

                  foreach($sub_prefixes as $s) {
                     $temp_domains[] = $s . $aliasdomain['domain'];
                  }
               }
            }
         }
@@ -1137,6 +1141,7 @@
         $lddomain = $domain;
         $subdomains = null;
         $aliasdomains = null;
         $sub_prefixes = array();

         //* be sure to have good domain
         if($data['new']['subdomain'] == "www" OR $data['new']['subdomain'] == "*") {
@@ -1148,6 +1153,7 @@
         if(is_array($subdomains)) {
            foreach($subdomains as $subdomain) {
               $temp_domains[] = $subdomain['domain'];
               $sub_prefixes[] = str_replace($domain, "", $subdomain['domain']);
            }
         }
         
@@ -1183,22 +1189,8 @@
         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/acme-challenge/")) {
               $app->log("Remove old challenge directory", LOGLEVEL_DEBUG);
               $this->_exec("rm -rf " . $webroot . "/.well-known/acme-challenge/");
            }

            $app->log("Create challenge directory", LOGLEVEL_DEBUG);
            $app->system->mkdirpath($webroot . "/.well-known/");
            $app->system->chown($webroot . "/.well-known/", $data['new']['system_user']);
            $app->system->chgrp($webroot . "/.well-known/", $data['new']['system_group']);
            $app->system->mkdirpath($webroot . "/.well-known/acme-challenge");
            $app->system->chown($webroot . "/.well-known/acme-challenge/", $data['new']['system_user']);
            $app->system->chgrp($webroot . "/.well-known/acme-challenge/", $data['new']['system_group']);
            $app->system->chmod($webroot . "/.well-known/acme-challenge", "g+s");
				
            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 " . escapeshellarg($webroot));
               $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");
            }
         };