From 4f5d823e5bd70d1d1cd9c665d2ec5727b3a5bc4e Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Mon, 23 May 2011 17:26:10 -0400
Subject: [PATCH] comment by line so the user can test

---
 interface/lib/config.inc.php |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 2bcba6c..813c2c6 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -50,7 +50,7 @@
 //** Database
 $conf['db_type'] = 'mysql';
 $conf['db_host'] = 'localhost';
-$conf['db_database'] = 'ispconfig3';
+$conf['db_database'] = 'dbispconfig';
 $conf['db_user'] = 'root';
 $conf['db_password'] = '';
 $conf['db_charset'] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")
@@ -72,6 +72,7 @@
 
 
 //** Paths
+$conf['ispconfig_log_dir'] = '/var/log/ispconfig';
 define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../')); // The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
 define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
 define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
@@ -82,7 +83,7 @@
 
 //** Paths (Do not change!)
 $conf['rootpath'] = substr(dirname(__FILE__),0,-4);
-$conf['fs_div'] = '/'; // File system separator (divider), "\\" on Windows and "/"" on Linux and UNIX
+$conf['fs_div'] = '/'; // File system separator (divider), "\\" on Windows and "/" on Linux and UNIX
 $conf['classpath'] = $conf['rootpath'].$conf['fs_div'].'lib'.$conf['fs_div'].'classes';
 $conf['temppath'] = $conf['rootpath'].$conf['fs_div'].'temp';
 
@@ -114,7 +115,7 @@
 
 
 //** Logging
-$conf['log_file'] = '/var/log/ispconfig/ispconfig.log';
+$conf['log_file'] = $conf['ispconfig_log_dir'].'/ispconfig.log';
 $conf['log_priority'] = 0; // 0 = Debug, 1 = Warning, 2 = Error
 
 
@@ -132,6 +133,9 @@
 $conf['language'] = 'en';
 $conf['debug_language'] = false;
 
+//** Default Country
+$conf['country'] = 'DE';
+
 
 //** Misc.
 $conf['interface_logout_url'] = ''; // example: http://www.domain.tld/

--
Gitblit v1.9.1