tbrehm
2012-03-07 a017a511fd078dce01f97383726d15308e1257a0
Dont set myhostname, mydomain and mynetworks on update in main.cf
4 files modified
56 ■■■■ changed files
install/dist/lib/fedora.lib.php 13 ●●●● patch | view | raw | blame | history
install/dist/lib/gentoo.lib.php 13 ●●●● patch | view | raw | blame | history
install/dist/lib/opensuse.lib.php 15 ●●●● patch | view | raw | blame | history
install/lib/installer_base.lib.php 15 ●●●● patch | view | raw | blame | history
install/dist/lib/fedora.lib.php
@@ -83,10 +83,8 @@
        $command = 'useradd -g '.$cf['vmail_groupname'].' -u '.$cf['vmail_userid'].' '.$cf['vmail_username'].' -d '.$cf['vmail_mailbox_base'].' -m';
        if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");        
        //* These postconf commands will be executed on installation and update
        $postconf_commands = array (
            'myhostname = '.$conf['hostname'],
            'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
            'mynetworks = 127.0.0.0/8 [::1]/128',
            'virtual_alias_domains =',
            'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
            'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
@@ -118,6 +116,15 @@
            'inet_interfaces = all'
        );
        
        //* These postconf commands will be executed on installation only
        if($this->is_update == false) {
            $postconf_commands = array_merge($postconf_commands,array(
                'myhostname = '.$conf['hostname'],
                'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
                'mynetworks = 127.0.0.0/8 [::1]/128'
            ));
        }
        //* Create the header and body check files
        touch($config_dir.'/header_checks');
        touch($config_dir.'/mime_header_checks');
install/dist/lib/gentoo.lib.php
@@ -80,10 +80,8 @@
            caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");        
        }
        //* These postconf commands will be executed on installation and update
        $postconf_commands = array (
            'myhostname = '.$conf['hostname'],
            'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
            'mynetworks = 127.0.0.0/8 [::1]/128',
            'virtual_alias_domains =',
            'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
            'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
@@ -113,6 +111,15 @@
            'body_checks = regexp:'.$config_dir.'/body_checks'
        );
        
        //* These postconf commands will be executed on installation only
        if($this->is_update == false) {
            $postconf_commands = array_merge($postconf_commands,array(
                'myhostname = '.$conf['hostname'],
                'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
                'mynetworks = 127.0.0.0/8 [::1]/128'
            ));
        }
        //* Create the header and body check files
        touch($config_dir.'/header_checks');
        touch($config_dir.'/mime_header_checks');
install/dist/lib/opensuse.lib.php
@@ -96,11 +96,9 @@
        }
        
        if($cf['vmail_mailbox_base'] != '' && strlen($cf['vmail_mailbox_base']) >= 10 && $this->is_update === false) exec('chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base']);
        //* These postconf commands will be executed on installation and update
        $postconf_commands = array (
            'myhostname = '.$conf['hostname'],
            'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
            'mynetworks = 127.0.0.0/8 [::1]/128',
            'virtual_alias_domains =',
            'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
            'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
@@ -132,6 +130,15 @@
            'inet_interfaces = all'
        );
        
        //* These postconf commands will be executed on installation only
        if($this->is_update == false) {
            $postconf_commands = array_merge($postconf_commands,array(
                'myhostname = '.$conf['hostname'],
                'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
                'mynetworks = 127.0.0.0/8 [::1]/128'
            ));
        }
        //* Create the header and body check files
        touch($config_dir.'/header_checks');
        touch($config_dir.'/mime_header_checks');
install/lib/installer_base.lib.php
@@ -628,11 +628,9 @@
        $command = 'useradd -g '.$cf['vmail_groupname'].' -u '.$cf['vmail_userid'].' '.$cf['vmail_username'].' -d '.$cf['vmail_mailbox_base'].' -m';
        if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        //* These postconf commands will be executed on installation and update
        $postconf_commands = array (
                'myhostname = '.$conf['hostname'],
                'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
                'mynetworks = 127.0.0.0/8 [::1]/128',
                'alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
                'alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
                'virtual_alias_domains =',
@@ -666,6 +664,15 @@
                'body_checks = regexp:'.$config_dir.'/body_checks',
                'owner_request_special = no'
        );
        //* These postconf commands will be executed on installation only
        if($this->is_update == false) {
            $postconf_commands = array_merge($postconf_commands,array(
                'myhostname = '.$conf['hostname'],
                'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
                'mynetworks = 127.0.0.0/8 [::1]/128'
            ));
        }
        //* Create the header and body check files
        touch($config_dir.'/header_checks');