diff options
author | Julen Landa Alustiza <julen@zokormazo.info> | 2017-04-01 21:46:09 +0200 |
---|---|---|
committer | Julen Landa Alustiza <julen@zokormazo.info> | 2017-04-01 21:46:09 +0200 |
commit | dfeeec308ac2c683cd3fc3f43f65efe71072af54 (patch) | |
tree | 291b5c1b39a3551f0a1fce67b90b58752d77852f /config/accounts.js | |
parent | 823aea497b45652e1c57916a10094cb5b0fc3ef9 (diff) | |
download | wekan-dfeeec308ac2c683cd3fc3f43f65efe71072af54.tar.gz wekan-dfeeec308ac2c683cd3fc3f43f65efe71072af54.tar.bz2 wekan-dfeeec308ac2c683cd3fc3f43f65efe71072af54.zip |
Fix email settings loading:
MAIL_URL was overriden with database info all the time.
Now if MAIL_URL exists is not overwritten and if neither MAIL_URL nor
exists valid admin panel data MAIL_URL is not set.
MAIL_FROM was ignored. Same behaviour, env variable has bigger priority
than database configuration.
On both cases, althrought environment variable is set, updating admin-panel
mail settings will load new info and ignore the environment variable.
Remove some code that is not needed anymore
Diffstat (limited to 'config/accounts.js')
-rw-r--r-- | config/accounts.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config/accounts.js b/config/accounts.js index 279325fb..e7faa4cd 100644 --- a/config/accounts.js +++ b/config/accounts.js @@ -16,17 +16,12 @@ AccountsTemplates.addFields([{ template: 'invitationCode', }]); -let sendVerificationEmail = false; -if (process.env.MAIL_URL) { - sendVerificationEmail = true; -} - AccountsTemplates.configure({ defaultLayout: 'userFormsLayout', defaultContentRegion: 'content', confirmPassword: false, enablePasswordChange: true, - sendVerificationEmail, + sendVerificationEmail: true, showForgotPasswordLink: true, onLogoutHook() { const homePage = 'home'; |