Skip to content

Commit e3f2e5f

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents 7f468ef + 9e63ffc commit e3f2e5f

File tree

7 files changed

+66
-4
lines changed

7 files changed

+66
-4
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,27 @@ function configure_postfix($options = '')
185185
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
186186
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
187187

188+
//* Create auxillary postfix conf files
189+
$configfile = 'helo_access';
190+
if(is_file($config_dir.'/'.$configfile)) {
191+
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
192+
chmod($config_dir.'/'.$configfile.'~', 0400);
193+
}
194+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
195+
$content = strtr($content, $postconf_placeholders);
196+
# todo: look up this server's ip addrs and loop through each
197+
# todo: look up domains hosted on this server and loop through each
198+
wf($config_dir.'/'.$configfile, $content);
199+
200+
$configfile = 'blacklist_helo';
201+
if(is_file($config_dir.'/'.$configfile)) {
202+
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
203+
chmod($config_dir.'/'.$configfile.'~', 0400);
204+
}
205+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
206+
$content = strtr($content, $postconf_placeholders);
207+
wf($config_dir.'/'.$configfile, $content);
208+
188209
//* Make a backup copy of the main.cf file
189210
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
190211

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,26 @@ public function configure_postfix($options = '')
135135
touch($config_dir.'/nested_header_checks');
136136
touch($config_dir.'/body_checks');
137137

138+
//* Create auxillary postfix conf files
139+
$configfile = 'helo_access';
140+
if(is_file($config_dir.'/'.$configfile)) {
141+
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
142+
chmod($config_dir.'/'.$configfile.'~', 0400);
143+
}
144+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
145+
$content = strtr($content, $postconf_placeholders);
146+
# todo: look up this server's ip addrs and loop through each
147+
# todo: look up domains hosted on this server and loop through each
148+
wf($config_dir.'/'.$configfile, $content);
149+
150+
$configfile = 'blacklist_helo';
151+
if(is_file($config_dir.'/'.$configfile)) {
152+
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
153+
chmod($config_dir.'/'.$configfile.'~', 0400);
154+
}
155+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
156+
$content = strtr($content, $postconf_placeholders);
157+
wf($config_dir.'/'.$configfile, $content);
138158

139159
//* Make a backup copy of the main.cf file
140160
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,27 @@ function configure_postfix($options = '')
197197
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
198198
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
199199

200+
//* Create auxillary postfix conf files
201+
$configfile = 'helo_access';
202+
if(is_file($config_dir.'/'.$configfile)) {
203+
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
204+
chmod($config_dir.'/'.$configfile.'~', 0400);
205+
}
206+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
207+
$content = strtr($content, $postconf_placeholders);
208+
# todo: look up this server's ip addrs and loop through each
209+
# todo: look up domains hosted on this server and loop through each
210+
wf($config_dir.'/'.$configfile, $content);
211+
212+
$configfile = 'blacklist_helo';
213+
if(is_file($config_dir.'/'.$configfile)) {
214+
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
215+
chmod($config_dir.'/'.$configfile.'~', 0400);
216+
}
217+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
218+
$content = strtr($content, $postconf_placeholders);
219+
wf($config_dir.'/'.$configfile, $content);
220+
200221
//* Make a backup copy of the main.cf file
201222
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
202223

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_ma
2626
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2727
smtpd_helo_required = yes
2828
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
29-
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
29+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, permit_sasl_authenticated, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
3030
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
3131
smtpd_client_message_rate_limit = 100
3232
maildrop_destination_concurrency_limit = 1

‎install/tpl/fedora_postfix.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_ma
2323
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2424
smtpd_helo_required = yes
2525
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
26-
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
26+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, permit_sasl_authenticated, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2727
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2828
smtpd_client_message_rate_limit = 100
2929
maildrop_destination_concurrency_limit = 1

‎install/tpl/gentoo_postfix.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_ma
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 $smtpd_sender_login_maps
2323
smtpd_helo_required = yes
2424
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
25-
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
25+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, permit_sasl_authenticated, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2626
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2727
smtpd_client_message_rate_limit = 100
2828
maildrop_destination_concurrency_limit = 1

‎install/tpl/opensuse_postfix.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_ma
2525
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2626
smtpd_helo_required = yes
2727
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
28-
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
28+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, permit_sasl_authenticated, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2929
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
3030
smtpd_client_message_rate_limit = 100
3131
maildrop_destination_concurrency_limit = 1

0 commit comments

Comments
 (0)