Updated homekit door for Raspbian Buster.

11 files changed, 72 insertions, 135 deletions

diff --git a/roles/hap-door/handlers/main.yaml b/roles/hap-door/handlers/main.yaml
deleted file mode 100644
index 25d24bd..0000000
--- a/roles/hap-door/handlers/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- name: restart hap-nodejs service
-  systemd: name="hap-nodejs" state="restarted" daemon_reload="yes"
-  become: yes
diff --git a/roles/hap-door/tasks/main.yaml b/roles/hap-door/tasks/main.yaml
deleted file mode 100644
index 7e1669f..0000000
--- a/roles/hap-door/tasks/main.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-
-- name: install python3 apt packages
-  become: yes
-  apt: name="python3"
-  notify: restart hap-nodejs service
-
-- name: install python-shell npm packages
-  become: yes
-  npm: name="python-shell" global="yes"
-  notify: restart hap-nodejs service
-
-- name: install door accessory
-  become: yes
-  copy:
-    src: "../../../src/Door_accessory.js"
-    dest: "{{hap_dest}}/accessories/Door_accessory.js"
-    owner: "{{hap_user}}"
-    group: "{{hap_user}}"
-  notify: restart hap-nodejs service
-
-- name: create python dir
-  become: yes
-  file:
-    path: "{{hap_dest}}/python"
-    state: "directory"
-    owner: "{{hap_user}}"
-    group: "{{hap_user}}"
-
-- name: install doord.py
-  become: yes
-  copy:
-    src: "../../../src/doord.py"
-    dest: "{{hap_dest}}/python/doord.py"
-    owner: "{{hap_user}}"
-    group: "{{hap_user}}"
-    mode: "0755"
-  notify: restart hap-nodejs service
diff --git a/roles/hap-nodejs/defaults/main.yaml b/roles/hap-nodejs/defaults/main.yaml
deleted file mode 100644
index 22c2b0d..0000000
--- a/roles/hap-nodejs/defaults/main.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-
-hap_apt_packages:
-    - "libavahi-compat-libdnssd-dev"
-    - "nodejs"
-    - "npm"
-
-hap_user: "hap-nodejs"
-hap_restart_sec: 10
-hap_dir: "/home/{{hap_user}}"
-hap_src: "https://github.com/KhaosT/HAP-NodeJS/archive/master.zip"
-hap_dest: "{{hap_dir}}/HAP-NodeJS-master"
-
-hap_example_accessories:
-  - "AirConditioner_accessory.js"
-  - "Fan_accessory.js"
-  - "GarageDoorOpener_accessory.js"
-  - "Light_accessory.js"
-  - "Lock_accessory.js"
-  - "MotionSensor_accessory.js"
-  - "Outlet_accessory.js"
-  - "TemperatureSensor_accessory.js"
diff --git a/roles/hap-nodejs/handlers/main.yaml b/roles/hap-nodejs/handlers/main.yaml
deleted file mode 100644
index 25d24bd..0000000
--- a/roles/hap-nodejs/handlers/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- name: restart hap-nodejs service
-  systemd: name="hap-nodejs" state="restarted" daemon_reload="yes"
-  become: yes
diff --git a/roles/hap-nodejs/tasks/main.yaml b/roles/hap-nodejs/tasks/main.yaml
deleted file mode 100644
index f83a4da..0000000
--- a/roles/hap-nodejs/tasks/main.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-
-- name: create hap-nodejs user
-  become: yes
-  user:
-    name: "{{hap_user}}"
-    comment: "HAP-NodeJS"
-    groups: "spi,i2c,gpio"
-    shell: "/bin/false"
-    home: "{{hap_dir}}"
-    move_home: yes
-  notify: restart hap-nodejs service
-
-- name: install homekit apt packages
-  become: yes
-  apt: name="{{hap_apt_packages}}"
-  notify: restart hap-nodejs service
-
-- name: download and unarchive HAP-NodeJS
-  become: yes
-  become_user: "{{hap_user}}"
-  unarchive:
-    src: "{{hap_src}}"
-    dest: "{{hap_dir}}"
-    remote_src: "yes"
-    creates: "{{hap_dest}}"
-    owner: "{{hap_user}}"
-    group: "{{hap_user}}"
-  notify: restart hap-nodejs service
-
-- name: remove example accessories
-  become: yes
-  file: path="{{hap_dest}}/accessories/{{item}}" state="absent"
-  with_items: "{{hap_example_accessories}}"
-
-- name: build HAP-NodeJS
-  become: yes
-  become_user: "{{hap_user}}"
-  npm: path="{{hap_dest}}"
-
-- name: configure systemd service
-  become: yes
-  template: src="hap-nodejs.service.j2" dest="/lib/systemd/system/hap-nodejs.service"
-  notify: restart hap-nodejs service
-
-- name: ensure hap-nodejs is started
-  become: yes
-  systemd: name="hap-nodejs.service" enabled="yes" state="started"
diff --git a/roles/hap-nodejs/templates/hap-nodejs.service.j2 b/roles/hap-nodejs/templates/hap-nodejs.service.j2
deleted file mode 100644
index f657555..0000000
--- a/roles/hap-nodejs/templates/hap-nodejs.service.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-# {{ansible_managed}}
-
-[Unit]
-Description=HAP-NodeJS
-
-[Service]
-User={{hap_user}}
-Group={{hap_user}}
-Restart=always
-RestartSec={{hap_restart_sec}}
-
-WorkingDirectory={{hap_dest}}
-ExecStart=/usr/bin/node {{hap_dest}}/Core.js
-
-[Install]
-WantedBy=default.target
diff --git a/roles/homekit-door/defaults/main.yaml b/roles/homekit-door/defaults/main.yaml
new file mode 100644
index 0000000..d5386cf
--- /dev/null
+++ b/roles/homekit-door/defaults/main.yaml
@@ -0,0 +1,10 @@
+---
+
+homekit_door_apt_packages:
+  - "python3"
+  - "nodejs"
+  - "npm"
+
+homekit_door_user: "homekit-door"
+homekit_door_dir: "/home/{{homekit_door_user}}/homekit-door"
+homekit_door_restart_sec: 10
diff --git a/roles/homekit-door/handlers/main.yaml b/roles/homekit-door/handlers/main.yaml
new file mode 100644
index 0000000..861836c
--- /dev/null
+++ b/roles/homekit-door/handlers/main.yaml
@@ -0,0 +1,5 @@
+---
+
+- name: restart homekit-door service
+  systemd: name="homekit-door.service" state="restarted" daemon_reload="yes"
+  become: yes
diff --git a/roles/hap-door/meta/main.yaml b/roles/homekit-door/meta/main.yaml
index 8261e8f..d12bd5b 100644
--- a/roles/hap-door/meta/main.yaml
+++ b/roles/homekit-door/meta/main.yaml
@@ -1,5 +1,4 @@
 ---
 
 dependencies:
