From b74ef5e5ae32e37272b4135e04eb4e1ffd3fe994 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 29 Jun 2011 08:27:45 -0400
Subject: [PATCH] First commit for: FS#952 - Module for virtual machine management
---
interface/lib/config.inc.php | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 2bcba6c..2344132 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
@@ -127,11 +128,16 @@
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/ispc_logo.png';
+//** Templates
+$conf['templates'] = '/usr/local/ispconfig/server/conf';
//** Default Language
$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