Add check if conf.d folder for Dovecot exists

Thom Pol · Thom Pol · commit eed63b317128 · 2021-03-13T09:14:47.000+01:00
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
@@ -110,6 +110,9 @@ public function configure_dovecot()
 			}
 			// Copy custom config file
 			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master')) {
+				if(!@is_dir($config_dir . '/conf.d')) {
+					mkdir($config_dir . '/conf.d');
+				}
 				copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master', $config_dir.'/conf.d/99-ispconfig-custom-config.conf');
 			}
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1536,6 +1536,9 @@ public function configure_dovecot() {
 			}
 			// Copy custom config file
 			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master')) {
+				if(!@is_dir($config_dir . '/conf.d')) {
+					mkdir($config_dir . '/conf.d');
+				}
 				copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master', $config_dir.'/conf.d/99-ispconfig-custom-config.conf');
 			}
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,9 @@ public function configure_dovecot()`
`110`	`110`	`}`
`111`	`111`	`// Copy custom config file`
`112`	`112`	`if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master')) {`
	`113`	`+ if(!@is_dir($config_dir . '/conf.d')) {`
	`114`	`+ mkdir($config_dir . '/conf.d');`
	`115`	`+ }`
`113`	`116`	`copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master', $config_dir.'/conf.d/99-ispconfig-custom-config.conf');`
`114`	`117`	`}`
`115`	`118`	`replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
Original file line number	Diff line number	Diff line change
`@@ -1536,6 +1536,9 @@ public function configure_dovecot() {`
`1536`	`1536`	`}`
`1537`	`1537`	`// Copy custom config file`
`1538`	`1538`	`if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master')) {`
	`1539`	`+ if(!@is_dir($config_dir . '/conf.d')) {`
	`1540`	`+ mkdir($config_dir . '/conf.d');`
	`1541`	`+ }`
`1539`	`1542`	`copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master', $config_dir.'/conf.d/99-ispconfig-custom-config.conf');`
`1540`	`1543`	`}`
`1541`	`1544`	`replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`