Commit bd5d2654 authored by Florian Schaal's avatar Florian Schaal

use postconf -M during install / update to detect services in postfix

parent 401e1451
...@@ -67,28 +67,46 @@ class installer_centos extends installer_dist { ...@@ -67,28 +67,46 @@ class installer_centos extends installer_dist {
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
} }
// Append the configuration for amavisd to the master.cf file $config_dir = $conf['postfix']['config_dir'];
if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~');
$content = rf($conf['postfix']['config_dir'].'/master.cf'); // Adding amavis-services to the master.cf file if the service does not already exists
// Only add the content if we had not addded it before if ($this->postfix_master()) {
if(!preg_match('/^amavis\s+unix\s+/m', $content)) { exec ("postconf -M amavis.unix", $out, $ret);
unset($content); $add_amavis = @($out[0]=='')?true:false;
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master'); unset($out);
af($conf['postfix']['config_dir'].'/master.cf', $content); exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
$add_amavis_10025 = @($out[0]=='')?true:false;
unset($out);
exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
$add_amavis_10027 = @($out[0]=='')?true:false;
unset($out);
} else { //* fallback - postfix < 2.9
$content = rf($conf['postfix']['config_dir'].'/master.cf'); $content = rf($conf['postfix']['config_dir'].'/master.cf');
$add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false;
$add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false;
$add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false;
} }
if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) {
unset($content); if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master'); //* backup master.cf
af($conf['postfix']['config_dir'].'/master.cf', $content); if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
$content = rf($conf['postfix']['config_dir'].'/master.cf'); // adjust amavis-config
} if($add_amavis) {
if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) { $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
unset($content); af($config_dir.'/master.cf', $content);
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master'); unset($content);
af($conf['postfix']['config_dir'].'/master.cf', $content); }
if ($add_amavis_10025) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
if ($add_amavis_10027) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
} }
unset($content);
removeLine('/etc/sysconfig/freshclam', 'FRESHCLAM_DELAY=disabled-warn # REMOVE ME', 1); removeLine('/etc/sysconfig/freshclam', 'FRESHCLAM_DELAY=disabled-warn # REMOVE ME', 1);
replaceLine('/etc/freshclam.conf', 'Example', '# Example', 1); replaceLine('/etc/freshclam.conf', 'Example', '# Example', 1);
......
...@@ -50,24 +50,30 @@ class installer extends installer_base { ...@@ -50,24 +50,30 @@ class installer extends installer_base {
} }
} }
$config_dir = $conf['dovecot']['config_dir']; $config_dir = $conf['postfix']['config_dir'];
//* Configure master.cf and add a line for deliver //* Configure master.cf and add a line for deliver
if(is_file($config_dir.'/master.cf')){ if ($this->postfix_master()) {
copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); exec ("postconf -M dovecot.unix", $out, $ret);
$add_dovecot_service = @($out[0]=='')?true:false;
} else { //* fallback - postfix < 2.9
$content = rf($config_dir.'/master.cf');
$add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false;
} }
if(is_file($config_dir.'/master.cf~')){ if($add_dovecot_service) {
chmod($config_dir.'/master.cf~2', 0400); //* backup
} if(is_file($config_dir.'/master.cf')){
$content = rf($conf["postfix"]["config_dir"].'/master.cf'); copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
// Only add the content if we had not addded it before }
if(!stristr($content, "dovecot/deliver")) { if(is_file($config_dir.'/master.cf~')){
chmod($config_dir.'/master.cf~2', 0400);
}
//* Configure master.cf and add a line for deliver
$content = rf($conf["postfix"]["config_dir"].'/master.cf');
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content); af($config_dir.'/master.cf', $deliver_content);
unset($content);
unset($deliver_content);
} }
unset($content);
unset($deliver_content);
//* Reconfigure postfix to use dovecot authentication //* Reconfigure postfix to use dovecot authentication
// Adding the amavisd commands to the postfix configuration // Adding the amavisd commands to the postfix configuration
...@@ -88,6 +94,7 @@ class installer extends installer_base { ...@@ -88,6 +94,7 @@ class installer extends installer_base {
} }
//* copy dovecot.conf //* copy dovecot.conf
$config_dir = $conf['dovecot']['config_dir'];
$configfile = 'dovecot.conf'; $configfile = 'dovecot.conf';
if(is_file($config_dir.'/'.$configfile)){ if(is_file($config_dir.'/'.$configfile)){
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~'); copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
......
...@@ -349,27 +349,30 @@ class installer_dist extends installer_base { ...@@ -349,27 +349,30 @@ class installer_dist extends installer_base {
} }
} }
$config_dir = $conf['dovecot']['config_dir']; $config_dir = $conf['postfix']['config_dir'];
//* Use /etc/dovecot as config dir if exists
if(is_dir('/etc/dovecot')) $config_dir = '/etc/dovecot';
//* Configure master.cf and add a line for deliver //* Configure master.cf and add a line for deliver
if(is_file($config_dir.'/master.cf')){ if ($this->postfix_master()) {
copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); exec ("postconf -M dovecot.unix", $out, $ret);
} $add_dovecot_service = @($out[0]=='')?true:false;
if(is_file($config_dir.'/master.cf~')){ } else { //* fallback - postfix < 2.9
exec('chmod 400 '.$config_dir.'/master.cf~2'); $content = rf($config_dir'/master.cf');
$add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false;
} }
$content = rf($conf["postfix"]["config_dir"].'/master.cf'); if($add_dovecot_service) {
// Only add the content if we had not addded it before //* backup
if(!stristr($content, "dovecot/deliver")) { if(is_file($config_dir.'/master.cf')){
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
}
if(is_file($config_dir.'/master.cf~')){
chmod($config_dir.'/master.cf~2', 0400);
}
//* Configure master.cf and add a line for deliver
$content = rf($conf["postfix"]["config_dir"].'/master.cf');
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content); af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
unset($content);
unset($deliver_content);
} }
unset($content);
unset($deliver_content);
//* Reconfigure postfix to use dovecot authentication //* Reconfigure postfix to use dovecot authentication
// Adding the amavisd commands to the postfix configuration // Adding the amavisd commands to the postfix configuration
...@@ -389,6 +392,10 @@ class installer_dist extends installer_base { ...@@ -389,6 +392,10 @@ class installer_dist extends installer_base {
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
} }
//* Use /etc/dovecot as config dir if exists
// if(is_dir('/etc/dovecot')) $config_dir = '/etc/dovecot';
$config_dir = $conf['dovecot']['config_dir'];
//* backup dovecot.conf //* backup dovecot.conf
$configfile = 'dovecot.conf'; $configfile = 'dovecot.conf';
if(is_file("$config_dir/$configfile")){ if(is_file("$config_dir/$configfile")){
...@@ -482,28 +489,46 @@ class installer_dist extends installer_base { ...@@ -482,28 +489,46 @@ class installer_dist extends installer_base {
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
} }
// Append the configuration for amavisd to the master.cf file $config_dir = $conf['postfix']['config_dir'];
if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~');
$content = rf($conf['postfix']['config_dir'].'/master.cf'); // Adding amavis-services to the master.cf file if the service does not already exists
// Only add the content if we had not addded it before if ($this->postfix_master()) {
if(!preg_match('/^amavis\s+unix\s+/m', $content)) { exec ("postconf -M amavis.unix", $out, $ret);
unset($content); $add_amavis = @($out[0]=='')?true:false;
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master'); unset($out);
af($conf['postfix']['config_dir'].'/master.cf', $content); exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
$content = rf($conf['postfix']['config_dir'].'/master.cf'); $add_amavis_10025 = @($out[0]=='')?true:false;
} unset($out);
if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) { exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
unset($content); $add_amavis_10027 = @($out[0]=='')?true:false;
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master'); unset($out);
af($conf['postfix']['config_dir'].'/master.cf', $content); } else { //* fallback - postfix < 2.9
$content = rf($conf['postfix']['config_dir'].'/master.cf'); $content = rf($conf['postfix']['config_dir'].'/master.cf');
$add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false;
$add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false;
$add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false;
} }
if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) {
unset($content); if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master'); //* backup master.cf
af($conf['postfix']['config_dir'].'/master.cf', $content); if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
// adjust amavis-config
if($add_amavis) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
if ($add_amavis_10025) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
if ($add_amavis_10027) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
} }
unset($content);
removeLine('/etc/sysconfig/freshclam', 'FRESHCLAM_DELAY=disabled-warn # REMOVE ME', 1); removeLine('/etc/sysconfig/freshclam', 'FRESHCLAM_DELAY=disabled-warn # REMOVE ME', 1);
replaceLine('/etc/freshclam.conf', 'Example', '# Example', 1); replaceLine('/etc/freshclam.conf', 'Example', '# Example', 1);
......
...@@ -270,27 +270,30 @@ class installer extends installer_base ...@@ -270,27 +270,30 @@ class installer extends installer_base
} }
} }
$config_dir = $conf['dovecot']['config_dir']; $config_dir = $conf['postfix']['config_dir'];
$configfile = $conf['postfix']['config_dir'].'/master.cf';
if(is_file($configfile)) {
copy($configfile, $configfile.'~2');
}
if(is_file($configfile.'~2')) {
chmod($configfile.'~2', 0400);
}
//* Configure master.cf and add a line for deliver //* Configure master.cf and add a line for deliver
$content = rf($configfile); if ($this->postfix_master()) {
exec ("postconf -M dovecot.unix", $out, $ret);
if(!stristr($content, 'dovecot/deliver')) { $add_dovecot_service = @($out[0]=='')?true:false;
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; } else { //* fallback - postfix < 2.9
af($conf['postfix']['config_dir'].'/master.cf', $deliver_content); $content = rf($config_dir.'/master.cf');
$add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false;
}
if($add_dovecot_service) {
//* backup
if(is_file($config_dir.'/master.cf')){
copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
}
if(is_file($config_dir.'/master.cf~')){
chmod($config_dir.'/master.cf~2', 0400);
}
//* Configure master.cf and add a line for deliver
$content = rf($conf["postfix"]["config_dir"].'/master.cf');
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
af($conf[$config_dir.'/master.cf', $deliver_content);
unset($content);
unset($deliver_content);
} }
unset($content);
unset($deliver_content);
unset($configfile);
//* Reconfigure postfix to use dovecot authentication //* Reconfigure postfix to use dovecot authentication
$postconf_commands = array ( $postconf_commands = array (
...@@ -310,6 +313,7 @@ class installer extends installer_base ...@@ -310,6 +313,7 @@ class installer extends installer_base
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
} }
$config_dir = $conf['dovecot']['config_dir'];
//* copy dovecot.conf //* copy dovecot.conf
$configfile = $config_dir.'/dovecot.conf'; $configfile = $config_dir.'/dovecot.conf';
$content = $this->get_template_file('dovecot.conf', true); $content = $this->get_template_file('dovecot.conf', true);
...@@ -387,27 +391,46 @@ class installer extends installer_base ...@@ -387,27 +391,46 @@ class installer extends installer_base
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
} }
// Append the configuration for amavisd to the master.cf file $config_dir = $conf['postfix']['config_dir'];
$content = rf($conf['postfix']['config_dir'].'/master.cf');
// Only add the content if we had not addded it before // Adding amavis-services to the master.cf file if the service does not already exists
if(!preg_match('/^amavis\s+unix\s+/m', $content)) { if ($this->postfix_master()) {
unset($content); exec ("postconf -M amavis.unix", $out, $ret);
$content = $this->get_template_file('master_cf_amavis', true); $add_amavis = @($out[0]=='')?true:false;
af($conf['postfix']['config_dir'].'/master.cf', $content); unset($out);
$content = rf($conf['postfix']['config_dir'].'/master.cf'); exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
} $add_amavis_10025 = @($out[0]=='')?true:false;
if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) { unset($out);
unset($content); exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
$content = $this->get_template_file('master_cf_amavis10025', true); $add_amavis_10027 = @($out[0]=='')?true:false;
af($conf['postfix']['config_dir'].'/master.cf', $content); unset($out);
} else { //* fallback - postfix < 2.9
$content = rf($conf['postfix']['config_dir'].'/master.cf'); $content = rf($conf['postfix']['config_dir'].'/master.cf');
$add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false;
$add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false;
$add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false;
}
if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
//* backup master.cf
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
// adjust amavis-config
if($add_amavis) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
if ($add_amavis_10025) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
if ($add_amavis_10027) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
} }
if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) {
unset($content);
$content = $this->get_template_file('master_cf_amavis10027', true);
af($conf['postfix']['config_dir'].'/master.cf', $content);
}
unset($content);
//* Add the clamav user to the amavis group //* Add the clamav user to the amavis group
exec('usermod -a -G amavis clamav'); exec('usermod -a -G amavis clamav');
......
...@@ -225,27 +225,34 @@ class installer_dist extends installer_base { ...@@ -225,27 +225,34 @@ class installer_dist extends installer_base {
$command = 'chmod 755 /var/run/authdaemon.courier-imap'; $command = 'chmod 755 /var/run/authdaemon.courier-imap';
caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command); caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
//* Changing maildrop lines in posfix master.cf //* Check maildrop service in posfix master.cf
if(is_file($config_dir.'/master.cf')){ $regex = "/^maildrop unix.*pipe flags=DRhu user=vmail argv=\\/usr\\/bin\\/maildrop -d ".$cf['vmail_username']." \\$\{extension} \\$\{recipient} \\$\{user} \\$\{nexthop} \\$\{sender}/";
copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
}
if(is_file($config_dir.'/master.cf~')){
exec('chmod 400 '.$config_dir.'/master.cf~');
}
$configfile = $config_dir.'/master.cf'; $configfile = $config_dir.'/master.cf';
$content = rf($configfile); if ($this->postfix_master()) {
exec ("postconf -M maildrop.unix", $out, $ret);
$content = str_replace(' flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}', $change_maildrop_flags = @(preg_match($regex, $out[0]) && $out[0] !='')?false:true;
' flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}', } else { //* fallback - postfix < 2.9
$content); $change_maildrop_flags = @(preg_match($regex, $configfile))?false:true;
}
$content = str_replace(' flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}', if ($change_maildrop_flags) {
' flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}', //* Change maildrop service in posfix master.cf
$content); if(is_file($config_dir.'/master.cf')) {
copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
}
if(is_file($config_dir.'/master.cf~')) {
chmod($config_dir.'/master.cf~', 0400);
}
$configfile = $config_dir.'/master.cf';
$content = rf($configfile);
$content = str_replace(' flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}',
'flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d '.$cf['vmail_username'].' ${extension} ${recipient} ${user} ${nexthop} ${sender}',
$content);
$content = str_replace(' flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}',
'flags=DRhu user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d '.$cf['vmail_username'].' ${extension} ${recipient} ${user} ${nexthop} ${sender}',
$content);
}
// enable tlsmanager // enable tlsmanager
$content = str_replace('#tlsmgr unix - - n 1000? 1 tlsmgr', 'tlsmgr unix - - n 1000? 1 tlsmgr', $content); $content = str_replace('#tlsmgr unix - - n 1000? 1 tlsmgr', 'tlsmgr unix - - n 1000? 1 tlsmgr', $content);
wf($configfile, $content); wf($configfile, $content);
//* Writing the Maildrop mailfilter file //* Writing the Maildrop mailfilter file
...@@ -357,24 +364,30 @@ class installer_dist extends installer_base { ...@@ -357,24 +364,30 @@ class installer_dist extends installer_base {
} }
} }
$config_dir = $conf['dovecot']['config_dir']; $config_dir = $conf['postfix']['config_dir'];
//* Configure master.cf and add a line for deliver //* Configure master.cf and add a line for deliver
if(is_file($config_dir.'/master.cf')){ if ($this->postfix_master()) {
copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); exec ("postconf -M dovecot.unix", $out, $ret);
} $add_dovecot_service = @($out[0]=='')?true:false;
if(is_file($config_dir.'/master.cf~')){ } else { //* fallback - postfix < 2.9
exec('chmod 400 '.$config_dir.'/master.cf~2'); $content = rf($config_dir.'/master.cf');
} $add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false;
$content = rf($conf["postfix"]["config_dir"].'/master.cf'); }
// Only add the content if we had not addded it before if($add_dovecot_service) {
if(!stristr($content, "dovecot/deliver")) { //* backup
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; if(is_file($config_dir.'/master.cf')){
copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
}
if(is_file($config_dir.'/master.cf~')){
chmod($config_dir.'/master.cf~2', 0400);
}
//* Configure master.cf and add a line for deliver
$content = rf($conf["postfix"]["config_dir"].'/master.cf');
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content); af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
unset($content);
unset($deliver_content);
} }
unset($content);
unset($deliver_content);
//* Reconfigure postfix to use dovecot authentication //* Reconfigure postfix to use dovecot authentication
// Adding the amavisd commands to the postfix configuration // Adding the amavisd commands to the postfix configuration
...@@ -394,6 +407,8 @@ class installer_dist extends installer_base { ...@@ -394,6 +407,8 @@ class installer_dist extends installer_base {
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
} }
$config_dir = $conf['dovecot']['config_dir'];
//* backup dovecot.conf //* backup dovecot.conf
$configfile = 'dovecot.conf'; $configfile = 'dovecot.conf';
if(is_file("$config_dir/$configfile")){ if(is_file("$config_dir/$configfile")){
...@@ -484,28 +499,46 @@ class installer_dist extends installer_base { ...@@ -484,28 +499,46 @@ class installer_dist extends installer_base {
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
} }
// Append the configuration for amavisd to the master.cf file $config_dir = $conf['postfix']['config_dir'];
if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf', $conf["postfix"]["config_dir"].'/master.cf~');
$content = rf($conf["postfix"]["config_dir"].'/master.cf'); // Adding amavis-services to the master.cf file if the service does not already exists
// Only add the content if we had not addded it before if ($this->postfix_master()) {
if(!preg_match('/^amavis\s+unix\s+/m', $content)) { exec ("postconf -M amavis.unix", $out, $ret);
unset($content); $add_amavis = @($out[0]=='')?true:false;
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master'); unset($out);
af($conf['postfix']['config_dir'].'/master.cf', $content); exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
$add_amavis_10025 = @($out[0]=='')?true:false;
unset($out);
exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
$add_amavis_10027 = @($out[0]=='')?true:false;
unset($out);
} else { //* fallback - postfix < 2.9
$content = rf($conf['postfix']['config_dir'].'/master.cf'); $content = rf($conf['postfix']['config_dir'].'/master.cf');
$add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false;
$add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false;
$add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false;
}
if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
//* backup master.cf
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
// adjust amavis-config
if($add_amavis) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
if ($add_amavis_10025) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
af($config_dir.'/master.cf', $content);
unset($content);
}
if ($add_amavis_10027) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
af($config_dir.'/master.cf', $content);