Merge pull request #1705 from ojs/enhancement/mail-config

mail config should be more flexible
academic · Dec 14, 2016 · 5b77507 · 5b77507
2 parents edd79a1 + 602da83
commit 5b77507
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -14,6 +14,8 @@ parameters:
     mailer_name:       OJS
     mailer_password:   ~
     mailer_port: 587
+    mailer_encryption: tls
+    mailer_authmode: login
 
     locale:            tr
     locale_support: [tr,en]

diff --git a/app/config/swift.yml b/app/config/swift.yml
@@ -4,8 +4,8 @@ swiftmailer:
     password:             "%mailer_password%"
     host:                 "%mailer_host%"
     port:                 "%mailer_port%"
-    #encryption: ssl #ssl or tsl
-    #auth_mode:  login #(plain, login, or cram-md5)
+    encryption:           "%mailer_encryption%" #ssl or tsl
+    auth_mode:            "%mailer_authmode%" #(plain, login, or cram-md5)
     spool:
         type: "file"
         #type: (file or mail / how to queue the messages)