From 0adcbbfd969731a9834ce4e018576b99fa2ecf56 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Mon, 04 May 2015 16:00:32 -0400
Subject: [PATCH] changed if-else in installer to write configs for the latest version with force-install (package not yet installed)
---
server/plugins-available/mail_plugin_dkim.inc.php | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 3a451d3..2842551 100755
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -75,9 +75,9 @@
*/
function get_amavis_config() {
$pos_config=array(
- '/etc/amavisd.conf',
'/etc/amavisd.conf/50-user',
'/etc/amavis/conf.d/50-user',
+ '/etc/amavisd.conf',
'/etc/amavisd/amavisd.conf'
);
$amavis_configfile='';
@@ -117,14 +117,14 @@
$app->log('Amavis-config not found or not writeable.', LOGLEVEL_ERROR);
$check=false;
}
+
/* dir for dkim-keys writeable? */
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
if ( isset($mail_config['dkim_path']) &&
!empty($mail_config['dkim_path']) &&
isset($data['new']['dkim_private']) &&
!empty($data['new']['dkim_private']) &&
- $mail_config['dkim_path'] != '/' &&
- $app->system->checkpath($mail_config['dkim_path'])
+ $mail_config['dkim_path'] != '/'
) {
if (!is_dir($mail_config['dkim_path'])) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
@@ -143,11 +143,21 @@
mkdir($mail_config['dkim_path'], 0755, true);
$app->log('No user amavis or vscan found - using root for '.$mail_config['dkim_path'], LOGLEVEL_WARNING);
}
- }
+ } else {
+ if (!$app->system->checkpath($mail_config['dkim_path'])) {
+ $app->log('Unable to write DKIM settings - invalid DKIM-Path (symlink?)', LOGLEVEL_ERROR);
+ $check=false;
+ }
+ }
if (!is_writeable($mail_config['dkim_path'])) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' not writeable.', LOGLEVEL_ERROR);
$check=false;
+ }
+
+ if ( !$app->system->checkpath($mail_config['dkim_path']) ) {
+ $app->log('DKIM Path '.$mail_config['dkim_path'].' failed in checkpath.', LOGLEVEL_ERROR);
+ $check = false;
}
} else {
@@ -184,7 +194,7 @@
* @param string $key_file full path to the key-file
* @param string $key_value private-key
* @param string $key_domain mail-domain
- * @return bool - true when the key is written to disk
+ * @return bool - true when the private key was written to disk
*/
function write_dkim_key($key_file, $key_value, $key_domain) {
global $app, $mailconfig;
@@ -395,7 +405,7 @@
}
/* resync */
- if ($data['new']['active'] == 'y' && $data['new'] == $data['old']) {
+ if ($data['new']['active'] == 'y' && $data['new'] == $data['old'] && $data['new']['dkim']=='y') {
$this->add_dkim($data);
}
}
--
Gitblit v1.9.1