From 2d00f3c71db72a57d3e48f87278db9524e0c2950 Mon Sep 17 00:00:00 2001
From: Dorian Pula <dorian.pula@amber-penguin-software.ca>
Date: Thu, 28 Apr 2016 18:10:51 -0400
Subject: [PATCH] Migrate roles to use stand-alone NodeJS role.

---
 meta/main.yml     |  6 ++++--
 tasks/main.yml    |  1 -
 tasks/nodejs.yaml | 35 -----------------------------------
 3 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 tasks/nodejs.yaml

diff --git a/meta/main.yml b/meta/main.yml
index 414b90b..8e4c31b 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,7 +13,8 @@ galaxy_info:
   - development
   - web
 dependencies:
-  - role:  "git+https://bitbucket.org/dorianpula/ansible-nginx-uwsgi-supervisor,,nginx-uwsgi-supervisor"
+#  - role:  "git+https://bitbucket.org/dorianpula/ansible-nginx-uwsgi-supervisor,,nginx-uwsgi-supervisor"
+  - role:  "nginx-uwsgi-supervisor"
     app_name: "{{ rookeries_app_name }}"
     app_root_path: "{{ rookeries_app_symlink }}"
     app_venv: "{{ rookeries_venv_symlink }}"
@@ -21,7 +22,8 @@ dependencies:
     app_uwsgi_port: "{{ rookeries_local_uwsgi_port }}"
     app_uwsgi_executable: "rookeries:make_rookeries_app()"
     app_uwsgi_envs: "{{ rookeries_app_config }}"
-  - role: "git+https://bitbucket.org/dorianpula/ansible-nodejs,,nodejs"
+#  - role: "git+https://bitbucket.org/dorianpula/ansible-nodejs,,nodejs"
+  - role: "nodejs"
     node_version_family: "5.x"
     globally_installed_tools:
       - browserify
diff --git a/tasks/main.yml b/tasks/main.yml
index dfef102..27b299e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,4 @@
 ---
-- include: nodejs.yaml
 - include: couchdb.yaml
 - include: dev_email_server.yaml
 - include: rookeries_deployment.yaml
diff --git a/tasks/nodejs.yaml b/tasks/nodejs.yaml
deleted file mode 100644
index 21e6c45..0000000
--- a/tasks/nodejs.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- name: install systems to help setup nodejs
-  apt: pkg={{ item }} state=present
-  with_items:
-      - python-apt
-      - git
-      - apt-transport-https
-
-- name: add the nodesource repository
-  apt_key: url=https://deb.nodesource.com/gpgkey/nodesource.gpg.key state=present
-
-- name: add the nodesource binary repository
-  apt_repository: repo="deb https://deb.nodesource.com/node_0.12 {{ ansible_lsb.codename }} main"
-        state=present
-
-- name: add the nodesource source repository
-  apt_repository: repo="deb-src https://deb.nodesource.com/node_0.12 {{ ansible_lsb.codename }} main"
-        state=present update_cache=yes
-
-- name: install nodejs + npm
-  apt: pkg=nodejs state=present
-
-- name: check if nodejs binary exists and needs linking to node binary
-  stat: path=/usr/bin/nodejs
-  register: nodejs_bin
-
-- name: link nodejs binary correctly
-  file: src=/usr/bin/nodejs dest=/usr/bin/node state=link
-  when: nodejs_bin.stat.exists
-
-- name: install coffeescript + less dependencies
-  npm: name={{ item }} global=yes state=present registry=http://registry.npmjs.org/
-  with_items:
-      - less
-      - browserify