From 5f0f02aac59aa083a49ad8409f4afff9345ba4cd Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Sun, 27 May 2007 09:11:59 -0400 Subject: [PATCH] diverse fixes in installer and user form. --- install/lib/installer_base.lib.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 477df72..9c89a7c 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -386,14 +386,15 @@ // amavisd user config file $configfile = 'amavisd_user_config'; - if(is_file($conf["dist_amavis_config_dir"].'/50-user')) copy($conf["dist_amavis_config_dir"].'/50-user',$conf["dist_courier_config_dir"].'/50-user~'); - if(is_file($conf["dist_amavis_config_dir"].'/50-user~')) exec('chmod 400 '.$conf["dist_amavis_config_dir"].'/50-user~'); + if(is_file($conf["dist_amavis_config_dir"].'/conf.d/50-user')) copy($conf["dist_amavis_config_dir"].'/conf.d/50-user',$conf["dist_courier_config_dir"].'/50-user~'); + if(is_file($conf["dist_amavis_config_dir"].'/conf.d/50-user~')) exec('chmod 400 '.$conf["dist_amavis_config_dir"].'/conf.d/50-user~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content); $content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content); $content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content); + $content = str_replace('{mysql_server_port}',$conf["mysql_server_port"],$content); $content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content); - wf($conf["dist_amavis_config_dir"].'/50-user',$content); + wf($conf["dist_amavis_config_dir"].'/conf.d/50-user',$content); // TODO: chmod and chown on the config file -- Gitblit v1.9.1