Commit f0bed3a1 authored by Marius Cramer's avatar Marius Cramer

Fixed regex in distribution files

parent 1db3b186
......@@ -144,7 +144,7 @@ class installer extends installer_dist {
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');
// Only add the content if we had not addded it before
if(!preg_match('/^amavis\s+/m', $content)) {
if(!preg_match('/^amavis\s+unix\s+/m', $content)) {
unset($content);
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
af($conf['postfix']['config_dir'].'/master.cf', $content);
......
......@@ -145,7 +145,7 @@ class installer extends installer_dist {
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');
// Only add the content if we had not addded it before
if(!preg_match('/^amavis\s+/m', $content)) {
if(!preg_match('/^amavis\s+unix\s+/m', $content)) {
unset($content);
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
af($conf['postfix']['config_dir'].'/master.cf', $content);
......
......@@ -500,7 +500,7 @@ class installer_dist extends installer_base {
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');
// Only add the content if we had not addded it before
if(!preg_match('/^amavis\s+/m', $content)) {
if(!preg_match('/^amavis\s+unix\s+/m', $content)) {
unset($content);
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
af($conf['postfix']['config_dir'].'/master.cf', $content);
......
......@@ -335,7 +335,7 @@ class installer extends installer_base
// Append the configuration for amavisd to the master.cf file
$content = rf($conf['postfix']['config_dir'].'/master.cf');
// Only add the content if we had not addded it before
if(!preg_match('/^amavis\s+/m', $content)) {
if(!preg_match('/^amavis\s+unix\s+/m', $content)) {
unset($content);
$content = $this->get_template_file('master_cf_amavis', true);
af($conf['postfix']['config_dir'].'/master.cf', $content);
......
......@@ -534,7 +534,7 @@ class installer_dist extends installer_base {
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');
// Only add the content if we had not addded it before
if(!preg_match('/^amavis\s+/m', $content)) {
if(!preg_match('/^amavis\s+unix\s+/m', $content)) {
unset($content);
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
af($conf['postfix']['config_dir'].'/master.cf', $content);
......
Markdown is supported
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