Use --result-file=existing_db.sql instead of piping the output to a file i...

tbrehm

2010-02-25 b3b8495f4b09a8d6aed3db6ce221d2ff35a290a7

 interface/lib/config.inc.php

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

/*
Copyright (c) 2008, Till Brehm, Falko Timme, projektfarm Gmbh
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
@@ -32,65 +33,80 @@

   Header("Pragma: no-cache");
   Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
   Header("Content-Type: text/html");
   Header("Content-Type: text/html; charset=utf-8");

   ini_set('register_globals',0);
}

//** SVN Revision
$svn_revision = '$Revision: 1525 $';
$revision = str_replace(array('Revision:','$',' '), '', $svn_revision);

//** Key paramaters
$conf['app_title']         = 'ISPConfig';
$conf['app_version']      = '3.0.0';
$conf['modules_available']   = 'admin,mail,sites,monitor,client,dns';
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.2');

define('ISPC_APP_TITLE',   'ISPConfig');
define('ISPC_APP_VERSION',   '3.0.0');

//** Database
$conf["db_type"] = 'mysql';
$conf["db_host"] = 'localhost';
$conf["db_database"] = 'ispconfig3';
$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")

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}';


//** Paths
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');
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');

//** 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";

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.howtoforge.com/forums/showthread.php?t=26988';
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
$conf["server_id"] = "1";


//** Interface
define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns,tools');


//** The main ROOT is the parent directory to this file, ie Interface/. NO trailing slashes.
define('ISPC_ROOT_PATH',   realpath(dirname(__FILE__).'/../'));
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');


//**Server variables
$conf["server_id"] = "{server_id}";


//** Database Settings
$conf["db_type"]         = 'mysql';
$conf["db_host"]         = 'localhost';
$conf["db_database"]      = 'dbispconfig';
$conf["db_user"]         = 'ispconfig';
$conf["db_password"]      = 'e8605b27a4360d135f62129627d8d9ad';

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"]);


//** Path Settings (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";

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


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


//** Allow software package installations
@@ -98,25 +114,28 @@


//** Themes
$conf["theme"]               = 'default';
$conf["html_content_encoding"]   = 'text/html; charset=iso-8859-1';
$conf["logo"]                = 'themes/default/images/mydnsconfig_logo.gif';
$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"]            = 'en';
$conf["language"] = 'en';
$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);

?>