]> cat aescling's git repositories - mastodon.git/commitdiff
Merge pull request #1125 from jasonrhodes/patch-1
authorEugen <eugen@zeonfederated.com>
Fri, 7 Apr 2017 22:24:38 +0000 (00:24 +0200)
committerGitHub <noreply@github.com>
Fri, 7 Apr 2017 22:24:38 +0000 (00:24 +0200)
Email service options :P

1  2 
.env.production.sample

index 44ca984b8336f1f95c7824487298bdc726c4f4d7,6d28a4a1191c20c440f6cdf5821a021ff29570ef..d7c04e23548082b7e7778c7459695772a899931e
@@@ -25,10 -25,8 +25,11 @@@ OTP_SECRET
  # Only allow registrations with the following e-mail domains
  # EMAIL_DOMAIN_WHITELIST=example1.com|example2.de|etc
  
 +# Optionally change default language
 +# DEFAULT_LOCALE=de
 +
  # E-mail configuration
+ # Note: Mailgun and SparkPost (https://sparkpo.st/smtp) each have good free tiers
  SMTP_SERVER=smtp.mailgun.org
  SMTP_PORT=587
  SMTP_LOGIN=