Use apt package for homebridge.

4 files changed, 23 insertions, 66 deletions

diff --git a/homebridge/defaults/main.yaml b/homebridge/defaults/main.yaml
index b36d09b..24722a1 100644
--- a/homebridge/defaults/main.yaml
+++ b/homebridge/defaults/main.yaml
@@ -1,11 +1,4 @@
 ---
 
-homebridge_user: "homebridge"
-homebridge_groups: "video"
-homebridge_dir: "/home/{{homebridge_user}}"
-homebridge_restart_sec: "10"
-homebridge_apt_packages: []
-homebridge_npm_packages: []
-
 homebridge_pin: "031-45-154"
 homebridge_port: "51900"
diff --git a/homebridge/meta/main.yaml b/homebridge/meta/main.yaml
deleted file mode 100644
index 6116998..0000000
--- a/homebridge/meta/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-dependencies:
-  - nodejs
diff --git a/homebridge/tasks/main.yaml b/homebridge/tasks/main.yaml
index 371fe45..e1adf7b 100644
--- a/homebridge/tasks/main.yaml
+++ b/homebridge/tasks/main.yaml
@@ -1,54 +1,38 @@
 ---
 
-- name: create homebridge user
+- name: add homebridge apt key
   become: yes
-  user:
-    name: "{{homebridge_user}}"
-    comment: "Homebridge"
-    shell: "/bin/false"
-    home: "{{homebridge_dir}}"
-    groups: "{{homebridge_groups}}"
-    append: yes
-    move_home: yes
-  notify: restart homebridge service
-
-- name: create homebridge directory
-  become: yes
-  file:
-    path: "{{homebridge_dir}}"
-    state: "directory"
-    owner: "{{homebridge_user}}"
-    group: "{{homebridge_user}}"
-    mode: "0755"
-
-- name: install homebridge apt deps
-  become: yes
-  apt: name="{{homebridge_apt_packages}}"
+  get_url:
+    url: "https://repo.homebridge.io/KEY.gpg"
+    dest: /etc/apt/trusted.gpg.d/homebridge.asc
+    mode: "0644"
 
-- name: install homebridge
+- name: add homebridge apt repo
   become: yes
-  npm: name="homebridge" global="yes"
-  notify: restart homebridge service
+  apt_repository: repo="deb https://repo.homebridge.io stable main"
 
-- name: install platform accessories
+- name: apt install homebridge
   become: yes
-  npm: name="{{item}}" global="yes"
-  loop: "{{homebridge_npm_packages}}"
+  apt: name="homebridge"
   notify: restart homebridge service
 
-- name: configure homebridge
+- name: install homebridge apt deps
   become: yes
-  template:
-    src: "{{homebridge_config_template}}"
-    dest: "{{homebridge_dir}}/config.json"
+  apt: name="{{homebridge_apt_packages}}"
   notify: restart homebridge service
 
-- name: configure systemd service
-  become: yes
-  template:
-    src: "homebridge.service.j2"
-    dest: "/lib/systemd/system/homebridge.service"
-  notify: restart homebridge service
+# - name: install platform accessories
+#   become: yes
+#   npm: name="{{item}}" global="yes"
+#   loop: "{{homebridge_npm_packages}}"
+#   notify: restart homebridge service
+
+# - name: configure homebridge
+#   become: yes
+#   template:
+#     src: "{{homebridge_config_template}}"
+#     dest: "{{homebridge_dir}}/config.json"
+#   notify: restart homebridge service
 
 - name: ensure homebridge is started
   become: yes
diff --git a/homebridge/templates/homebridge.service.j2 b/homebridge/templates/homebridge.service.j2
deleted file mode 100644
index a20ff99..0000000
--- a/homebridge/templates/homebridge.service.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-# {{ansible_managed}}
-
-[Unit]
-Description=Homebridge
-
-[Service]
-User={{homebridge_user}}
-Group={{homebridge_user}}
-Restart=always
-RestartSec={{homebridge_restart_sec}}
-
-WorkingDirectory={{homebridge_dir}}
-ExecStart=/usr/bin/node /opt/{{nodejs_dir}}/bin/homebridge -U {{homebridge_dir}}
-
-[Install]
-WantedBy=default.target