Skip to content
This repository was archived by the owner on May 6, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions playbooks/roles/edxapp/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1092,14 +1092,17 @@ edxapp_venv_dir: "{{ edxapp_venvs_dir }}/edxapp"
edxapp_venv_bin: "{{ edxapp_venv_dir }}/bin"
edxapp_nodeenv_dir: "{{ edxapp_app_dir }}/nodeenvs/edxapp"
edxapp_nodeenv_bin: "{{ edxapp_nodeenv_dir }}/bin"
edxapp_npm_dir: "{{ edxapp_app_dir }}/.npm"
edxapp_npm_bin: "{{ edxapp_npm_dir }}/bin"
edxapp_settings: '{{ EDXAPP_SETTINGS }}'
EDXAPP_NODE_VERSION: "12"
EDXAPP_NODE_VERSION: "16"
EDXAPP_NPM_VERSION: "8.5.0"
# This is where node installs modules, not node itself
edxapp_node_bin: "{{ edxapp_code_dir }}/node_modules/.bin"
edxapp_user: edxapp
edxapp_user_createhome: 'no'
edxapp_user_shell: '/bin/false'
edxapp_deploy_path: "{{ edxapp_venv_bin }}:{{ edxapp_code_dir }}/bin:{{ edxapp_node_bin }}:{{ edxapp_nodeenv_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
edxapp_deploy_path: "{{ edxapp_venv_bin }}:{{ edxapp_code_dir }}/bin:{{ edxapp_npm_bin }}:{{ edxapp_node_bin }}:{{ edxapp_nodeenv_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
edxapp_staticfile_dir: "{{ edxapp_data_dir }}/staticfiles"
edxapp_media_dir: "{{ edxapp_data_dir }}/media"
edxapp_media_dir_s3: "{{ edxapp_media_dir | regex_replace('^\\/', '') }}"
Expand Down Expand Up @@ -1159,6 +1162,8 @@ edxapp_environment_default:
STUDIO_CFG: "{{ edxapp_studio_cfg }}"
BOTO_CONFIG: "{{ edxapp_app_dir }}/.boto"
REVISION_CFG: "{{ edxapp_revision_cfg }}"
NODE_PATH: "{{ edxapp_npm_dir }}/lib/modules:/usr/lib/node_modules"
MANPATH: "{{ edxapp_npm_dir }}/share/man:$(manpath)"

edxapp_environment_extra: {}

Expand Down
2 changes: 1 addition & 1 deletion playbooks/roles/edxapp/tasks/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
- install:app-requirements

- name: install node dependencies
shell: "easy_install --version && npm ci"
shell: "easy_install --version && npm install"
args:
chdir: "{{ edxapp_code_dir }}"
environment: "{{ edxapp_environment | combine(git_ssh_environment_mixin) }}"
Expand Down
10 changes: 10 additions & 0 deletions playbooks/roles/edxapp/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,16 @@
- install
- install:base

# This will install npm EDXAPP_NPM_VERSION to edxapp_npm_bin rather than updating the global npm version installed via apt.
# As edxapp_npm_bin is already part of edxapp_environment, the npm command will always pick up the one installed in edxapp_npm_bin.
- name: Pin npm to {{ EDXAPP_NPM_VERSION }}
shell: "npm install -g npm@{{ EDXAPP_NPM_VERSION }}"
environment: "{{ edxapp_environment | combine(git_ssh_environment_mixin) }}"
become_user: "{{ edxapp_user }}"
tags:
- install
- install:base

- name: install python3.8
apt:
pkg:
Expand Down
1 change: 1 addition & 0 deletions playbooks/roles/edxapp/templates/.npmrc.j2
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
registry={{ COMMON_NPM_MIRROR_URL }}
prefix={{ edxapp_npm_dir }}