diff --git a/roles/internetarchive/tasks/main.yml b/roles/internetarchive/tasks/main.yml index da085a86e..89071164e 100644 --- a/roles/internetarchive/tasks/main.yml +++ b/roles/internetarchive/tasks/main.yml @@ -1,15 +1,14 @@ # We need a recent version of node -- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x +- name: FAIL (STOP INSTALLING) IF nodejs_version is not set to 10.x or 12.x fail: - msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.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: internetarchive_install and (nodejs_version != "10.x") + msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.x or 12.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: internetarchive_install and (nodejs_version != "10.x") and (nodejs_version != "12.x") - name: Install packages needed by Distributed Web package: name: - libsecret-1-dev - - cmake state: present - name: Create directory {{ internetarchive_dir }} @@ -19,9 +18,7 @@ owner: "root" - name: Run yarn install to get needed modules (CAN TAKE ~15 MINUTES) - command: yarn add @internetarchive/dweb-archive @internetarchive/dweb-mirror - #command: sudo yarn add @internetarchive/dweb-archive @internetarchive/dweb-mirror - #become: yes # Escalate to root, similar to 'sudo' + shell: yarn config set child-concurrency 1 && yarn add @internetarchive/dweb-mirror args: chdir: "{{ internetarchive_dir }}" creates: "{{ internetarchive_dir }}/node_modules/@internetarchive/dweb-mirror/internetarchive" @@ -75,9 +72,7 @@ state: stopped - name: 'Update pre-existing install: yarn upgrade' - command: yarn upgrade - #command: sudo yarn upgrade - #become: yes # Escalate to root, similar to 'sudo' + shell: yarn config set child-concurrency 1 && yarn install && yarn upgrade args: chdir: "{{ internetarchive_dir }}" when: not internetarchive_installing.changed and internetarchive_upgrade @@ -113,7 +108,7 @@ value: "{{ item.value }}" with_items: - option: name - value: Internet Archive Distributed Web + value: Internet Archive Offline - option: description value: '"Dweb-mirror is intended to make the Internet Archive experience and UI available offline."' - option: internetarchive_enabled diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 1bbfd729e..985e72293 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -247,7 +247,8 @@ mysql_root_password: fixmysql squid_install: False squid_enabled: False -# DansGuardian REQUIRES Squid (above) be installed & enabled +# DansGuardian REQUIRES Squid (above) be installed & enabled. +# DansGuardian is NO LONGER AVAILABLE in Debian Buster i.e. since June 2019. dansguardian_install: False dansguardian_enabled: False diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 11146640d..a6cb5c11f 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -153,7 +153,8 @@ apache_allow_sudo: True squid_install: False squid_enabled: False -# DansGuardian REQUIRES Squid (above) be installed & enabled +# DansGuardian REQUIRES Squid (above) be installed & enabled. +# DansGuardian is NO LONGER AVAILABLE in Debian Buster i.e. since June 2019. dansguardian_install: False dansguardian_enabled: False diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 396344583..0c51e2cf0 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -153,7 +153,8 @@ apache_allow_sudo: True squid_install: False squid_enabled: False -# DansGuardian REQUIRES Squid (above) be installed & enabled +# DansGuardian REQUIRES Squid (above) be installed & enabled. +# DansGuardian is NO LONGER AVAILABLE in Debian Buster i.e. since June 2019. dansguardian_install: False dansguardian_enabled: False diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index e41af5c8d..87204f364 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -153,7 +153,8 @@ apache_allow_sudo: True squid_install: False squid_enabled: False -# DansGuardian REQUIRES Squid (above) be installed & enabled +# DansGuardian REQUIRES Squid (above) be installed & enabled. +# DansGuardian is NO LONGER AVAILABLE in Debian Buster i.e. since June 2019. dansguardian_install: False dansguardian_enabled: False