make sure the amavis-user can always access the dkim-dir

cyberkathosting · Aug 3, 2014 · 2b05c20 · 2b05c20
1 parent d57ffdc
commit 2b05c20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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.
+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
@@ -123,7 +123,15 @@ function check_system($data) {
 
             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'])) {
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,3 @@


		The remote API documentation is in the remote_client/API-docs subfolder.
		The remote API documentation is in the remoting_client/API-docs subfolder.