Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BACK-43] jellyfish updates based on reuse of legacy _id for migration #203

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions env.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,34 +48,47 @@ module.exports = (function () {
maybeReplaceWithContentsOfFile(env.httpsConfig, 'pfx');
}
if (env.httpsPort != null && env.httpsConfig == null) {
throw new Error('No https config provided, please set HTTPS_CONFIG with at least the certificate to use.');
throw new Error(
'No https config provided, please set HTTPS_CONFIG with at least the certificate to use.'
);
}

if (env.httpPort == null && env.httpsPort == null) {
throw new Error('Must specify either PORT or HTTPS_PORT in your environment.');
throw new Error(
'Must specify either PORT or HTTPS_PORT in your environment.'
);
}

env.userApi = {
service: config.fromEnvironment('TIDEPOOL_AUTH_CLIENT_ADDRESS', 'shoreline:9107'),
service: config.fromEnvironment(
'TIDEPOOL_AUTH_CLIENT_ADDRESS',
'shoreline:9107'
),

// Name of this server to pass to user-api when getting a server token
serverName: config.fromEnvironment("SERVER_NAME", "jellyfish:default"),
serverName: config.fromEnvironment('SERVER_NAME', 'jellyfish:default'),

// The secret to use when getting a server token from user-api
serverSecret: config.fromEnvironment("TIDEPOOL_SERVER_SECRET")
serverSecret: config.fromEnvironment('TIDEPOOL_SERVER_SECRET'),
};

env.gatekeeper = {
service: config.fromEnvironment('TIDEPOOL_PERMISSION_CLIENT_ADDRESS', 'gatekeeper:9123')
service: config.fromEnvironment(
'TIDEPOOL_PERMISSION_CLIENT_ADDRESS',
'gatekeeper:9123'
),
};

env.seagull = {
service: config.fromEnvironment('TIDEPOOL_SEAGULL_CLIENT_ADDRESS', 'seagull:9120')
service: config.fromEnvironment(
'TIDEPOOL_SEAGULL_CLIENT_ADDRESS',
'seagull:9120'
),
};

env.mongo = {
connectionString: cs('data')
connectionString: cs('data'),
};

return env;
})();
Loading