Removed nodejs role. Using apt now.

3 files changed, 7 insertions, 12 deletions

diff --git a/roles/hap-nodejs/defaults/main.yaml b/roles/hap-nodejs/defaults/main.yaml
index 739d42b..da31f34 100644
--- a/roles/hap-nodejs/defaults/main.yaml
+++ b/roles/hap-nodejs/defaults/main.yaml
@@ -1,11 +1,5 @@
 ---
 
-hap_ubuntu_apt_packages:
-  - "libavahi-compat-libdnssd-dev"
-
-hap_npm_packages:
-  - "python-shell"
-
 hap_user: "hap-nodejs"
 hap_restart_sec: 10
 hap_dir: "/home/{{hap_user}}"
diff --git a/roles/hap-nodejs/meta/main.yaml b/roles/hap-nodejs/meta/main.yaml
deleted file mode 100644
index 3c8004a..0000000
--- a/roles/hap-nodejs/meta/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-dependencies:
-  - role: nodejs
diff --git a/roles/hap-nodejs/tasks/main.yaml b/roles/hap-nodejs/tasks/main.yaml
index cd3f71c..824ff10 100644
--- a/roles/hap-nodejs/tasks/main.yaml
+++ b/roles/hap-nodejs/tasks/main.yaml
@@ -14,7 +14,10 @@
 - name: install homekit apt packages
   become: yes
   apt: name="{{item}}"
-  with_items: "{{hap_ubuntu_apt_packages}}"
+  with_items:
+    - "libavahi-compat-libdnssd-dev"
+    - "nodejs-legacy"
+    - "npm"
 
 - name: download and unarchive HAP-NodeJS
   become: yes
@@ -27,11 +30,13 @@
     owner: "{{hap_user}}"
     group: "{{hap_user}}"
 
+# global?
 - name: install npm packages
   become: yes
   become_user: "{{hap_user}}"
   npm: name="{{item}}" path="{{hap_dest}}"
-  with_items: "{{hap_npm_packages}}"
+  with_items:
+    - "python-shell"
 
 - name: clean up accessory examples
   become: yes