Merge branch 'convert_to_reseller' into 'master'

Marius Cramer

2014-08-14 c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -123,9 +123,14 @@

            if (!is_dir($mail_config['dkim_path'])) {
                $app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
            if($app->system->is_user('amavis')) { $amavis_user='amavis'; }
            elseif ($app->system->is_user('vscan')) { $amavis_user='vscan'; }
            else { $amavis_user=''; }
            if($app->system->is_user('amavis')) { 
               $amavis_user='amavis'; 
            } elseif ($app->system->is_user('vscan')) { 
               $amavis_user='vscan'; 
            }
            else { 
               $amavis_user=''; 
            }
            if(!empty($amavis_user)) {
               mkdir($mail_config['dkim_path'], 0750, true);
               exec('chown '.$amavis_user.' /var/lib/amavis/dkim');