diff --git a/meta/main.yml b/meta/main.yml index 35562cbc..82c21143 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,17 +4,12 @@ galaxy_info: description: An ansible role for installing Archivematica from source. company: Artefactual Systems license: AGPLv3 - min_ansible_version: 2.3 + min_ansible_version: 2.7 platforms: - name: EL versions: - 7 - name: Ubuntu versions: - - trusty - xenial - -dependencies: -- role: geerlingguy.nodejs - version: 4.1.1 - nodejs_version: 8.x + - bionic diff --git a/tasks/pipeline-instcode.yml b/tasks/pipeline-instcode.yml index 62b2e74f..466a4fb0 100644 --- a/tasks/pipeline-instcode.yml +++ b/tasks/pipeline-instcode.yml @@ -54,7 +54,7 @@ - name: "Install front-end dependencies" become: "yes" become_user: "archivematica" - command: npm install + command: "{{ npm_path }}/npm install" args: chdir: "{{ item }}" with_items: diff --git a/vars/Debian.yml b/vars/Debian.yml index 48329a43..6a1bffc7 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -6,3 +6,4 @@ ansible_deps: - "python-mysqldb" # Required for mysql_db module - "sqlite3" # Required for am-configure and fixity ca_custom_bundle: "/etc/ssl/certs/ca-certificates.crt" +npm_path: "/usr/bin/npm" diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 15896b92..700a8932 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -6,4 +6,7 @@ ansible_deps: - "MySQL-python" # Required for mysql_db module - "sqlite" # Required for am-configure and fixity - "p7zip-plugins" + - "centos-release-scl-rh" # Required for rh-nodejs8 + - "rh-nodejs8-npm" ca_custom_bundle: "/etc/pki/tls/certs/ca-bundle.crt" +npm_path: "/opt/rh/rh-nodejs8/root/bin/"