diff options
| author |  OMKAR AGRAWAL <Omkaragrawal@users.noreply.github.com> | 2020-10-09 06:34:34 +0530 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-10-09 06:34:34 +0530 |
| commit | eb7b2bf2bc249b4848db7eec113967ccb82803b2 (patch) | |
| tree | 782e491dd4caea68ac0b6462b1ccb293ba12c558 | |
| parent | Changes made as requested (diff) | |
| parent | Merge pull request #37 from getferdi/dependabot/npm_and_yarn/node-fetch-2.6.1 (diff) | |
| download | ferdium-server-eb7b2bf2bc249b4848db7eec113967ccb82803b2.tar.gz ferdium-server-eb7b2bf2bc249b4848db7eec113967ccb82803b2.tar.zst ferdium-server-eb7b2bf2bc249b4848db7eec113967ccb82803b2.zip | |
Merge branch 'master' into SSL-pg-mail
| -rw-r--r-- | .env.example | 3 | ||||
| -rw-r--r-- | config/mail.js | 4 | ||||
| -rw-r--r-- | package-lock.json | 12 | ||||
| -rw-r--r-- | package.json | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/.env.example b/.env.example index b25a2f3..8129f06 100644 --- a/.env.example +++ b/.env.example | |||
| @@ -4,6 +4,7 @@ NODE_ENV=development | |||
| 4 | 4 | ||
| 5 | APP_NAME=AdonisJs | 5 | APP_NAME=AdonisJs |
| 6 | APP_URL=http://${HOST}:${PORT} | 6 | APP_URL=http://${HOST}:${PORT} |
| 7 | EXTERNAL_DOMAIN=ferdi.domain.tld | ||
| 7 | 8 | ||
| 8 | CACHE_VIEWS=false | 9 | CACHE_VIEWS=false |
| 9 | 10 | ||
| @@ -31,4 +32,4 @@ SMTP_HOST=127.0.0.1 | |||
| 31 | MAIL_USERNAME=username | 32 | MAIL_USERNAME=username |
| 32 | MAIL_PASSWORD=password | 33 | MAIL_PASSWORD=password |
| 33 | MAIL_SENDER=noreply@getferdi.com | 34 | MAIL_SENDER=noreply@getferdi.com |
| 34 | MAIL_SSL=true \ No newline at end of file | 35 | MAIL_SSL=true |
diff --git a/config/mail.js b/config/mail.js index 50a7848..88edd05 100644 --- a/config/mail.js +++ b/config/mail.js | |||
| @@ -21,13 +21,17 @@ module.exports = { | |||
| 21 | | | 21 | | |
| 22 | | Here we define configuration for sending emails via SMTP. | 22 | | Here we define configuration for sending emails via SMTP. |
| 23 | | | 23 | | |
| 24 | | https://nodemailer.com/smtp/ | ||
| 25 | | | ||
| 24 | */ | 26 | */ |
| 25 | smtp: { | 27 | smtp: { |
| 26 | driver: 'smtp', | 28 | driver: 'smtp', |
| 27 | pool: true, | 29 | pool: true, |
| 30 | name: Env.get('EXTERNAL_DOMAIN'), | ||
| 28 | port: Env.get('SMTP_PORT', 2525), | 31 | port: Env.get('SMTP_PORT', 2525), |
| 29 | host: Env.get('SMTP_HOST'), | 32 | host: Env.get('SMTP_HOST'), |
| 30 | secure: JSON.parse(Env.get("MAIL_SSL", "true")), | 33 | secure: JSON.parse(Env.get("MAIL_SSL", "true")), |
| 34 | authMethod: 'LOGIN', | ||
| 31 | auth: { | 35 | auth: { |
| 32 | user: Env.get('MAIL_USERNAME'), | 36 | user: Env.get('MAIL_USERNAME'), |
| 33 | pass: Env.get('MAIL_PASSWORD') | 37 | pass: Env.get('MAIL_PASSWORD') |
diff --git a/package-lock.json b/package-lock.json index 110409b..cd0944a 100644 --- a/package-lock.json +++ b/package-lock.json | |||
| @@ -3842,9 +3842,9 @@ | |||
| 3842 | } | 3842 | } |
| 3843 | }, | 3843 | }, |
| 3844 | "lodash": { | 3844 | "lodash": { |
| 3845 | "version": "4.17.15", | 3845 | "version": "4.17.19", |
| 3846 | "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", | 3846 | "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", |
| 3847 | "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" | 3847 | "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" |
| 3848 | }, | 3848 | }, |
| 3849 | "lodash.includes": { | 3849 | "lodash.includes": { |
| 3850 | "version": "4.3.0", | 3850 | "version": "4.3.0", |
| @@ -4325,9 +4325,9 @@ | |||
| 4325 | "integrity": "sha512-pFhMAqdN1avrFwtZs66HxYiVnbnH9wjXB4m8IKs5Z9+r7U5voqxT+EDbVkRfge+V7JnkOgKhN4HfKBn1o5g9Wg==" | 4325 | "integrity": "sha512-pFhMAqdN1avrFwtZs66HxYiVnbnH9wjXB4m8IKs5Z9+r7U5voqxT+EDbVkRfge+V7JnkOgKhN4HfKBn1o5g9Wg==" |
| 4326 | }, | 4326 | }, |
| 4327 | "node-fetch": { | 4327 | "node-fetch": { |
| 4328 | "version": "2.6.0", | 4328 | "version": "2.6.1", |
| 4329 | "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", | 4329 | "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", |
| 4330 | "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" | 4330 | "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" |
| 4331 | }, | 4331 | }, |
| 4332 | "node-guard": { | 4332 | "node-guard": { |
| 4333 | "version": "1.0.0", | 4333 | "version": "1.0.0", |
diff --git a/package.json b/package.json index 43e0ac0..5b25aac 100644 --- a/package.json +++ b/package.json | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | "atob": "^2.1.2", | 35 | "atob": "^2.1.2", |
| 36 | "btoa": "^1.2.1", | 36 | "btoa": "^1.2.1", |
| 37 | "fs-extra": "^8.1.0", | 37 | "fs-extra": "^8.1.0", |
| 38 | "node-fetch": "^2.6.0", | 38 | "node-fetch": "^2.6.1", |
| 39 | "pg": "^7.18.2", | 39 | "pg": "^7.18.2", |
| 40 | "sqlite3": "^4.1.0", | 40 | "sqlite3": "^4.1.0", |
| 41 | "targz": "^1.0.1", | 41 | "targz": "^1.0.1", |