- also rename broken symlink of interface ssl

Marius Burkard · Marius Burkard · commit b56460ce46f0 · 2020-09-16T13:56:51.000+02:00
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -2908,13 +2908,13 @@ public function make_ispconfig_ssl_cert() {
 
 				if($ret == 0) {
 					// Backup existing ispserver ssl files
-					if(file_exists($ssl_crt_file)) {
+					if(file_exists($ssl_crt_file) || is_link($ssl_crt_file)) {
 						rename($ssl_crt_file, $ssl_crt_file . '-' . $date->format('YmdHis') . '.bak');
 					}
-					if(file_exists($ssl_key_file)) {
+					if(file_exists($ssl_key_file) || is_link($ssl_key_file)) {
 						rename($ssl_key_file, $ssl_key_file . '-' . $date->format('YmdHis') . '.bak');
 					}
-					if(file_exists($ssl_pem_file)) {
+					if(file_exists($ssl_pem_file) || is_link($ssl_pem_file)) {
 						rename($ssl_pem_file, $ssl_pem_file . '-' . $date->format('YmdHis') . '.bak');
 					}
 
@@ -2954,13 +2954,13 @@ public function make_ispconfig_ssl_cert() {
 
 					if($ret == 0) {
 						// Backup existing ispserver ssl files
-						if(file_exists($ssl_crt_file)) {
+						if(file_exists($ssl_crt_file) || is_link($ssl_crt_file)) {
 							rename($ssl_crt_file, $ssl_crt_file . '-' . $date->format('YmdHis') . '.bak');
 						}
-						if(file_exists($ssl_key_file)) {
+						if(file_exists($ssl_key_file) || is_link($ssl_key_file)) {
 							rename($ssl_key_file, $ssl_key_file . '-' . $date->format('YmdHis') . '.bak');
 						}
-						if(file_exists($ssl_pem_file)) {
+						if(file_exists($ssl_pem_file) || is_link($ssl_pem_file)) {
 							rename($ssl_pem_file, $ssl_pem_file . '-' . $date->format('YmdHis') . '.bak');
 						}
 

Original file line number	Diff line number	Diff line change
`@@ -2908,13 +2908,13 @@ public function make_ispconfig_ssl_cert() {`
`2908`	`2908`
`2909`	`2909`	`if($ret == 0) {`
`2910`	`2910`	`// Backup existing ispserver ssl files`
`2911`		`- if(file_exists($ssl_crt_file)) {`
	`2911`	`+ if(file_exists($ssl_crt_file) \|\| is_link($ssl_crt_file)) {`
`2912`	`2912`	`rename($ssl_crt_file, $ssl_crt_file . '-' . $date->format('YmdHis') . '.bak');`
`2913`	`2913`	`}`
`2914`		`- if(file_exists($ssl_key_file)) {`
	`2914`	`+ if(file_exists($ssl_key_file) \|\| is_link($ssl_key_file)) {`
`2915`	`2915`	`rename($ssl_key_file, $ssl_key_file . '-' . $date->format('YmdHis') . '.bak');`
`2916`	`2916`	`}`
`2917`		`- if(file_exists($ssl_pem_file)) {`
	`2917`	`+ if(file_exists($ssl_pem_file) \|\| is_link($ssl_pem_file)) {`
`2918`	`2918`	`rename($ssl_pem_file, $ssl_pem_file . '-' . $date->format('YmdHis') . '.bak');`
`2919`	`2919`	`}`
`2920`	`2920`
`@@ -2954,13 +2954,13 @@ public function make_ispconfig_ssl_cert() {`
`2954`	`2954`
`2955`	`2955`	`if($ret == 0) {`
`2956`	`2956`	`// Backup existing ispserver ssl files`
`2957`		`- if(file_exists($ssl_crt_file)) {`
	`2957`	`+ if(file_exists($ssl_crt_file) \|\| is_link($ssl_crt_file)) {`
`2958`	`2958`	`rename($ssl_crt_file, $ssl_crt_file . '-' . $date->format('YmdHis') . '.bak');`
`2959`	`2959`	`}`
`2960`		`- if(file_exists($ssl_key_file)) {`
	`2960`	`+ if(file_exists($ssl_key_file) \|\| is_link($ssl_key_file)) {`
`2961`	`2961`	`rename($ssl_key_file, $ssl_key_file . '-' . $date->format('YmdHis') . '.bak');`
`2962`	`2962`	`}`
`2963`		`- if(file_exists($ssl_pem_file)) {`
	`2963`	`+ if(file_exists($ssl_pem_file) \|\| is_link($ssl_pem_file)) {`
`2964`	`2964`	`rename($ssl_pem_file, $ssl_pem_file . '-' . $date->format('YmdHis') . '.bak');`
`2965`	`2965`	`}`
`2966`	`2966`