Merge branch 'greylist_filter' into 'master'

Marius Cramer

2015-02-03 c7397a27fa9fde20a82ad98efd721308a0c968d1

 install/dist/lib/opensuse.lib.php

@@ -168,6 +168,9 @@
      //* mysql-virtual_relayrecipientmaps.cf
      $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');

      //* mysql-virtual_policy_greylist.cf
      $this->process_postfix_config('mysql-virtual_policy_greylist.cf');

      //* postfix-dkim
      $full_file_name=$config_dir.'/tag_as_originating.re';
      if(is_file($full_file_name)) {
@@ -224,12 +227,20 @@
      unset($rbl_hosts);
      unset($server_ini_array);

      //* If Postgrey is installed, configure it
      $greylisting = '';
      if($conf['postgrey']['installed'] == true) {
         $greylisting = 'check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
      }
		
      //* These postconf commands will be executed on installation and update
      $postconf_placeholders = array('{config_dir}' => $config_dir,
         '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
         '{vmail_userid}' => $cf['vmail_userid'],
         '{vmail_groupid}' => $cf['vmail_groupid'],
         '{rbl_list}' => $rbl_list);
         '{rbl_list}' => $rbl_list,
         '{greylisting}' => $greylisting,
      );

      $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_postfix.conf.master', 'tpl/opensuse_postfix.conf.master');
      $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);