1
0

Added dev/prod config

This commit is contained in:
2014-05-13 13:16:39 +02:00
parent 99d29b432b
commit 5e21ecb401
6 changed files with 487 additions and 47 deletions

View File

@@ -5,7 +5,11 @@
// This is the main Web application configuration. Any writable
// CWebApplication properties can be configured here.
return array(
require_once('protected/lib/ArrayX.php');
use Yiinitializr\Helpers\ArrayX;
return ArrayX::merge(array(
'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
'name'=>'My Web Application',
@@ -19,15 +23,7 @@ return array(
),
'modules'=>array(
// uncomment the following to enable the Gii tool
'gii'=>array(
'class'=>'system.gii.GiiModule',
'password'=>'Enter Your Password Here',
// If removed, Gii defaults to localhost only. Edit carefully to taste.
'ipFilters'=>array('127.0.0.1','::1'),
),
),
// application components
@@ -47,23 +43,7 @@ return array(
),
),
*/
'db'=>array(
'connectionString' => 'sqlite:'.dirname(__FILE__).'/../data/testdrive.db',
),
// uncomment the following to use a MySQL database
/*
'db'=>array(
'connectionString' => 'mysql:host=localhost;dbname=testdrive',
'emulatePrepare' => true,
'username' => 'root',
'password' => '',
'charset' => 'utf8',
),
*/
'errorHandler'=>array(
// use 'site/error' action to display errors
'errorAction'=>'site/error',
),
'log'=>array(
'class'=>'CLogRouter',
'routes'=>array(
@@ -87,4 +67,4 @@ return array(
// this is used in contact page
'adminEmail'=>'webmaster@example.com',
),
);
), require_once('env/' . YII_CUSTOM_ENV . '.php'));