From f8a07d139335a2c21a288546e6fb1922e4623127 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 27 May 2016 08:09:44 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
server/plugins-available/mail_plugin_dkim.inc.php | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 25f1871..0b840db 100755
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -171,22 +171,11 @@
* This function restarts amavis
*/
function restart_amavis() {
- global $app, $conf;
- $pos_init=array(
- $conf['init_scripts'].'/amavis',
- $conf['init_scripts'].'/amavisd'
- );
- $initfile='';
- foreach($pos_init as $init) {
- if (is_executable($init)) {
- $initfile=$init;
- break;
- }
- }
- if ( $initfile == '' ) $initfile = 'service amavis';
- $app->log('Restarting amavis: '.$initfile.'.', LOGLEVEL_DEBUG);
- exec(escapeshellarg($initfile).' restart', $output);
- foreach($output as $logline) $app->log($logline, LOGLEVEL_DEBUG);
+ global $app;
+ $initcommand = $app->system->getinitcommand(array('amavis', 'amavisd'), 'restart');
+ $app->log('Restarting amavis: '.$initcommand.'.', LOGLEVEL_DEBUG);
+ exec($initcommand, $output);
+ foreach($output as $logline) $app->log($logline, LOGLEVEL_DEBUG);
}
/**
--
Gitblit v1.9.1