diff --git a/.dockerignore b/.dockerignore index 21bbccd4cfd9cafb1f89b7d06d8a72cc22b4d1b7..6e094f43da8346f17b328cf0fa502ea23a573d7f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ packages/*/node_modules packages/**/*.env packages/**/.env packages/**/config/local*.* +packages/xpub-faraday/now diff --git a/packages/xpub-faraday/.gitignore b/packages/xpub-faraday/.gitignore index 451370b4294d3ed649754d600992fc73291385d3..1de1bbd859923d9c460f843d5327fa43753f681f 100644 --- a/packages/xpub-faraday/.gitignore +++ b/packages/xpub-faraday/.gitignore @@ -6,3 +6,4 @@ uploads/ .env.* .env config/local*.* +now/ diff --git a/packages/xpub-faraday/Dockerfile b/packages/xpub-faraday/Dockerfile deleted file mode 100644 index d2f06537103fbb7d1ad09b9c2fc7cfe947ba77fd..0000000000000000000000000000000000000000 --- a/packages/xpub-faraday/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM bogdandev/xpub-faraday:21.02 \ No newline at end of file diff --git a/packages/xpub-faraday/config/default.js b/packages/xpub-faraday/config/default.js index fd1592d877fbab18168c974cf4fe37cba7fd327c..1feaba3a707492ad71eb9e9d9f0690e28dea87a6 100644 --- a/packages/xpub-faraday/config/default.js +++ b/packages/xpub-faraday/config/default.js @@ -5,6 +5,14 @@ const components = require('./components.json') const logger = require('winston') const environment = process.env.NODE_ENV || 'development' +const getInviteUrl = () => { + if (process.env.PUBSWEET_INVITE_PASSWORD_RESET_URL) { + return process.env.PUBSWEET_INVITE_PASSWORD_RESET_URL + } else if (process.env.NOW_URL) { + return `${process.env.NOW_URL}/invite` + } + return 'http://localhost:3000/invite' +} module.exports = { authsome: { @@ -26,7 +34,7 @@ module.exports = { 'pubsweet-client': { API_ENDPOINT: '/api', 'login-redirect': '/', - 'redux-log': true, + 'redux-log': false, theme: process.env.PUBSWEET_THEME, }, 'mail-transport': { @@ -62,9 +70,7 @@ module.exports = { // sender: process.env.EMAIL_SENDER, // }, 'invite-reset-password': { - url: - process.env.PUBSWEET_INVITE_PASSWORD_RESET_URL || - 'http://localhost:3000/invite', + url: getInviteUrl(), }, roles: { global: ['admin', 'editorInChief', 'author'],