Skip to content

Commit

Permalink
Updated config
Browse files Browse the repository at this point in the history
  • Loading branch information
msurguy committed Mar 16, 2015
1 parent ebfaf90 commit e7aed46
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 78 deletions.
38 changes: 0 additions & 38 deletions Boxfile

This file was deleted.

3 changes: 1 addition & 2 deletions app/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
|
*/

'debug' => true,
'debug' => false,

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -79,7 +79,6 @@
*/

'providers' => array(
'Fideloper\Proxy\ProxyServiceProvider',
'Illuminate\Foundation\Providers\ArtisanServiceProvider',
'Illuminate\Auth\AuthServiceProvider',
'Illuminate\Cache\CacheServiceProvider',
Expand Down
27 changes: 14 additions & 13 deletions app/config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@

'mysql' => array(
'driver' => 'mysql',
'host' => isset($_SERVER['DB1_HOST']) ? $_SERVER['DB1_HOST'] : 'localhost',
'database' => isset($_SERVER['DB1_NAME']) ? $_SERVER['DB1_NAME'] : 'shop-rating',
'username' => isset($_SERVER['DB1_USER']) ? $_SERVER['DB1_USER'] : 'root',
'password' => isset($_SERVER['DB1_PASS']) ? $_SERVER['DB1_PASS'] : 'root',
'host' => getenv('db_host'),
'database' => getenv('db_name'),
'username' => getenv('db_username'),
'password' => getenv('db_password'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
Expand Down Expand Up @@ -92,7 +92,7 @@
|
| This table keeps track of all the migrations that have already run for
| your application. Using this information, we can determine which of
| the migrations on disk have not actually be run in the databases.
| the migrations on disk haven't actually been run in the database.
|
*/

Expand All @@ -109,16 +109,17 @@
|
*/

'redis' => array(

'redis' => array(

'cluster' => true,
'cluster' => false,

'default' => array(
'host' => 'tunnel.pagodabox.com',
'port' => 6379,
'database' => 0,
),
'default' => array(
'host' => '127.0.0.1',
'port' => 6379,
'database' => 0,
),

),
),

);
20 changes: 20 additions & 0 deletions app/config/local/database.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

return array(

'connections' => array(

'mysql' => array(
'driver' => 'mysql',
'host' => 'localhost',
'database' => 'shop-reviews',
'username' => 'root',
'password' => 'root',
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
),

),

);
23 changes: 0 additions & 23 deletions app/config/proxy.php

This file was deleted.

3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
"laravel/framework": "4.0.*",
"fideloper/proxy": "dev-master"
"laravel/framework": "4.0.*"
},
"autoload": {
"classmap": [
Expand Down

0 comments on commit e7aed46

Please sign in to comment.