From a9a11217ef22be2ac1d111a08692aab9c7d3b5bc Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 26 May 2007 17:01:28 +0000
Subject: [PATCH] activated the database creation in the installer.
---
install/install.php | 2 +-
install/lib/installer_base.lib.php | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/install/install.php b/install/install.php
index ec2e5ff11..39ad865f9 100644
--- a/install/install.php
+++ b/install/install.php
@@ -60,7 +60,7 @@ include_once('lib/mysql.lib.php');
$inst->db = new db();
// Create the mysql database
-//$inst->configure_database();
+$inst->configure_database();
// Configure postfix
$inst->configure_postfix();
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3dc0214eb..477df7294 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -332,7 +332,7 @@ postfix check
$configfile = 'sasl_smtpd.conf';
if(is_file($conf["dist_postfix_config_dir"].'/sasl/smtpd.conf')) copy($conf["dist_postfix_config_dir"].'/sasl/smtpd.conf',$conf["dist_postfix_config_dir"].'/sasl/smtpd.conf~');
- exec('chmod 400 '.$conf["dist_postfix_config_dir"].'/sasl/smtpd.conf~');
+ if(is_file($conf["dist_postfix_config_dir"].'/sasl/smtpd.conf~')) exec('chmod 400 '.$conf["dist_postfix_config_dir"].'/sasl/smtpd.conf~');
$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);
@@ -351,7 +351,7 @@ postfix check
// configure pam for SMTP authentication agains the ispconfig database
$configfile = 'pamd_smtp';
if(is_file('/etc/pam.d/smtp')) copy('/etc/pam.d/smtp','/etc/pam.d/smtp~');
- exec('chmod 400 /etc/pam.d/smtp~');
+ if(is_file('/etc/pam.d/smtp~')) exec('chmod 400 /etc/pam.d/smtp~');
$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);
@@ -387,7 +387,7 @@ postfix check
// 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~');
- exec('chmod 400 '.$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~');
$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);
--
GitLab