-
Notifications
You must be signed in to change notification settings - Fork 101
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
CUMULUS-3433 - Update to nodeJs v20 #3636
Changes from 27 commits
4591a08
adbad84
c0af32b
dc0a7fd
7ae3588
a19f9d1
e652516
2a82ed4
83d06dd
10490c7
a477fd7
c0d5147
9f288ad
af26ff0
cb56285
5aa92f6
8289b91
92bb668
61ea4e2
11be52e
9271951
dd8bb8f
9300c6c
b903d86
2eb3b8d
2cadc6c
fffe15b
2ff5403
5c19a84
972b71b
b95e1b2
de3c0f3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
16.19.0 | ||
20.12.2 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,20 +9,20 @@ services: | |
- ../packages/test-data/keys/ssh_client_rsa_key.pub:/ssh_client_rsa_key.pub | ||
- ../packages/test-data:/data | ||
build_env: | ||
image: cumuluss/cumulus-build-env:latest | ||
image: cumuluss/cumulus-build-env:test | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is this a leftover from testing? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch - yes, I'll revert it 👍🏻 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
volumes: | ||
- ../:/source/cumulus | ||
- ../packages/test-data:/tmp/cumulus_unit_test_data | ||
ports: | ||
- "20:20" | ||
- "21:21" | ||
- 47400-47470:47400-47470 | ||
- 3030:3030 | ||
- 2222:2222 | ||
- 4550-4599:4550-4599 | ||
- 5432:5432 | ||
- 8080:8080 | ||
- 9200:9200 | ||
- "127.0.0.1:20:20" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a security update to disallow port access from hosts other than localhost. |
||
- "127.0.0.1:21:21" | ||
- 127.0.0.1:47400-47470:47400-47470 | ||
- 127.0.0.1:3030:3030 | ||
- 127.0.0.1:2222:2222 | ||
- 127.0.0.1:4550-4599:4550-4599 | ||
- 127.0.0.1:5432:5432 | ||
- 127.0.0.1:8080:8080 | ||
- 127.0.0.1:9200:9200 | ||
localstack: | ||
image: localstack/localstack:3.0.0 | ||
elasticsearch: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,20 +2,20 @@ | |
# This is the main Apache HTTP server configuration file. It contains the | ||
# configuration directives that give the server its instructions. | ||
# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information. | ||
# In particular, see | ||
# In particular, see | ||
# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html> | ||
# for a discussion of each configuration directive. | ||
# | ||
# Do NOT simply read the instructions in here without understanding | ||
# what they do. They're here only as hints or reminders. If you are unsure | ||
# consult the online docs. You have been warned. | ||
# consult the online docs. You have been warned. | ||
# | ||
# Configuration and logfile names: If the filenames you specify for many | ||
# of the server's control files begin with "/" (or "drive:/" for Win32), the | ||
# server will use that explicit path. If the filenames do *not* begin | ||
# with "/", the value of ServerRoot is prepended -- so "logs/access_log" | ||
# with ServerRoot set to "/usr/local/apache2" will be interpreted by the | ||
# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" | ||
# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" | ||
# will be interpreted as '/logs/access_log'. | ||
|
||
# | ||
|
@@ -45,11 +45,11 @@ ServerRoot "/usr/local/apache2" | |
# ports, instead of the default. See also the <VirtualHost> | ||
# directive. | ||
# | ||
# Change this to Listen on specific IP addresses as shown below to | ||
# Change this to Listen on specific IP addresses as shown below to | ||
# prevent Apache from glomming onto all bound IP addresses. | ||
# | ||
#Listen 12.34.56.78:80 | ||
Listen 3030 | ||
Listen 3030 | ||
|
||
# | ||
# Dynamic Shared Object (DSO) Support | ||
|
@@ -171,7 +171,7 @@ LoadModule version_module modules/mod_version.so | |
LoadModule unixd_module modules/mod_unixd.so | ||
#LoadModule heartbeat_module modules/mod_heartbeat.so | ||
#LoadModule heartmonitor_module modules/mod_heartmonitor.so | ||
#LoadModule dav_module modules/mod_dav.so | ||
LoadModule dav_module modules/mod_dav.so | ||
LoadModule status_module modules/mod_status.so | ||
LoadModule autoindex_module modules/mod_autoindex.so | ||
#LoadModule asis_module modules/mod_asis.so | ||
|
@@ -189,16 +189,16 @@ LoadModule autoindex_module modules/mod_autoindex.so | |
#LoadModule negotiation_module modules/mod_negotiation.so | ||
LoadModule dir_module modules/mod_dir.so | ||
#LoadModule imagemap_module modules/mod_imagemap.so | ||
#LoadModule actions_module modules/mod_actions.so | ||
LoadModule actions_module modules/mod_actions.so | ||
#LoadModule speling_module modules/mod_speling.so | ||
#LoadModule userdir_module modules/mod_userdir.so | ||
LoadModule alias_module modules/mod_alias.so | ||
#LoadModule rewrite_module modules/mod_rewrite.so | ||
LoadModule rewrite_module modules/mod_rewrite.so | ||
|
||
<IfModule unixd_module> | ||
# | ||
# If you wish httpd to run as a different user or group, you must run | ||
# httpd as root initially and it will switch. | ||
# httpd as root initially and it will switch. | ||
# | ||
# User/Group: The name (or #number) of the user/group to run httpd as. | ||
# It is usually good practice to create a dedicated user and group for | ||
|
@@ -239,7 +239,7 @@ ServerAdmin you@example.com | |
|
||
# | ||
# Deny access to the entirety of your server's filesystem. You must | ||
# explicitly permit access to web content directories in other | ||
# explicitly permit access to web content directories in other | ||
# <Directory> blocks below. | ||
# | ||
<Directory /> | ||
|
@@ -261,6 +261,7 @@ ServerAdmin you@example.com | |
# | ||
DocumentRoot "/usr/local/apache2/htdocs" | ||
<Directory "/usr/local/apache2/htdocs"> | ||
|
||
# | ||
# Possible values for the Options directive are "None", "All", | ||
# or any combination of: | ||
|
@@ -297,8 +298,8 @@ DocumentRoot "/usr/local/apache2/htdocs" | |
</IfModule> | ||
|
||
# | ||
# The following lines prevent .htaccess and .htpasswd files from being | ||
# viewed by Web clients. | ||
# The following lines prevent .htaccess and .htpasswd files from being | ||
# viewed by Web clients. | ||
# | ||
<Files ".ht*"> | ||
Require all denied | ||
|
@@ -351,8 +352,8 @@ LogLevel warn | |
|
||
<IfModule alias_module> | ||
# | ||
# Redirect: Allows you to tell clients about documents that used to | ||
# exist in your server's namespace, but do not anymore. The client | ||
# Redirect: Allows you to tell clients about documents that used to | ||
# exist in your server's namespace, but do not anymore. The client | ||
# will make a new request for the document at its new location. | ||
# Example: | ||
# Redirect permanent /foo http://www.example.com/bar | ||
|
@@ -369,7 +370,7 @@ LogLevel warn | |
# the filesystem path. | ||
|
||
# | ||
# ScriptAlias: This controls which directories contain server scripts. | ||
# ScriptAlias: This controls which directories contain server scripts. | ||
# ScriptAliases are essentially the same as Aliases, except that | ||
# documents in the target directory are treated as applications and | ||
# run by the server when requested rather than as documents sent to the | ||
|
@@ -388,6 +389,15 @@ LogLevel warn | |
#Scriptsock cgisock | ||
</IfModule> | ||
|
||
|
||
### Configuration to allow PUT endpoint | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updates Apache server to have a dummy response to HTTP POST |
||
|
||
RewriteEngine On | ||
RewriteCond %{REQUEST_METHOD} ^POST$ | ||
RewriteCond %{REQUEST_URI} ^/post_test.*$ | ||
RewriteRule .* - [R=200,L,E=no-gzip:1] | ||
|
||
|
||
# | ||
# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased | ||
# CGI directory exists, if you have that configured. | ||
|
@@ -481,10 +491,10 @@ LogLevel warn | |
#MaxRanges unlimited | ||
|
||
# | ||
# EnableMMAP and EnableSendfile: On systems that support it, | ||
# EnableMMAP and EnableSendfile: On systems that support it, | ||
# memory-mapping or the sendfile syscall may be used to deliver | ||
# files. This usually improves server performance, but must | ||
# be turned off when serving from networked-mounted | ||
# be turned off when serving from networked-mounted | ||
# filesystems or if support for these functions is otherwise | ||
# broken on your system. | ||
# Defaults: EnableMMAP On, EnableSendfile Off | ||
|
@@ -494,9 +504,9 @@ LogLevel warn | |
|
||
# Supplemental configuration | ||
# | ||
# The configuration files in the conf/extra/ directory can be | ||
# included to add extra features or to modify the default configuration of | ||
# the server, or you may simply copy their contents here and change as | ||
# The configuration files in the conf/extra/ directory can be | ||
# included to add extra features or to modify the default configuration of | ||
# the server, or you may simply copy their contents here and change as | ||
# necessary. | ||
|
||
# Server-pool management (MPM specific) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cool to see unsafe-perm go away here and elsewhere... what was it doing before that's changed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NPM changed how it's invoking things in v7, instead of using the uid specified by the user config (nobody in the case of root) it uses the permissions from the folder, which works just fine for our use case.
Also, notably, they dropped support for this option when those changes were made.