Merge branch '6565-configure_dovecot()' into 'develop'

Till Brehm · Till Brehm · commit 8e11b0c241ba · 2023-09-06T08:50:45.000Z
configure_dovecot() in installer is creating master.cf~2

Closes #6565

See merge request ispconfig/ispconfig3!1795
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
@@ -61,7 +61,7 @@ public function configure_dovecot()
 			if(is_file($config_dir.'/master.cf')){
 				copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
 			}
-			if(is_file($config_dir.'/master.cf~')){
+			if(is_file($config_dir.'/master.cf~2')){
 				chmod($config_dir.'/master.cf~2', 0400);
 			}
 			//* Configure master.cf and add a line for deliver
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -144,7 +144,7 @@ public function configure_dovecot()
 			if(is_file($config_dir.'/master.cf')){
 				copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
 			}
-			if(is_file($config_dir.'/master.cf~')){
+			if(is_file($config_dir.'/master.cf~2')){
 				chmod($config_dir.'/master.cf~2', 0400);
 			}
 			//* Configure master.cf and add a line for deliver
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
@@ -399,7 +399,7 @@ public function configure_dovecot() {
 			if(is_file($config_dir.'/master.cf')){
 				copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
 			}
-			if(is_file($config_dir.'/master.cf~')){
+			if(is_file($config_dir.'/master.cf~2')){
 				chmod($config_dir.'/master.cf~2', 0400);
 			}
 			//* Configure master.cf and add a line for deliver
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -383,7 +383,7 @@ public function configure_dovecot()
 			if(is_file($config_dir.'/master.cf')){
 				copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
 			}
-			if(is_file($config_dir.'/master.cf~')){
+			if(is_file($config_dir.'/master.cf~2')){
 				chmod($config_dir.'/master.cf~2', 0400);
 			}
 			//* Configure master.cf and add a line for deliver
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1539,7 +1539,7 @@ public function configure_dovecot() {
 			if(is_file($config_dir.'/master.cf')){
 				copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
 			}
-			if(is_file($config_dir.'/master.cf~')){
+			if(is_file($config_dir.'/master.cf~2')){
 				chmod($config_dir.'/master.cf~2', 0400);
 			}
 			//* Configure master.cf and add a line for deliver

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function configure_dovecot()`
`61`	`61`	`if(is_file($config_dir.'/master.cf')){`
`62`	`62`	`copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');`
`63`	`63`	`}`
`64`		`- if(is_file($config_dir.'/master.cf~')){`
	`64`	`+ if(is_file($config_dir.'/master.cf~2')){`
`65`	`65`	`chmod($config_dir.'/master.cf~2', 0400);`
`66`	`66`	`}`
`67`	`67`	`//* Configure master.cf and add a line for deliver`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function configure_dovecot()`
`144`	`144`	`if(is_file($config_dir.'/master.cf')){`
`145`	`145`	`copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');`
`146`	`146`	`}`
`147`		`- if(is_file($config_dir.'/master.cf~')){`
	`147`	`+ if(is_file($config_dir.'/master.cf~2')){`
`148`	`148`	`chmod($config_dir.'/master.cf~2', 0400);`
`149`	`149`	`}`
`150`	`150`	`//* Configure master.cf and add a line for deliver`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ public function configure_dovecot() {`
`399`	`399`	`if(is_file($config_dir.'/master.cf')){`
`400`	`400`	`copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');`
`401`	`401`	`}`
`402`		`- if(is_file($config_dir.'/master.cf~')){`
	`402`	`+ if(is_file($config_dir.'/master.cf~2')){`
`403`	`403`	`chmod($config_dir.'/master.cf~2', 0400);`
`404`	`404`	`}`
`405`	`405`	`//* Configure master.cf and add a line for deliver`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ public function configure_dovecot()`
`383`	`383`	`if(is_file($config_dir.'/master.cf')){`
`384`	`384`	`copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');`
`385`	`385`	`}`
`386`		`- if(is_file($config_dir.'/master.cf~')){`
	`386`	`+ if(is_file($config_dir.'/master.cf~2')){`
`387`	`387`	`chmod($config_dir.'/master.cf~2', 0400);`
`388`	`388`	`}`
`389`	`389`	`//* Configure master.cf and add a line for deliver`
Original file line number	Diff line number	Diff line change
`@@ -1539,7 +1539,7 @@ public function configure_dovecot() {`
`1539`	`1539`	`if(is_file($config_dir.'/master.cf')){`
`1540`	`1540`	`copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');`
`1541`	`1541`	`}`
`1542`		`- if(is_file($config_dir.'/master.cf~')){`
	`1542`	`+ if(is_file($config_dir.'/master.cf~2')){`
`1543`	`1543`	`chmod($config_dir.'/master.cf~2', 0400);`
`1544`	`1544`	`}`
`1545`	`1545`	`//* Configure master.cf and add a line for deliver`