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

Marius Burkard · Marius Burkard · commit 67f562d6772e · 2016-07-04T15:40:54.000+02:00
Removed none from subdomain / alias list in letsencrypt generation

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

See merge request !362
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1207,8 +1207,8 @@ function update($event_name, $data) {
 			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'];
 					}
 				}
 			}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -1281,8 +1281,8 @@ function update($event_name, $data) {
 			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) {

Original file line number	Diff line number	Diff line change
`@@ -1207,8 +1207,8 @@ function update($event_name, $data) {`
`1207`	`1207`	`if(is_array($aliasdomains)) {`
`1208`	`1208`	`foreach($aliasdomains as $aliasdomain) {`
`1209`	`1209`	`$temp_domains[] = $aliasdomain['domain'];`
`1210`		`- if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {`
`1211`		`- $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];`
	`1210`	`+ if(isset($aliasdomain['subdomain']) && ($aliasdomain['subdomain'] != "none")) {`
	`1211`	`+ $temp_domains[] = "www." . $aliasdomain['domain'];`
`1212`	`1212`	`}`
`1213`	`1213`	`}`
`1214`	`1214`	`}`