Bring .env and config/mail.php back into sync and match defaults

barryo · barryo · commit ed8ee84063da · 2021-11-28T09:26:25.000Z
diff --git a/.env.example b/.env.example
@@ -34,6 +34,22 @@ DB_DATABASE="ixp"
 DB_USERNAME="ixp"
 DB_PASSWORD="password"
 
+
+#######################################################################################
+### Email Settings.
+#
+# We use Laravel's mail system - see: https://docs.ixpmanager.org/usage/email/
+#
+# The default setting are as follows:
+#
+# MAIL_MAILER="smtp"
+# MAIL_HOST="localhost"
+# MAIL_PORT=25
+# MAIL_ENCRYPTION=false
+
+
+
+
 #######################################################################################
 ### Identity
 #
@@ -129,21 +145,6 @@ IXP_FE_FRONTEND_DISABLED_LOGO=false
 # IXP_FE_FRONTEND_DISABLED_PEERING_MATRIX=true
 
 
-#######################################################################################
-### Email Settings.
-#
-# We use Laravel's mail system which in turn uses SwiftMailer.
-#
-# See config/mail.php abd https://laravel.com/docs/5.5/mail
-#
-# The default setting is 'sendmail' which tries to use your local systems mail client.
-#
-# MAIL_MAILER="sendmail"
-# MAIL_HOST="localhost"
-# MAIL_PORT=25
-# MAIL_ENCRYPTION="tls"
-
-
 #######################################################################################
 ### Graphing - see https://docs.ixpmanager.org/grapher/introduction
 
diff --git a/config/mail.php b/config/mail.php
@@ -59,7 +59,7 @@
             'transport' => 'smtp',
             'host' => env('MAIL_HOST', 'localhost'),
             'port' => env('MAIL_PORT', 25),
-            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+            'encryption' => env('MAIL_ENCRYPTION', false),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'timeout' => null,
