Skip to content

Commit 615a0a9

Browse files
tbrehmtbrehm
committed
Merged revisions 3960-4065 from stable branch.
1 parent bdbad50 commit 615a0a9

231 files changed

Lines changed: 5158 additions & 2898 deletions

File tree

Some content is hidden

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

‎install/dist/lib/centos52.lib.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function configure_mailman($status = 'insert') {
4141
}
4242

4343
// load files
44-
$content = rf('tpl/mm_cfg.py.master');
44+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/mm_cfg.py.master', 'tpl/mm_cfg.py.master');
4545
$old_file = rf($full_file_name);
4646

4747
$old_options = array();
@@ -67,7 +67,11 @@ public function configure_mailman($status = 'insert') {
6767
copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
6868
}
6969

70-
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
70+
if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailman-virtual_to_transport.sh')) {
71+
copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailman-virtual_to_transport.sh', $full_file_name);
72+
} else {
73+
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
74+
}
7175
chgrp($full_file_name,'mailman');
7276
chmod($full_file_name,0750);
7377

@@ -110,7 +114,7 @@ public function configure_amavis() {
110114
$configfile = 'fedora_amavisd_conf';
111115
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
112116
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
113-
$content = rf("tpl/".$configfile.".master");
117+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "tpl/".$configfile.".master");
114118
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
115119
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
116120
$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
@@ -142,7 +146,7 @@ public function configure_amavis() {
142146
// Only add the content if we had not addded it before
143147
if(!stristr($content,"127.0.0.1:10025")) {
144148
unset($content);
145-
$content = rf("tpl/master_cf_amavis.master");
149+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', "tpl/master_cf_amavis.master");
146150
af($conf["postfix"]["config_dir"].'/master.cf',$content);
147151
}
148152
unset($content);

‎install/dist/lib/centos53.lib.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function configure_mailman($status = 'insert') {
4141
}
4242

4343
// load files
44-
$content = rf('tpl/mm_cfg.py.master');
44+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/mm_cfg.py.master', 'tpl/mm_cfg.py.master');
4545
$old_file = rf($full_file_name);
4646

4747
$old_options = array();
@@ -67,7 +67,11 @@ public function configure_mailman($status = 'insert') {
6767
copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
6868
}
6969

70-
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
70+
if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailman-virtual_to_transport.sh')) {
71+
copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailman-virtual_to_transport.sh', $full_file_name);
72+
} else {
73+
copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
74+
}
7175
chgrp($full_file_name,'mailman');
7276
chmod($full_file_name,0750);
7377

@@ -111,7 +115,7 @@ public function configure_amavis() {
111115
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
112116
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
113117
if(!is_dir($conf["amavis"]["config_dir"])) mkdir($conf["amavis"]["config_dir"]);
114-
$content = rf("tpl/".$configfile.".master");
118+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', "tpl/".$configfile.".master");
115119
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
116120
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
117121
$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
@@ -143,7 +147,7 @@ public function configure_amavis() {
143147
// Only add the content if we had not addded it before
144148
if(!stristr($content,"127.0.0.1:10025")) {
145149
unset($content);
146-
$content = rf("tpl/master_cf_amavis.master");
150+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', "tpl/master_cf_amavis.master");
147151
af($conf["postfix"]["config_dir"].'/master.cf',$content);
148152
}
149153
unset($content);

‎install/dist/lib/debian60.lib.php‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,17 @@ public function configure_dovecot()
8686

8787
//* Copy dovecot configuration file
8888
if($dovecot_version == 2) {
89-
copy('tpl/debian6_dovecot2.conf.master',$config_dir.'/'.$configfile);
89+
if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot2.conf.master')) {
90+
copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot2.conf.master', $config_dir.'/'.$configfile);
91+
} else {
92+
copy('tpl/debian6_dovecot2.conf.master',$config_dir.'/'.$configfile);
93+
}
9094
} else {
91-
copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile);
95+
if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {
96+
copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master', $config_dir.'/'.$configfile);
97+
} else {
98+
copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile);
99+
}
92100
}
93101

94102
//* dovecot-sql.conf
@@ -97,7 +105,7 @@ public function configure_dovecot()
97105
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
98106
chmod($config_dir.'/'.$configfile.'~', 0400);
99107
}
100-
$content = rf('tpl/debian6_dovecot-sql.conf.master');
108+
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot-sql.conf.master', 'tpl/debian6_dovecot-sql.conf.master');
101109
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
102110
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
103111
$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);

0 commit comments

Comments
 (0)