From f4d7e5108636bd7ae25d60cd0395dfd4da72243d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 06 Mar 2013 04:58:27 -0500
Subject: [PATCH] Fixed issue in mailman configuration that caused a wrong content in virtual_to_transport.sh script.
---
install/lib/installer_base.lib.php | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 1d51613..74858c8 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -567,22 +567,6 @@
}
}
}
-
- $config_dir = $conf['mailman']['config_dir'].'/';
- $full_file_name = $config_dir.'virtual_to_transport.sh';
-
- //* Backup exiting virtual_to_transport.sh script
- if(is_file($full_file_name)) {
- copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
- }
-
- if(is_dir('/etc/mailman')) {
- copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
- chgrp($full_file_name,'list');
- chmod($full_file_name,0750);
- }
-
- exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
$virtual_domains = '';
if($status == 'update')
@@ -607,8 +591,27 @@
if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = '';
$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
-
+
wf($full_file_name, $content);
+
+ //* Write virtual_to_transport.sh script
+ $config_dir = $conf['mailman']['config_dir'].'/';
+ $full_file_name = $config_dir.'virtual_to_transport.sh';
+
+ //* Backup exiting virtual_to_transport.sh script
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+ }
+
+ if(is_dir('/etc/mailman')) {
+ copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+ chgrp($full_file_name,'list');
+ chmod($full_file_name,0750);
+ }
+
+ //* Create aliasaes
+ exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+
}
public function configure_postfix($options = '') {
--
Gitblit v1.9.1