From 2b05c2015216e9bd7d164ba4b5c2d93ad01a2dc8 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 03 Aug 2014 07:15:24 -0400
Subject: [PATCH] make sure the amavis-user can always access the dkim-dir
---
server/plugins-available/mail_plugin_dkim.inc.php | 10 +++++++++-
docs/Remote_API_docs.txt | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/docs/Remote_API_docs.txt b/docs/Remote_API_docs.txt
index a11c78d..6f1c4fd 100644
--- a/docs/Remote_API_docs.txt
+++ b/docs/Remote_API_docs.txt
@@ -1,3 +1,3 @@
-The remote API documentation is in the remote_client/API-docs subfolder.
\ No newline at end of file
+The remote API documentation is in the remoting_client/API-docs subfolder.
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 268c9c5..8edd657 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -123,7 +123,15 @@
if (!is_dir($mail_config['dkim_path'])) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
- mkdir($mail_config['dkim_path'], 0750, true);
+ $amavis_user=exec('grep -o "^amavis:\|^vscan:" /etc/passwd');
+ if(!empty($amavis_user)) {
+ $amavis_user=rtrim($amavis_user, ":");
+ mkdir($mail_config['dkim_path'], 0750, true);
+ exec('chown '.$amavis_user.' /var/lib/amavis/dkim');
+ unset $amavis_user;
+ } else {
+ mkdir($mail_config['dkim_path'], 0755, true);
+ }
}
if (!is_writeable($mail_config['dkim_path'])) {
--
Gitblit v1.9.1