-  - hap-nodejs
   - automationhat
diff --git a/roles/homekit-door/tasks/main.yaml b/roles/homekit-door/tasks/main.yaml
new file mode 100644
index 0000000..a5f8ff1
--- /dev/null
+++ b/roles/homekit-door/tasks/main.yaml
@@ -0,0 +1,41 @@
+---
+
+- name: create homekit-door user
+  become: yes
+  user:
+    name: "{{homekit_door_user}}"
+    comment: "HomeKit Door"
+    groups: "spi,i2c,gpio"
+    shell: "/bin/false"
+    move_home: yes
+  notify: restart homekit-door service
+
+- name: install homekit-door apt packages
+  become: yes
+  apt: name="{{homekit_door_apt_packages}}"
+  notify: restart homekit-door service
+
+- name: install homekit-door application dir
+  become: yes
+  copy:
+    src: "../../../npmjs-package/"
+    dest: "{{homekit_door_dir}}/"
+    owner: "{{homekit_door_user}}"
+    group: "{{homekit_door_user}}"
+    mode: "0755"
+  notify: restart homekit-door service
+
+- name: build homekit-door
+  become: yes
+  become_user: "{{homekit_door_user}}"
+  npm: path="{{homekit_door_dir}}"
+  notify: restart homekit-door service
+
+- name: configure systemd service
+  become: yes
+  template: src="homekit-door.service.j2" dest="/lib/systemd/system/homekit-door.service"
+  notify: restart homekit-door service
+
+- name: ensure homekit-door is started
+  become: yes
+  systemd: name="homekit-door.service" enabled="yes" state="started"
diff --git a/roles/homekit-door/templates/homekit-door.service.j2 b/roles/homekit-door/templates/homekit-door.service.j2
new file mode 100644
index 0000000..9572951
--- /dev/null
+++ b/roles/homekit-door/templates/homekit-door.service.j2
@@ -0,0 +1,16 @@
+# {{ansible_managed}}
+
+[Unit]
+Description=HomeKit Door
+
+[Service]
+User={{homekit_door_user}}
+Group={{homekit_door_user}}
+Restart=always
+RestartSec={{homekit_door_restart_sec}}
+
+WorkingDirectory={{homekit_door_dir}}
+ExecStart=/usr/bin/node {{homekit_door_dir}}/src/door.js
+
+[Install]
+WantedBy=default.target