From 8c4aa39481bbfde2b403f4787c85c057e84f2e12 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 22 Jul 2009 09:01:13 -0400
Subject: [PATCH] Merged revisions 1216 - 1279 from trunk

---
 install/update.php |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/install/update.php b/install/update.php
index b309509..83bca4d 100644
--- a/install/update.php
+++ b/install/update.php
@@ -53,6 +53,10 @@
 //** Include the base class of the installer class
 require_once('lib/installer_base.lib.php');
 
+//** Ensure that current working directory is install directory
+$cur_dir = getcwd();
+if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");
+
 //** Install logfile
 define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
 define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
@@ -155,6 +159,9 @@
 
 //** Create the mysql database
 $inst->configure_database();
+
+//** Update master database rights
+$inst->grant_master_database_rights();
 
 //** empty all databases
 $db_tables = $inst->db->getTables();
@@ -284,6 +291,10 @@
 		//** Configure Apache
 		swriteln('Configuring Apache');
 		$inst->configure_apache();
+        
+        //** Configure vlogger
+        swriteln('Configuring vlogger');
+        $inst->configure_vlogger();
 	}
 	
 

--
Gitblit v1.9.1