From 07bc6262a28effff2ab5324ac65f94cddc52798e Mon Sep 17 00:00:00 2001 From: Mitra Ardron Date: Fri, 4 Oct 2019 17:15:15 +1000 Subject: [PATCH 1/6] Internetarchive role update to remove dependency on dweb-archive (speedup); Use yarn concurrency of 1; and do yarn install && yarn upgrade when upgrading --- roles/internetarchive/tasks/main.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/roles/internetarchive/tasks/main.yml b/roles/internetarchive/tasks/main.yml index da085a86e..4e1183722 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") or (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 From e6c72d895706e4c6f87216aadf435b474324462d Mon Sep 17 00:00:00 2001 From: Mitra Ardron Date: Sat, 5 Oct 2019 07:47:41 +1000 Subject: [PATCH 2/6] Internetarchive - correct mistake in new tasks/main.yml --- roles/internetarchive/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/internetarchive/tasks/main.yml b/roles/internetarchive/tasks/main.yml index 4e1183722..89071164e 100644 --- a/roles/internetarchive/tasks/main.yml +++ b/roles/internetarchive/tasks/main.yml @@ -3,7 +3,7 @@ - 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 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") or (nodejs_version != "12.x")) + when: internetarchive_install and (nodejs_version != "10.x") and (nodejs_version != "12.x") - name: Install packages needed by Distributed Web package: From 432fec4be1bc7f3b8bb8cf0e4a4496868fe054c2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 4 Oct 2019 21:45:48 -0400 Subject: [PATCH 3/6] Update default_vars.yml --- vars/default_vars.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 9b36651adb2c6924ca4bae95e644d94244e6ff17 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 4 Oct 2019 21:45:56 -0400 Subject: [PATCH 4/6] Update local_vars_min.yml --- vars/local_vars_min.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From bcad36a73ed2ac7b87ee03af87e43facab6de324 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 4 Oct 2019 21:46:00 -0400 Subject: [PATCH 5/6] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From dd348e69916869d095fdedffc2577d954a7cb353 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 4 Oct 2019 21:46:05 -0400 Subject: [PATCH 6/6] Update local_vars_big.yml --- vars/local_vars_big.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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