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.

Sign up for GitHub

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

Add CORS_ENABLED env var for docker-compose #620

Merged
merged 8 commits into from
Oct 10, 2023
Merged

Add CORS_ENABLED env var for docker-compose #620

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
374d304
Add CORS_ENABLED env var for docker-compose
pasquy73 Sep 14, 2023
aa53dff
Update sthConfiguration.js
pasquy73 Sep 20, 2023
676ba07
Update CHANGES_NEXT_RELEASE and running.md files
pasquy73 Oct 3, 2023
70b3eec
Merge branch 'master' of https://github.com/pasquy73/fiware-sth-comet
pasquy73 Oct 3, 2023
81c3cb0
Update CHANGES_NEXT_RELEASE
pasquy73 Oct 3, 2023
01a6e66
Update CHANGES_NEXT_RELEASE
pasquy73 Oct 10, 2023
2afb91b
Update CHANGES_NEXT_RELEASE
pasquy73 Oct 10, 2023
16fc77a
Update CHANGES_NEXT_RELEASE
pasquy73 Oct 10, 2023
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
2 changes: 1 addition & 1 deletion CHANGES_NEXT_RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- Set Nodejs 14 as minimum version in packages.json (effectively removing Nodev12 from supported versions)
- Add: CORS_ENABLED env var (boolean) to enable the cors configuration (of config.js file) in your docker image (#608)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Add: CORS_ENABLED env var (boolean) to enable the cors configuration (of config.js file) in your docker image (#608)
- Add: CORS_ENABLED env var (boolean) to enable the cors configuration (of config.js file) in your docker image (#608)
- Set Nodejs 14 as minimum version in packages.json (effectively removing Nodev12 from supported versions)

This seems to be a wrongly solved merge conflict. You shouldn't delete existing lines in CHANGES_NEXT_RELEASE file, just add yours.

1 change: 1 addition & 0 deletions doc/manuals/running.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ The environment variables accepted by the script (for which there exists counter
- `PROOF_OF_LIFE_INTERVAL`: The time in seconds between proof of life logging messages informing that the server is up
and running normally. Default value: "60". `PROCESSED_REQUEST_LOG_STATISTICS_INTERVAL`: The time in seconds between
processed requests statistics appear in the logs. Default value: "60".
- `CORS_ENABLED`: Boolean attribute (`true`|`false`) to enable cors configuration. Optional. Default value: "false".

For example, to start the STH server listening on port 7777, connecting to a MongoDB instance listening on
mymongo.com:27777 and without filtering out the empty results, use:
Expand Down
5 changes: 4 additions & 1 deletion lib/configuration/sthConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,10 @@ if (ENV.STH_PORT && !isNaN(ENV.STH_PORT)) {
);
}

if (config && config.cors && config.cors.enabled) {
if (ENV.CORS_ENABLED && !(ENV.CORS_ENABLED == null)) {
module.exports.corsEnabled = JSON.parse(ENV.CORS_ENABLED);
sthLogger.info(module.exports.LOGGING_CONTEXT.STARTUP, 'CORS value set to: ' + module.exports.corsEnabled);
} else if (config && config.cors && config.cors.enabled) {
module.exports.corsEnabled = JSON.parse(config.cors.enabled);
sthLogger.info(module.exports.LOGGING_CONTEXT.STARTUP, 'CORS value set to: ' + module.exports.corsEnabled);
} else {
Expand Down