ISPConfig3 devel
parent: be623712 | patch | commit | ignore whitespace
floria030
2014-02-05 8100f25edc779ee5f1b2ca7de0cd25f38e4f5343 
use regex for dkim-integration in distribution-specific files, too
5 files modified
56 ■■■■■ changed files
install/dist/lib/centos52.lib.php 10 ●●●●● patch | view | raw | blame | history
install/dist/lib/centos53.lib.php 10 ●●●●● patch | view | raw | blame | history
install/dist/lib/fedora.lib.php 10 ●●●●● patch | view | raw | blame | history
install/dist/lib/gentoo.lib.php 6 ●●●●● patch | view | raw | blame | history
install/dist/lib/opensuse.lib.php 20 ●●●●● patch | view | raw | blame | history 
 install/dist/lib/centos52.lib.php


@@ -144,21 +144,21 @@


        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(!stristr($content, 'amavis')) {


        if(!preg_match('/^amavis\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);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!stristr($content, '127.0.0.1:10025')) {


        if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) {


            unset($content);


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10025.master');


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');


            af($conf['postfix']['config_dir'].'/master.cf', $content);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!stristr($content, '127.0.0.1:10027')) {


        if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) {


            unset($content);


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10027.master');


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');


            af($conf['postfix']['config_dir'].'/master.cf', $content);


        }


        unset($content);




 install/dist/lib/centos53.lib.php


@@ -145,21 +145,21 @@


        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(!stristr($content, 'amavis')) {


        if(!preg_match('/^amavis\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);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!stristr($content, '127.0.0.1:10025')) {


        if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) {


            unset($content);


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10025.master');


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');


            af($conf['postfix']['config_dir'].'/master.cf', $content);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!stristr($content, '127.0.0.1:10027')) {


        if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) {


            unset($content);


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10027.master');


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');


            af($conf['postfix']['config_dir'].'/master.cf', $content);


        }


        unset($content);




 install/dist/lib/fedora.lib.php


@@ -500,21 +500,21 @@


        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(!stristr($content, 'amavis')) {


        if(!preg_match('/^amavis\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);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!stristr($content, '127.0.0.1:10025')) {


        if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) {


            unset($content);


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10025.master');


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');


            af($conf['postfix']['config_dir'].'/master.cf', $content);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!stristr($content, '127.0.0.1:10027')) {


        if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) {


            unset($content);


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis10027.master');


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');


            af($conf['postfix']['config_dir'].'/master.cf', $content);


        }


        unset($content);




 install/dist/lib/gentoo.lib.php


@@ -335,19 +335,19 @@


        // 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(!stristr($content, 'amavis')) {


        if(!preg_match('/^amavis\s+/m', $content)) {


            unset($content);


            $content = $this->get_template_file('master_cf_amavis', true);


            af($conf['postfix']['config_dir'].'/master.cf', $content);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!stristr($content, '127.0.0.1:10025')) {


        if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) {


             unset($content);


            $content = $this->get_template_file('master_cf_amavis10025', true);


            af($conf['postfix']['config_dir'].'/master.cf', $content);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!stristr($content, '127.0.0.1:10027')) {


        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);




 install/dist/lib/opensuse.lib.php


@@ -533,11 +533,23 @@


        // Append the configuration for amavisd to the master.cf file


        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(!stristr($content, "127.0.0.1:10025")) {


        // Only add the content if we had not addded it before


        if(!preg_match('/^amavis\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);


            $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);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) {


            unset($content);


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');


            af($conf['postfix']['config_dir'].'/master.cf', $content);


            $content = rf($conf['postfix']['config_dir'].'/master.cf');


        }


        if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) {


            unset($content);


            $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');


            af($conf['postfix']['config_dir'].'/master.cf', $content);


        }


        unset($content);