Merge pull request laravel#3269 from martinbean/set-mail-defaults

taylorotwell · taylorotwell · commit cc09679c81fc · 2015-02-22T19:46:43.000-06:00
[5.0] Set mail config values in .env file.
diff --git a/.env.example b/.env.example
@@ -8,4 +8,5 @@ DB_USERNAME=homestead
 DB_PASSWORD=secret
 
 CACHE_DRIVER=file
+MAIL_DRIVER=smtp
 SESSION_DRIVER=file
diff --git a/config/mail.php b/config/mail.php
@@ -15,7 +15,7 @@
 	|
 	*/
 
-	'driver' => 'smtp',
+	'driver' => env('MAIL_DRIVER', 'smtp'),
 
 	/*
 	|--------------------------------------------------------------------------
@@ -28,7 +28,7 @@
 	|
 	*/
 
-	'host' => 'smtp.mailgun.org',
+	'host' => env('SMTP_HOST', 'smtp.mailgun.org'),
 
 	/*
 	|--------------------------------------------------------------------------
@@ -41,7 +41,7 @@
 	|
 	*/
 
-	'port' => 587,
+	'port' => env('SMTP_PORT', 587),
 
 	/*
 	|--------------------------------------------------------------------------
@@ -80,7 +80,7 @@
 	|
 	*/
 
-	'username' => null,
+	'username' => env('SMTP_USERNAME'),
 
 	/*
 	|--------------------------------------------------------------------------
@@ -93,7 +93,7 @@
 	|
 	*/
 
-	'password' => null,
+	'password' => env('SMTP_PASSWORD'),
 
 	/*
 	|--------------------------------------------------------------------------
