Merge branch 'letsencrypt-alias' into 'stable-3.1'

Marius Burkard

2016-07-04 67f562d6772e032e72a6fe11a2cf2a90fd62b73b

Merge branch 'letsencrypt-alias' into 'stable-3.1'

Removed none from subdomain / alias list in letsencrypt generation

Removed "none" value from subdomain / alias list in letsencrypt generation

See merge request !362

 server/plugins-available/apache2_plugin.inc.php

@@ -1207,8 +1207,8 @@
            if(is_array($aliasdomains)) {
                foreach($aliasdomains as $aliasdomain) {
                    $temp_domains[] = $aliasdomain['domain'];
                    if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {
                        $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
                    if(isset($aliasdomain['subdomain']) && ($aliasdomain['subdomain'] != "none")) {
                        $temp_domains[] = "www." . $aliasdomain['domain'];
                    }
                }
            }

 server/plugins-available/nginx_plugin.inc.php

@@ -1281,8 +1281,8 @@
            if(is_array($aliasdomains)) {
                foreach($aliasdomains as $aliasdomain) {
                    $temp_domains[] = $aliasdomain['domain'];
                    if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {
                        $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
                    if(isset($aliasdomain['subdomain']) && ($aliasdomain['subdomain'] != "none")) {
                        $temp_domains[] = "www." . $aliasdomain['domain'];
                    }
                    
                    foreach($sub_prefixes as $s) {