diff --git a/install/dist/tpl/gentoo/amavisd-ispconfig.conf.master b/install/dist/tpl/gentoo/amavisd-ispconfig.conf.master index d67c60aa2d51451256ac78e62292100f37f558a9..32ee177b75bc62caefcf57c0ec585be98528c81b 100644 --- a/install/dist/tpl/gentoo/amavisd-ispconfig.conf.master +++ b/install/dist/tpl/gentoo/amavisd-ispconfig.conf.master @@ -93,6 +93,22 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) # Set the log_level to 5 for debugging $log_level = 0; # (defaults to 0) +$inet_socket_port = [10024,10026]; +$forward_method = 'smtp:[127.0.0.1]:10025'; +$notify_method = 'smtp:[127.0.0.1]:10027'; +$interface_policy{'10026'} = 'ORIGINATING'; +$policy_bank{'ORIGINATING'} = { + originating => 1, + smtpd_discard_ehlo_keywords => ['8BITMIME'], + forward_method => 'smtp:[127.0.0.1]:10027', +}; +@mynetworks = qw(0.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 +192.168.0.0/16); +$signed_header_fields{'received'} = 0; # turn off signing of Received +$enable_dkim_verification = 1; +$enable_dkim_signing = 1; +@dkim_signature_options_bysender_maps = ( +{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } ); #------------ Do not modify anything below this line ------------- 1; # insure a defined return diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master index d831a419f3b771fd641ef91212c9e9be731a441c..2e5a73d5dc44111b4d95b2f85f5cf56f834d1716 100644 --- a/install/tpl/amavisd_user_config.master +++ b/install/tpl/amavisd_user_config.master @@ -75,6 +75,18 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) # Set the log_level to 5 for debugging $log_level = 0; # (defaults to 0) +$inet_socket_port = [10024,10026]; +$forward_method = 'smtp:[127.0.0.1]:10025'; +$notify_method = 'smtp:[127.0.0.1]:10027'; +$interface_policy{'10026'} = 'ORIGINATING'; +$policy_bank{'ORIGINATING'} = { + originating => 1, + smtpd_discard_ehlo_keywords => ['8BITMIME'], + forward_method => 'smtp:[127.0.0.1]:10027', +}; +@mynetworks = qw(0.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 +192.168.0.0/16); + # DKIM $enable_dkim_verification = 1; diff --git a/interface/lib/classes/validate_dkim.inc.php b/interface/lib/classes/validate_dkim.inc.php index 695288e0e02c8656fce4de72eded6c62ddf84fce..5a9b8c0beccac56988de2cfe3b9327c6141c9de0 100644 --- a/interface/lib/classes/validate_dkim.inc.php +++ b/interface/lib/classes/validate_dkim.inc.php @@ -57,18 +57,6 @@ class validate_dkim { } } - - /** - * Validator function for DKIM Path - * @return boolean - true when the dkim-path exists and is writeable - */ - function check_dkim_path($field_name, $field_value, $validator) { - if(empty($field_value)) return $this->get_error($validator['errmsg']); - if (substr(sprintf('%o', fileperms($field_value)), -3) <= 600) - return $this->get_error($validator['errmsg']); - } - - /** * Check function for DNS-Template */ diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 89165ecfe5e7f8ab9b9871a1d6fd07fb5e8f50e1..5b270c6b29f324e5644e2b133653820eed4493d6 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -303,15 +303,19 @@ $form["tabs"]['mail'] = array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'default' => '/var/lib/amavis/dkim', - 'validators' => array ( 0 => array ('type' => 'CUSTOM', - 'class' => 'validate_dkim', - 'function' => 'check_dkim_path', - 'errmsg'=> 'dkim_path_error'), - ), 'value' => '', 'width' => '40', 'maxlength' => '255' ), + 'relayhost_password' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '40', + 'maxlength' => '255' + ), + 'pop3_imap_daemon' => array( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 4175aa1aebd02f473bcce45bec2a3d8a2c9209c0..a6ab09e60461d8a416b559c9368351d51a5c15f1 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 8a28512023f1662ebc127307a4130df5fec55df9..73cfefd336d88d3c3947d323cde80600196377d3 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 12557b7cb8aaa22918bc9f542ac61a10003a02f6..bcda7c31ffb55493d934851ca468a18b539f1f2f 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 05fa26912e140185503495ebf41db49816a4b464..8290becddc892243f61adf5686eeb91dd6d39f43 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -184,7 +184,6 @@ $wb['monit_user_txt'] = 'Monit User'; $wb['monit_password_txt'] = 'Monit Password'; $wb['monit_url_error_regex'] = 'Invalid Monit URL'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb['monit_url_note_txt'] = 'Placeholder:'; $wb['munin_url_txt'] = 'Munin URL'; diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 26d5e24dae6a8b9d5b2926ef2228aa8b854e58ee..712d3505f8fdf0e452a1ba387331673a24c28b85 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -20,7 +20,6 @@ $wb['module_txt'] = 'Modul'; $wb['maildir_path_txt'] = 'Maildir Pfad'; $wb['homedir_path_txt'] = 'Homedir Pfad'; $wb['dkim_path_txt'] = 'DKIM Pfad'; -$wb['dkim_path_error'] = 'DKIM Pfad nicht gefunden oder nicht beschreibbar.'; $wb['mailuser_uid_txt'] = 'Mailbenutzer UID'; $wb['mailuser_gid_txt'] = 'Mailbenutzer GID'; $wb['mailuser_name_txt'] = 'Mailbenutzer Name'; diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index e472859b12896b791e6ed03789e2dc37e410583e..108437207d06013c8ddbb6391244105d4e61db0f 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -31,7 +31,6 @@ $wb["module_txt"] = 'Module'; $wb["maildir_path_txt"] = 'Maildir Path'; $wb["homedir_path_txt"] = 'Homedir Path'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb["mailuser_uid_txt"] = 'Mailuser UID'; $wb["mailuser_gid_txt"] = 'Mailuser GID'; $wb["mailuser_name_txt"] = 'Mailuser Name'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index b4efb0e0c176cd276fd62882eb6231fb65ce1c10..791327274cf391034c781c214b9fdba3d029f38a 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 2ee8b4f8bc56b10c7b33a72933e3157fb463b5ed..1f3cd2bedf20fcdf33d4060802f868a7bbbffb58 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index 22048a40951df2591643d1fdf8cb4e738b3d93da..c20ee6157cc514e0e95a931c5a4f42f34ae441d9 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -19,7 +19,6 @@ $wb['module_txt'] = 'Module'; $wb['maildir_path_txt'] = 'Chemin Maildir'; $wb['homedir_path_txt'] = 'Chemin Homedir'; $wb['dkim_path_txt'] = 'Chemin DKIM'; -$wb['dkim_path_error'] = 'Le chemin DKIM n\'est pas trouvé ou ne peut être écrit.'; $wb['mailuser_uid_txt'] = 'UID de l\'utilisateur mail'; $wb['mailuser_gid_txt'] = 'GID de l\'utilisateur mail'; $wb['mailuser_name_txt'] = 'Nom d\'utilisateur mail'; diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 627cf50a6270b214faba0f63b92815429c1a27ce..153a4cd6b07bd313991ffa36b4737f1f50550c92 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index c0cc3738e2a4a698696628f0b32c59a18b75f77b..b616a3583fcaf7f9524e2364af520013e4760e5d 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index ad3b1f9164f2185673ed14bae2ff396451613dd3..64ab31cc0b7fc504aa787ff6a58485e299868ecf 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index d244720946d14c8c30a67930105df851fbe0c854..8b3a7d8aaf8380d7fedc1cb0be398bca8f82c6d8 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 60e621f69f27f6de44ac191bbd5ea0a278c4e9e0..d78c631ea367cc6df807146c933d2c34497b7bb2 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index f54d1c573bedb5f9c558c5ea92eba7a4d3d4fea9..63dd76a6ed24b9199b206ef84ed8ce9f9942a43b 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index efe2623b8598d3e61fd13f4e6040632343f96cb2..84f1e94bb7b60f7bb6895f961e8a4e2f800f98ef 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 521d144a2bfe439afc4bfc3375c8ea500e459e20..6e3367b27208abd6468d5e2be722fc42f6851f09 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 05ff9b035cbb4854d69cc938117dc1d22dfb290e..537c944aa2a8f5130b03d40e8f8bd8fc63d1bc88 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 76429e9595e412d736859008e78a6b5a20dd81ec..f8f65acaae9bfa332f441af95b14b42d88d463dd 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index ddcb1f0f8e48eeff5912403d2352ecca9fb5619a..f84cf231be5b80a879bd934be0bed1f9c61888fc 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index ebc2c6bf392bd8662251534cd3373cb98068c608..e4ba68afa4744c5c4546b940fc8774b197019038 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index 3b86042ffaeb9e08a4302ddd8320c34e533891cf..8371640cc898d1bc0f9a4b392e3873b012ca661c 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password'; $wb['munin_url_error_regex'] = 'Invalid Munin URL'; $wb['munin_url_note_txt'] = 'Placeholder:'; $wb["dkim_path_txt"] = 'DKIM Path'; -$wb["dkim_path_error"] = 'DKIM Path not found or not writeable.'; $wb['backup_delete_txt'] = 'Delete backups on domain/website delete'; $wb["v6_prefix_txt"] = 'IPv6 Prefix'; $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror'; diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php index 325dc0b1f1025de4029647a37249a2139dfcecb9..72d9f45b619dd67d2757d26a4d0d04db3864cb7f 100644 --- a/server/plugins-available/mail_plugin_dkim.inc.php +++ b/server/plugins-available/mail_plugin_dkim.inc.php @@ -107,11 +107,18 @@ class mail_plugin_dkim { } /* dir for dkim-keys writeable? */ $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail'); - if (isset($mail_config['dkim_path']) && isset($data['new']['dkim_private']) && !empty($data['new']['dkim_private'])) { + if (isset($mail_config['dkim_path']) && (!empty($mail_config['dkim_path'])) && isset($data['new']['dkim_private']) && !empty($data['new']['dkim_private'])) { + + 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); + } + if (!is_writeable($mail_config['dkim_path'])) { - $app->log('DKIM Path '.$mail_config['dkim_path'].' not found or not writeable.', LOGLEVEL_ERROR); + $app->log('DKIM Path '.$mail_config['dkim_path'].' not writeable.', LOGLEVEL_ERROR); $check=false; } + } else { $app->log('Unable to write DKIM settings; Check your config!', LOGLEVEL_ERROR); $check=false; @@ -160,7 +167,7 @@ class mail_plugin_dkim { /* save the DKIM Public-key in dkim-dir */ if (!file_put_contents($key_file.'.public', $public_key) === false) $app->log('Saved DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG); - else $app->log('Unable to save DKIM Public to '.$key_domain.'.', LOGLEVEL_WARNING); + else $app->log('Unable to save DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG); } return $success; } @@ -220,7 +227,7 @@ class mail_plugin_dkim { file_put_contents($this->get_amavis_config(), $amavis_config); $app->log('Deleted the DKIM settings from amavis-config for '.$key_domain.'.', LOGLEVEL_DEBUG); $this->restart_amavis(); - } else $app->log('Unable to delete the DKIM settings from amavis-config for '.$key_domain.'.', LOGLEVEL_ERROR); + } else $app->log('Unable to delete the DKIM settings from amavis-config for '.$key_domain.'.', LOGLEVEL_DEBUG); } /**