Skip to content

Commit

Permalink
ansible: Move npm CA file back to env variable
Browse files Browse the repository at this point in the history
Commit dbd7643 caused a regression: The `cafile` npmrc option
*only* uses the give CA, while `$NODE_EXTRA_CA_CERTS` uses the given CA
*in addition*. That broke fetching npm modules directly from github.com,
which needs the system default CA lists.
  • Loading branch information
martinpitt committed Apr 1, 2024
1 parent fa620ea commit cfcaf51
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ansible/roles/tasks-systemd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
fetch-timeout=600000
fetch-retry-mintimeout=60000
maxsockets=3
cafile=/run/secrets/tasks/npm-registry.crt
- name: Create podman.socket drop-in directory
file:
Expand Down Expand Up @@ -114,6 +113,7 @@
# various configuration
'--volume=/etc/npmrc:/etc/npmrc:ro',
'--env=NODE_EXTRA_CA_CERTS=/run/secrets/tasks/npm-registry.crt',
'--env=TEST_JOBS={{ TEST_JOBS | default(8) }}',
# copy git settings from main tasks container
'--env=GIT_COMMITTER_*',
Expand Down

0 comments on commit cfcaf51

Please sign in to comment.