Copy custom dovecot config from conf-custom

Author: thompol

install/lib/installer_base.lib.php

@@ -1540,6 +1540,10 @@ public function configure_dovecot() {
 			} else {
 				copy('tpl/debian_dovecot2.conf.master', $config_dir.'/'.$configfile);
 			}
+			// Copy custom config file
+			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/dovecot_custom.conf.master')) {
+				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);
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 			if(version_compare($dovecot_version, 2.1, '<')) {

install/tpl/debian6_dovecot2.conf.master

@@ -132,4 +132,4 @@ namespace inbox {
     special_use = \Trash
   }
 }
-!include_try conf.d/99-custom-config.conf
+!include_try conf.d/99-ispconfig-custom-config.conf

install/tpl/debian_dovecot2.conf.master

@@ -109,4 +109,4 @@ plugin {
   quota_status_nouser = DUNNO
   quota_status_overquota = "552 5.2.2 Mailbox is full"
 }
-!include_try conf.d/99-custom-config.conf
+!include_try conf.d/99-ispconfig-custom-config.conf

install/tpl/dovecot_custom.conf.master

@@ -0,0 +1,3 @@
+# You can use this file for custom Dovecot settings. The used settings will overrule the settings set by ISPConfig.
+# Use with caution!
+# Put this file in /usr/local/ispconfig/server/conf-custom/install/ and make your changes there.

install/tpl/fedora_dovecot2.conf.master

@@ -126,4 +126,4 @@ namespace inbox {
     special_use = \Trash
   }
 }
-!include_try conf.d/99-custom-config.conf
+!include_try conf.d/99-ispconfig-custom-config.conf