From c6e05a8eebc58624c675d4b10d33e94e6b6fa83b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 12 Sep 2011 10:16:19 -0400
Subject: [PATCH] Implemented: FS#1385 - Define all Email aliases in dovecot autoresponder

---
 interface/lib/config.inc.php |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 2bcba6c..fc94da8 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -54,6 +54,8 @@
 $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")
+$conf['db_new_link'] = false;
+$conf['db_client_flags'] = 0;
 
 define('DB_TYPE',$conf['db_type']);
 define('DB_HOST',$conf['db_host']);
@@ -69,9 +71,12 @@
 $conf['dbmaster_database']		= '{mysql_master_server_database}';
 $conf['dbmaster_user']			= '{mysql_master_server_ispconfig_user}';
 $conf['dbmaster_password']		= '{mysql_master_server_ispconfig_password}';
+$conf['dbmaster_new_link'] 		= false;
+$conf['dbmaster_client_flags']  = 0;
 
 
 //** 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 +87,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 +119,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 +132,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