Bugfix for wrong Letsencrypt symlinks in relative symlink mode.

Till Brehm · Till Brehm · commit 5cfd5d349cdf · 2017-01-30T10:50:00.000+01:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -3421,6 +3421,7 @@ public function create_relative_link($f, $t) {
 
 		// Add ($cnt_to-1) number of "../" elements to left side of $cfrom
 		for ($c = 0; $c < (count($a2)-1); $c++) { $cfrom = '../'.$cfrom; }
+		if(strstr($to,'/etc/letsencrypt/archive/')) $to = str_replace('/etc/letsencrypt/archive/','/etc/letsencrypt/live/',$to);
 
 		return symlink($cfrom, $to);
 	}

Original file line number	Diff line number	Diff line change
`@@ -3421,6 +3421,7 @@ public function create_relative_link($f, $t) {`
`3421`	`3421`
`3422`	`3422`	`// Add ($cnt_to-1) number of "../" elements to left side of $cfrom`
`3423`	`3423`	`for ($c = 0; $c < (count($a2)-1); $c++) { $cfrom = '../'.$cfrom; }`
	`3424`	`+ if(strstr($to,'/etc/letsencrypt/archive/')) $to = str_replace('/etc/letsencrypt/archive/','/etc/letsencrypt/live/',$to);`
`3424`	`3425`
`3425`	`3426`	`return symlink($cfrom, $to);`
`3426`	`3427`	`}`