From 381908739bd76ec4e04ac77cd9975e8b4285f7eb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 01 Aug 2008 15:51:58 -0400
Subject: [PATCH] Fixed several bugs in languages files and added missing translations.

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

diff --git a/install/update.php b/install/update.php
index f51a222..673683a 100644
--- a/install/update.php
+++ b/install/update.php
@@ -69,6 +69,12 @@
 include_once('dist/lib/'.$distname.'.lib.php');
 include_once('dist/conf/'.$distname.'.conf.php');
 
+//** Get hostname
+exec('hostname -f', $tmp_out);
+$conf['hostname'] = $tmp_out[0];
+unset($tmp_out);
+
+
 //** Set the mysql login information
 $conf["mysql"]["host"] = $conf_old["db_host"];
 $conf["mysql"]["database"] = $conf_old["db_database"];
@@ -76,6 +82,7 @@
 $conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
 
 $conf['server_id'] = $conf_old["server_id"];
+$conf['ispconfig_log_priority'] = $conf_old["log_priority"];
 
 $inst = new installer();
 
@@ -201,11 +208,11 @@
 	swriteln('Configuring DBServer');
 	$inst->configure_dbserver();
 	
-	if(@is_dir('/etc/Bastille')) {
+	//if(@is_dir('/etc/Bastille')) {
 		//* Configure Firewall
 		swriteln('Configuring Firewall');
 		$inst->configure_firewall();
-	}
+	//}
 }
 
 //** Configure ISPConfig

--
Gitblit v1.9.1