From 5445bfa8a7c5a76fb891be82442220b7ae1ea2ed Mon Sep 17 00:00:00 2001 From: Manuel Tiago Pereira Date: Thu, 12 Nov 2015 07:19:10 +0000 Subject: [PATCH 1/4] Add support for newer nodejs versions, in the form of '5.x'. --- README.md | 13 +++++++++++++ defaults/main.yml | 4 ++-- tasks/main.yml | 7 ++++++- vars/main.yml | 3 ++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d4815d3..2c1000c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,18 @@ Install the playbook via Ansible Galaxy: ```text $ ansible-galaxy install nodesource.node ``` +Or using the `requirements.yml` + +```yaml +# install the role from galaxy +- src: nodesource.node +``` + +Which is imported as follows. + +``` +ansible-galaxy install -r requirements.yml +``` Then configure it as follows: @@ -26,6 +38,7 @@ Then configure it as follows: ## Role Variables - `nodejs_nodesource_pin_priority`: Pin-Priority of the NodeSource repository (default: `500`). +- `nodejs_version`: Supports 0.10 or 0.12 and 4.x, 5.x and onward, replacing x with your desired minor version. ## Testing diff --git a/defaults/main.yml b/defaults/main.yml index 863eacd..06a9e52 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,5 +2,5 @@ # Pin-Priority of NodeSource repository nodejs_nodesource_pin_priority: 500 -# 0.10 or 0.12 or 4.x -nodejs_version: "4.2" +# 0.10 or 0.12 and 4.x, 5.x and onward +nodejs_version: "5.0" diff --git a/tasks/main.yml b/tasks/main.yml index adf8155..6f96346 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -6,7 +6,7 @@ register: apt_https_transport - name: Install HTTPS transport for APT - apt: + apt: pkg: apt-transport-https state: installed when: not apt_https_transport.stat.exists @@ -16,6 +16,11 @@ url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key state: present +- name: Check if nodejs_version is 0.x + set_fact: + debian_repo_version: "{{ nodejs_version }}" + when: nodejs_version in zero_versions + - name: Add NodeSource deb repository apt_repository: repo: 'deb https://deb.nodesource.com/node_{{ debian_repo_version }} {{ ansible_distribution_release }} main' diff --git a/vars/main.yml b/vars/main.yml index 10f5e3a..e831d6f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,4 @@ --- # vars file for nodejs -debian_repo_version: "{{ nodejs_version if '4' not in nodejs_version else '4.x' }}" +zero_versions: ['0.10', '0.12'] +debian_repo_version: '{{ nodejs_version | regex_replace("^([1-9]+)\.\d+$", "\\1.x") }}' From c48c92575781f7fe2c604528526ac49ebd053990 Mon Sep 17 00:00:00 2001 From: Manuel Tiago Pereira Date: Wed, 18 Nov 2015 07:47:36 +0000 Subject: [PATCH 2/4] Install nodejs LTS (v4.2) by default. --- defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 06a9e52..c0030e5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,4 +3,5 @@ nodejs_nodesource_pin_priority: 500 # 0.10 or 0.12 and 4.x, 5.x and onward -nodejs_version: "5.0" +nodejs_version: "4.2" + From 48518955315ae16929fca23d45a0a6a55e986311 Mon Sep 17 00:00:00 2001 From: Rohan Kapadia Date: Wed, 20 Apr 2016 05:49:11 +0530 Subject: [PATCH 3/4] Previous regex wasn't working for me. --- vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/main.yml b/vars/main.yml index e831d6f..249a0fb 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,4 @@ --- # vars file for nodejs zero_versions: ['0.10', '0.12'] -debian_repo_version: '{{ nodejs_version | regex_replace("^([1-9]+)\.\d+$", "\\1.x") }}' +debian_repo_version: '{{ nodejs_version | regex_replace("^([1-9]+)\.\d+$", "\1.x") }}' From c644626abdbf274f23c02d139c53f3b717862083 Mon Sep 17 00:00:00 2001 From: Rohan Kapadia Date: Tue, 26 Apr 2016 14:45:05 +0530 Subject: [PATCH 4/4] Updated the min supported version on ansible --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index c65e53c..3f5eb1a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,7 +4,7 @@ galaxy_info: description: Installs the NodeSource Node.js binary packages company: NodeSource license: MIT - min_ansible_version: 1.2 + min_ansible_version: 2.0 platforms: - name: Ubuntu versions: