Added: FS#1691 - Add support for mysql flags like MYSQL_CLIENT_SSL in ISPCo...

tbrehm

2011-09-12 c84a6d596f48e03a9b258027cc2d7eea0049d12a

 install/tpl/config.inc.php.master

@@ -1,7 +1,6 @@
<?php

/*
Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
Copyright (c) 2007 - 2010, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
@@ -46,7 +45,7 @@
}

//** Set a few php.ini values
set_magic_quotes_runtime(0);
if(get_magic_quotes_runtime()) set_magic_quotes_runtime(false);
if(isset($app)) unset($app);
if(isset($conf)) unset($conf);

@@ -57,69 +56,87 @@

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.1.6');
define('ISPC_APP_VERSION', '3.0.3.3');
define('DEVSYSTEM', 0);


//** Database
$conf["db_type"] = 'mysql';
$conf["db_host"] = '{mysql_server_host}';
$conf["db_database"] = '{mysql_server_database}';
$conf["db_user"] = '{mysql_server_ispconfig_user}';
$conf["db_password"] = '{mysql_server_ispconfig_password}';
$conf["db_charset"] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")
$conf['db_type'] = 'mysql';
$conf['db_host'] = '{mysql_server_host}';
$conf['db_database'] = '{mysql_server_database}';
$conf['db_user'] = '{mysql_server_ispconfig_user}';
$conf['db_password'] = '{mysql_server_ispconfig_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"]);
define("DB_DATABASE",$conf["db_database"]);
define("DB_USER",$conf["db_user"]);
define("DB_PASSWORD",$conf["db_password"]);
define("DB_CHARSET",$conf["db_charset"]);
define('DB_TYPE',$conf['db_type']);
define('DB_HOST',$conf['db_host']);
define('DB_DATABASE',$conf['db_database']);
define('DB_USER',$conf['db_user']);
define('DB_PASSWORD',$conf['db_password']);
define('DB_CHARSET',$conf['db_charset']);


//** Database settings for the master DB. This setting is only used in multiserver setups
$conf["dbmaster_type"]         = 'mysql';
$conf["dbmaster_host"]         = '{mysql_master_server_host}';
$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_type']         = 'mysql';
$conf['dbmaster_host']         = '{mysql_master_server_host}';
$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
define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../')); // The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
$conf['ispconfig_log_dir'] = '/var/log/ispconfig';
define('ISPC_ROOT_PATH', realpath(dirname(__FILE__).'/../')); // Main ROOT is the parent directory to this file, ie interface/ or server/. NO trailing slashes.
define('ISPC_LIB_PATH', ISPC_ROOT_PATH.'/lib');
define('ISPC_CLASS_PATH', ISPC_ROOT_PATH.'/lib/classes');
define('ISPC_WEB_PATH', ISPC_ROOT_PATH.'/web');
define('ISPC_THEMES_PATH', ISPC_ROOT_PATH.'/web/themes');
define('ISPC_WEB_TEMP_PATH', ISPC_WEB_PATH.'/temp'); // Path for downloads, accessible via browser
define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
define('ISPC_LOG_PATH', $conf['ispconfig_log_dir']);

//** Paths (Do not change!)
$conf["rootpath"] = substr(dirname(__FILE__),0,-4);
$conf["fs_div"] = "/"; // File system 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";
$conf['rootpath'] = substr(dirname(__FILE__),0,-4);
$conf['fs_div'] = '/'; // File system separator, "\\" 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';
$conf['logpath'] = ISPC_LOG_PATH; // Actually just a copy of $conf['ispconfig_log_dir'], might be removed in a later version

define("FS_DIV",$conf["fs_div"]);
define("SERVER_ROOT",$conf["rootpath"]);
define("INCLUDE_ROOT",SERVER_ROOT.FS_DIV."lib");
define("CLASSES_ROOT",INCLUDE_ROOT.FS_DIV."classes");
define('FS_DIV',$conf['fs_div']);
define('SERVER_ROOT',$conf['rootpath']);
define('INCLUDE_ROOT',SERVER_ROOT.FS_DIV.'lib');
define('CLASSES_ROOT',INCLUDE_ROOT.FS_DIV.'classes');


//** Server
$conf['app_title'] = ISPC_APP_TITLE;
$conf['app_version'] = ISPC_APP_VERSION;
$conf['app_link'] = 'http://www.ispconfig.org/';
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
$conf["server_id"] = "{server_id}";
$conf['modules_available'] = 'dashboard,admin,mail,sites,monitor,client,dns,help';
$conf['server_id'] = '{server_id}';
$conf['init_scripts'] = '/etc/init.d';


//** Interface
define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns,tools');
$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools';

//** Demo mode
/* The demo mode is an option to restrict certain actions in the interface like 
*  changing the password of users with sys_userid < 3 etc. to be 
*  able to run the ISPConfig interface as online demo. It does not
*  affect the server part. The demo mode should be always set to false
*  on every normal installation
*/
$conf['demo_mode'] = false;


//** Logging
$conf["log_file"] = '/var/log/ispconfig/ispconfig.log';
$conf["log_priority"] = {ispconfig_log_priority}; // 0 = Debug, 1 = Warning, 2 = Error
$conf['log_file'] = $conf['ispconfig_log_dir'].$conf['fs_div'].'ispconfig.log';
$conf['log_priority'] = {ispconfig_log_priority}; // 0 = Debug, 1 = Warning, 2 = Error


//** Allow software package installations
@@ -127,27 +144,31 @@


//** Themes
$conf["theme"] = 'default';
$conf["html_content_encoding"] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf["logo"] = 'themes/default/images/ispc_logo.png';

$conf['theme'] = 'default';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/ispc_logo.png';

//** Default Language
$conf["language"] = '{language}';
$conf['language'] = '{language}';
$conf['debug_language'] = false;


//** Misc.
$conf["interface_logout_url"] = ""; // example: http://www.domain.tld/
$conf['interface_logout_url'] = ''; // example: http://www.domain.tld/


//** Auto Load Modules
$conf["start_db"] = true;
$conf["start_session"] = true;

$conf['start_db'] = true;
$conf['start_session'] = true;

//** Constants
define("LOGLEVEL_DEBUG",0);
define("LOGLEVEL_WARN",1);
define("LOGLEVEL_ERROR",2);
define('LOGLEVEL_DEBUG',0);
define('LOGLEVEL_WARN',1);
define('LOGLEVEL_ERROR',2);

//** include a local config-file if there is one
//** IMPORTANT!!!
//** DO NOT MAKE A COPY OF THIS FILE AS LOCAL CONFIG-FILE
//** USE A EMPTY FILE AND ONLY COPY THE SETTINGS IN IT, YOU NEED TO OVERRIDE
if (is_file(dirname(__FILE__) . '/config.inc.local.php')) include_once 'config.inc.local.php';
?>