diff --git a/roles/internetarchive/tasks/install.yml b/roles/internetarchive/tasks/install.yml index 2dd6863d8..689851636 100644 --- a/roles/internetarchive/tasks/install.yml +++ b/roles/internetarchive/tasks/install.yml @@ -9,10 +9,11 @@ include_role: name: nodejs -- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x, 12.x or 14.x - fail: - msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.x or 12.x or 14.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml" - when: (nodejs_version != "10.x") and (nodejs_version != "12.x") and (nodejs_version != "14.x") +- name: Assert that 10.x <= nodejs_version ({{ nodejs_version }}) <= 16.x + assert: + that: nodejs_version is version('10.x', '>=') and nodejs_version is version('16.x', '<=') + fail_msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.x - 16.x, and your nodejs_version is set to {{ nodejs_version }}. Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml" + quiet: yes - name: "Set 'yarn_install: True' and 'yarn_enabled: True'" set_fact: diff --git a/roles/nodejs/defaults/main.yml b/roles/nodejs/defaults/main.yml index 6e710710d..312bf20fe 100644 --- a/roles/nodejs/defaults/main.yml +++ b/roles/nodejs/defaults/main.yml @@ -9,7 +9,7 @@ # Node.js version used by roles/nodejs/tasks/main.yml for 3 roles: # nodered (Node-RED), pbx (Asterix, FreePBX) & sugarizer (Sugarizer) -# nodejs_version: 14.x # was 8.x til 2019-02-02, 10.x til 2019-12-21, 12.x til 2020-10-29 +# nodejs_version: 16.x # was 8.x til 2019-02-02, 10.x til 2019-12-21, 12.x til 2020-10-29, 14.x til 2021-06-17 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml index f736525cb..e13c68934 100644 --- a/roles/nodejs/tasks/main.yml +++ b/roles/nodejs/tasks/main.yml @@ -1,4 +1,4 @@ -# SEE VAR nodejs_version: 14.x IN /opt/iiab/iiab/vars/default_vars.yml (FOR +# SEE VAR nodejs_version: 16.x IN /opt/iiab/iiab/vars/default_vars.yml (FOR # NOW!) AND IF NEC OVERRIDE THIS IN /etc/iiab/local_vars.yml # Duplicate Node.js code unified by @jvonau. Revised by @holta. Used by: diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 949b997fb..5b535277e 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -409,7 +409,7 @@ nodejs_install: False nodejs_enabled: False # Node.js version used by roles/nodejs/tasks/main.yml for 3 roles: # nodered (Node-RED), pbx (Asterix, FreePBX) & sugarizer (Sugarizer) -nodejs_version: 14.x # was 8.x til 2019-02-02, 10.x til 2019-12-21, 12.x til 2020-10-29 +nodejs_version: 16.x # was 8.x til 2019-02-02, 10.x til 2019-12-21, 12.x til 2020-10-29, 14.x til 2021-06-17 # Flow-based visual programming for wiring together IoT hardware devices etc nodered_install: False