Skip to content

Commit ec57162

Browse files
tbrehmtbrehm
committed
Updated dkim support. Thanks to Florian for the patch.
1 parent c1418f4 commit ec57162

18 files changed

+180
-98
lines changed

‎install/dist/lib/fedora.lib.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,19 @@ function configure_postfix($options = '')
152152
//* mysql-virtual_relayrecipientmaps.cf
153153
$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
154154

155+
//* postfix-dkim
156+
$full_file_name=$config_dir.'/tag_as_originating.re';
157+
if(is_file($full_file_name)) {
158+
copy($full_file_name, $config_dir.$configfile.'~');
159+
}
160+
wf($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10026');
161+
162+
$full_file_name=$config_dir.'/tag_as_foreign.re';
163+
if(is_file($full_file_name)) {
164+
copy($full_file_name, $config_dir.$configfile.'~');
165+
}
166+
wf($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10024');
167+
155168
//* Changing mode and group of the new created config files.
156169
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
157170
__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,19 @@ public function configure_postfix($options = '')
156156
$command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters';
157157
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
158158
}
159+
160+
//* postfix-dkim
161+
$full_file_name=$config_dir.'/tag_as_originating.re';
162+
if(is_file($full_file_name)) {
163+
copy($full_file_name, $config_dir.$configfile.'~');
164+
}
165+
$this->write_config_file($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10026');
166+
167+
$full_file_name=$config_dir.'/tag_as_foreign.re';
168+
if(is_file($full_file_name)) {
169+
copy($full_file_name, $config_dir.$configfile.'~');
170+
}
171+
$this->write_config_file($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10024');
159172

160173
//* Chmod and chown the .mailfilter file
161174
$command = 'chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter';

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,19 @@ function configure_postfix($options = '')
151151
//* mysql-virtual_relayrecipientmaps.cf
152152
$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
153153

154+
//* postfix-dkim
155+
$full_file_name=$config_dir.'/tag_as_originating.re';
156+
if(is_file($full_file_name)) {
157+
copy($full_file_name, $config_dir.$configfile.'~');
158+
}
159+
wf($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10026');
160+
161+
$full_file_name=$config_dir.'/tag_as_foreign.re';
162+
if(is_file($full_file_name)) {
163+
copy($full_file_name, $config_dir.$configfile.'~');
164+
}
165+
wf($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10024');
166+
154167
//* Changing mode and group of the new created config files.
155168
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
156169
__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');

‎install/lib/installer_base.lib.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,15 @@ public function configure_postfix($options = '') {
665665
//* mysql-virtual_relayrecipientmaps.cf
666666
$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
667667

668+
//* postfix-dkim
669+
$full_file_name=$config_dir.'/tag_as_originating.re';
670+
if(is_file($full_file_name)) copy($full_file_name, $config_dir.$configfile.'~');
671+
wf($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10026');
672+
673+
$full_file_name=$config_dir.'/tag_as_foreign.re';
674+
if(is_file($full_file_name)) copy($full_file_name, $config_dir.$configfile.'~');
675+
wf($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10024');
676+
668677
//* Changing mode and group of the new created config files.
669678
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
670679
__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{conf
2020
relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
2121
relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2222
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps
23-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf
23+
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2424
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2525
smtpd_client_message_rate_limit = 100
2626
maildrop_destination_concurrency_limit = 1
@@ -30,4 +30,4 @@ header_checks = regexp:{config_dir}/header_checks
3030
mime_header_checks = regexp:{config_dir}/mime_header_checks
3131
nested_header_checks = regexp:{config_dir}/nested_header_checks
3232
body_checks = regexp:{config_dir}/body_checks
33-
owner_request_special = no
33+
owner_request_special = no

‎install/tpl/fedora_postfix.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{conf
1717
relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
1818
relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
1919
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps
20-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf
20+
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2121
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2222
smtpd_client_message_rate_limit = 100
2323
maildrop_destination_concurrency_limit = 1
@@ -27,4 +27,4 @@ header_checks = regexp:{config_dir}/header_checks
2727
mime_header_checks = regexp:{config_dir}/mime_header_checks
2828
nested_header_checks = regexp:{config_dir}/nested_header_checks
2929
body_checks = regexp:{config_dir}/body_checks
30-
inet_interfaces = all
30+
inet_interfaces = all

‎install/tpl/gentoo_postfix.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{conf
1717
relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
1818
relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
1919
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps
20-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf
20+
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2121
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2222
smtpd_client_message_rate_limit = 100
2323
maildrop_destination_concurrency_limit = 1
@@ -27,4 +27,4 @@ header_checks = regexp:{config_dir}/header_checks
2727
mime_header_checks = regexp:{config_dir}/mime_header_checks
2828
nested_header_checks = regexp:{config_dir}/nested_header_checks
2929
body_checks = regexp:{config_dir}/body_checks
30-
inet_interfaces = all
30+
inet_interfaces = all

‎install/tpl/opensuse_postfix.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{conf
1717
relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
1818
relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
1919
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps
20-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf
20+
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2121
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2222
smtpd_client_message_rate_limit = 100
2323
maildrop_destination_concurrency_limit = 1
@@ -27,4 +27,4 @@ header_checks = regexp:{config_dir}/header_checks
2727
mime_header_checks = regexp:{config_dir}/mime_header_checks
2828
nested_header_checks = regexp:{config_dir}/nested_header_checks
2929
body_checks = regexp:{config_dir}/body_checks
30-
inet_interfaces = all
30+
inet_interfaces = all

‎interface/web/admin/lib/lang/de_server_config.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ $wb['fastcgi_bin_txt'] = 'FastCGI Bin';
1919
$wb['module_txt'] = 'Modul';
2020
$wb['maildir_path_txt'] = 'Maildir Pfad';
2121
$wb['homedir_path_txt'] = 'Homedir Pfad';
22+
$wb["dkim_path_txt"] = 'DKIM Pfad';
23+
$wb["dkim_path_error"] = 'DKIM Pfad nicht gefunden oder nicht beschreibbar.';
2224
$wb['mailuser_uid_txt'] = 'Mailbenutzer UID';
2325
$wb['mailuser_gid_txt'] = 'Mailbenutzer GID';
2426
$wb['mailuser_name_txt'] = 'Mailbenutzer Name';

‎interface/web/admin/lib/lang/fr_server_config.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ $wb['fastcgi_bin_txt'] = 'Exécutable FastCGI';
1818
$wb['module_txt'] = 'Module';
1919
$wb['maildir_path_txt'] = 'Chemin Maildir';
2020
$wb['homedir_path_txt'] = 'Chemin Homedir';
21+
$wb['dkim_path_txt'] = 'Chemin DKIM';
22+
$wb['dkim_path_error'] = 'Le chemin DKIM n\'est pas trouvé ou ne peut être écrit.';
2123
$wb['mailuser_uid_txt'] = 'UID de l\'utilisateur mail';
2224
$wb['mailuser_gid_txt'] = 'GID de l\'utilisateur mail';
2325
$wb['mailuser_name_txt'] = 'Nom d\'utilisateur mail';

0 commit comments

Comments
 (0)