Do not use environment variables

pull/9/head
Franz Liedke 2015-07-01 21:10:14 +02:00
parent ba8ea7e97c
commit 6f8cf7e24d
1 changed files with 8 additions and 13 deletions

View File

@ -8,12 +8,10 @@ $app = new Illuminate\Foundation\Application(
); );
$app->instance('path.public', __DIR__.'/..'); $app->instance('path.public', __DIR__.'/..');
// DetectEnvironment // TODO: Remove
Dotenv::load($app->basePath(), $app->environmentFile());
$app->detectEnvironment(function() $app->detectEnvironment(function()
{ {
return env('APP_ENV', 'production'); return 'production';
}); });
// LoadConfiguration // LoadConfiguration
@ -29,13 +27,13 @@ $app->instance('config', new \Illuminate\Config\Repository([
'compiled' => realpath(storage_path().'/framework/views'), 'compiled' => realpath(storage_path().'/framework/views'),
], ],
'mail' => [ 'mail' => [
'driver' => env('MAIL_DRIVER', 'smtp'), 'driver' => 'smtp',
'host' => env('MAIL_HOST', 'smtp.mailgun.org'), 'host' => 'smtp.mailgun.org',
'port' => env('MAIL_PORT', 587), 'port' => 587,
'from' => ['address' => 'noreply@localhost', 'name' => 'Flarum Demo Forum'], 'from' => ['address' => 'noreply@localhost', 'name' => 'Flarum Demo Forum'],
'encryption' => 'tls', 'encryption' => 'tls',
'username' => env('MAIL_USERNAME'), 'username' => null,
'password' => env('MAIL_PASSWORD'), 'password' => null,
'sendmail' => '/usr/sbin/sendmail -bs', 'sendmail' => '/usr/sbin/sendmail -bs',
'pretend' => false, 'pretend' => false,
], ],
@ -46,12 +44,9 @@ $app->instance('config', new \Illuminate\Config\Repository([
'driver' => 'sync', 'driver' => 'sync',
], ],
], ],
'failed' => [
'database' => 'mysql', 'table' => 'failed_jobs',
],
], ],
'session' => [ 'session' => [
'driver' => env('SESSION_DRIVER', 'file'), 'driver' => 'file',
'lifetime' => 120, 'lifetime' => 120,
'expire_on_close' => false, 'expire_on_close' => false,
'encrypt' => false, 'encrypt' => false,