Commit 530311ae authored by Thom's avatar Thom 🛠
Browse files

Copy custom dovecot config from conf-custom

parent 3ed6e17c
......@@ -1540,6 +1540,10 @@ class installer_base {
} 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, '<')) {
......
......@@ -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
......@@ -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
# 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.
......@@ -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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment