Skip to content

Commit 90cd1a2

Browse files
author
Marius Burkard
committed
Merge branch '6218-mail-transport-domain-relay-recipient-open-relay' into 'develop'
Resolve "mail transport + @Domain relay recipient = open relay" Closes #6218 See merge request ispconfig/ispconfig3!1511
2 parents bc6928c + 8cfb4fa commit 90cd1a2

File tree

96 files changed

+1323
-233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1323
-233
lines changed

‎install/dist/lib/centos_base.lib.php‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -83,31 +83,28 @@ public function configure_amavis() {
8383

8484
$config_dir = $conf['postfix']['config_dir'];
8585

86-
// Adding amavis-services to the master.cf file if the service does not already exists
87-
$add_amavis = !$this->get_postfix_service('amavis','unix');
88-
$add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet');
89-
$add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet');
90-
91-
if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
92-
//* backup master.cf
93-
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
94-
// adjust amavis-config
95-
if($add_amavis) {
96-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
97-
af($config_dir.'/master.cf', $content);
98-
unset($content);
99-
}
100-
if ($add_amavis_10025) {
101-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
102-
af($config_dir.'/master.cf', $content);
103-
unset($content);
104-
}
105-
if ($add_amavis_10027) {
106-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
107-
af($config_dir.'/master.cf', $content);
108-
unset($content);
109-
}
110-
}
86+
// Adding amavis-services to the master.cf file
87+
88+
// backup master.cf
89+
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
90+
91+
// first remove the old service definitions
92+
$this->remove_postfix_service('amavis','unix');
93+
$this->remove_postfix_service('127.0.0.1:10025','inet');
94+
$this->remove_postfix_service('127.0.0.1:10027','inet');
95+
96+
// then add them back
97+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
98+
af($config_dir.'/master.cf', $content);
99+
unset($content);
100+
101+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
102+
af($config_dir.'/master.cf', $content);
103+
unset($content);
104+
105+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
106+
af($config_dir.'/master.cf', $content);
107+
unset($content);
111108

112109
removeLine('/etc/sysconfig/freshclam', 'FRESHCLAM_DELAY=disabled-warn # REMOVE ME', 1);
113110
replaceLine('/etc/freshclam.conf', 'Example', '# Example', 1);

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

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -330,31 +330,28 @@ public function configure_amavis() {
330330

331331
$config_dir = $conf['postfix']['config_dir'];
332332

333-
// Adding amavis-services to the master.cf file if the service does not already exists
334-
$add_amavis = !$this->get_postfix_service('amavis','unix');
335-
$add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet');
336-
$add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet');
337-
338-
if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
339-
//* backup master.cf
340-
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
341-
// adjust amavis-config
342-
if($add_amavis) {
343-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
344-
af($config_dir.'/master.cf', $content);
345-
unset($content);
346-
}
347-
if ($add_amavis_10025) {
348-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
349-
af($config_dir.'/master.cf', $content);
350-
unset($content);
351-
}
352-
if ($add_amavis_10027) {
353-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
354-
af($config_dir.'/master.cf', $content);
355-
unset($content);
356-
}
357-
}
333+
// Adding amavis-services to the master.cf file
334+
335+
// backup master.cf
336+
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
337+
338+
// first remove the old service definitions
339+
$this->remove_postfix_service('amavis','unix');
340+
$this->remove_postfix_service('127.0.0.1:10025','inet');
341+
$this->remove_postfix_service('127.0.0.1:10027','inet');
342+
343+
// then add them back
344+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
345+
af($config_dir.'/master.cf', $content);
346+
unset($content);
347+
348+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
349+
af($config_dir.'/master.cf', $content);
350+
unset($content);
351+
352+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
353+
af($config_dir.'/master.cf', $content);
354+
unset($content);
358355

359356
removeLine('/etc/sysconfig/freshclam', 'FRESHCLAM_DELAY=disabled-warn # REMOVE ME', 1);
360357
replaceLine('/etc/freshclam.conf', 'Example', '# Example', 1);

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

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -444,31 +444,28 @@ public function configure_amavis()
444444

445445
$config_dir = $conf['postfix']['config_dir'];
446446

447-
// Adding amavis-services to the master.cf file if the service does not already exists
448-
$add_amavis = !$this->get_postfix_service('amavis','unix');
449-
$add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet');
450-
$add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet');
451-
452-
if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
453-
//* backup master.cf
454-
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
455-
// adjust amavis-config
456-
if($add_amavis) {
457-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
458-
af($config_dir.'/master.cf', $content);
459-
unset($content);
460-
}
461-
if ($add_amavis_10025) {
462-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
463-
af($config_dir.'/master.cf', $content);
464-
unset($content);
465-
}
466-
if ($add_amavis_10027) {
467-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
468-
af($config_dir.'/master.cf', $content);
469-
unset($content);
470-
}
471-
}
447+
// Adding amavis-services to the master.cf file
448+
449+
// backup master.cf
450+
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
451+
452+
// first remove the old service definitions
453+
$this->remove_postfix_service('amavis','unix');
454+
$this->remove_postfix_service('127.0.0.1:10025','inet');
455+
$this->remove_postfix_service('127.0.0.1:10027','inet');
456+
457+
// then add them back
458+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
459+
af($config_dir.'/master.cf', $content);
460+
unset($content);
461+
462+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
463+
af($config_dir.'/master.cf', $content);
464+
unset($content);
465+
466+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
467+
af($config_dir.'/master.cf', $content);
468+
unset($content);
472469

473470
//* Add the clamav user to the amavis group
474471
exec('usermod -a -G amavis clamav');

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

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -513,31 +513,28 @@ public function configure_amavis() {
513513

514514
$config_dir = $conf['postfix']['config_dir'];
515515

516-
// Adding amavis-services to the master.cf file if the service does not already exists
517-
$add_amavis = !$this->get_postfix_service('amavis','unix');
518-
$add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet');
519-
$add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet');
520-
521-
if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
522-
//* backup master.cf
523-
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
524-
// adjust amavis-config
525-
if($add_amavis) {
526-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
527-
af($config_dir.'/master.cf', $content);
528-
unset($content);
529-
}
530-
if ($add_amavis_10025) {
531-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
532-
af($config_dir.'/master.cf', $content);
533-
unset($content);
534-
}
535-
if ($add_amavis_10027) {
536-
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
537-
af($config_dir.'/master.cf', $content);
538-
unset($content);
539-
}
540-
}
516+
// Adding amavis-services to the master.cf file
517+
518+
// backup master.cf
519+
if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');
520+
521+
// first remove the old service definitions
522+
$this->remove_postfix_service('amavis','unix');
523+
$this->remove_postfix_service('127.0.0.1:10025','inet');
524+
$this->remove_postfix_service('127.0.0.1:10027','inet');
525+
526+
// then add them back
527+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
528+
af($config_dir.'/master.cf', $content);
529+
unset($content);
530+
531+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
532+
af($config_dir.'/master.cf', $content);
533+
unset($content);
534+
535+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
536+
af($config_dir.'/master.cf', $content);
537+
unset($content);
541538

542539
// Add the clamav user to the vscan group
543540
//exec('groupmod --add-user clamav vscan');

0 commit comments

Comments
 (0)