From 239490bd2aae216067a906aa3f4d5221917fa246 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Thu, 04 Dec 2008 12:12:33 -0500
Subject: [PATCH] corrected the install manula for ubuntu 8.04 lts
---
install/lib/installer_base.lib.php | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 0b4303c..d188758 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -119,7 +119,7 @@
$cf = $conf['mysql']; // make $conf['mysql'] more accessible
//** Create the database
- if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$cf['database'])) {
+ if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$cf['database'].' DEFAULT CHARACTER SET '.$cf['charset'])) {
$this->error('Unable to create MySQL database: '.$cf['database'].'.');
}
@@ -132,10 +132,10 @@
$this->error('Stopped: Database already contains some tables.');
} else {
if($cf['admin_password'] == '') {
- caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
+ caselog("mysql --default-character-set=".$cf['charset']." -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
} else {
- caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
+ caselog("mysql --default-character-set=".$cf['charset']." -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
}
$db_tables = $this->db->getTables();
@@ -292,8 +292,8 @@
'broken_sasl_auth_clients = yes',
'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination',
'smtpd_use_tls = yes',
- 'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert',
- 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key',
+ 'smtpd_tls_cert_file = '.$config_dir.'/ssl/smtpd.cert',
+ 'smtpd_tls_key_file = '.$config_dir.'/ssl/smtpd.key',
'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
'virtual_create_maildirsize = yes',
@@ -332,12 +332,13 @@
if(!stristr($options,'dont-create-certs')) {
//* Create the SSL certificate
- $command = 'cd '.$config_dir.'; '
+ $command = 'mkdir '.$config_dir.'/ssl; '
+ .'cd '.$config_dir.'/ssl; '
.'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout '
.'smtpd.key -keyform PEM -days 365 -x509';
exec($command);
- $command = 'chmod o= '.$config_dir.'/smtpd.key';
+ $command = 'chmod o= '.$config_dir.'/ssl/smtpd.key';
caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
}
--
Gitblit v1.9.1