13 files changed, 79 insertions, 151 deletions
diff --git a/bitcoind/defaults/main.yaml b/bitcoind/defaults/main.yaml
index 0a6c6a7..b0cd08f 100644
--- a/bitcoind/defaults/main.yaml
+++ b/bitcoind/defaults/main.yaml
@@ -1,6 +1,6 @@
 ---
 
-bitcoind_user: "{{node_user}}"
+bitcoind_user: "bitcoin"
 bitcoind_version: "0.19.1"
 bitcoind_arch: "{{ansible_architecture}}"
 bitcoind_url: "https://bitcoin.org/bin/bitcoin-core-{{bitcoind_version}}/bitcoin-{{bitcoind_version}}-{{bitcoind_arch}}-linux-gnu.tar.gz"
diff --git a/btcd/defaults/main.yaml b/btcd/defaults/main.yaml
deleted file mode 100644
index a21a7a0..0000000
--- a/btcd/defaults/main.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-btcd_user: "{{node_user}}"
-btcd_version: "v0.20.1-beta"
-btcd_arch: "armv7"
-btcd_tar_name: "btcd-linux-{{btcd_arch}}-{{btcd_version}}"
-btcd_tar: "{{btcd_tar_name}}.tar.gz"
-btcd_url: "https://github.com/btcsuite/btcd/releases/download/{{btcd_version}}/{{btcd_tar}}"
-btcd_enable_txindex: true
diff --git a/btcd/meta/main.yaml b/btcd/meta/main.yaml
deleted file mode 100644
index f2d6d7f..0000000
--- a/btcd/meta/main.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-
-dependencies:
-  - role: node/install
-    vars:
-      node_install_user:     "{{btcd_user}}"
-      node_install_url:      "{{btcd_url}}"
-      node_install_tar:      "{{btcd_tar}}"
-      node_install_tar_name: "{{btcd_tar_name}}"
-
-  - role: node/conf
-    vars:
-      node_type: "btcd"
-      node_conf_template: "btcd.conf.j2"
-      node_service_template: "btcd.service.j2"
-      node_data_dir: "{{btcd_data_dir}}"
-      node_log_dir: "{{btcd_log_dir}}"
diff --git a/btcd/templates/btcd.conf.j2 b/btcd/templates/btcd.conf.j2
deleted file mode 100644
index 34aedb2..0000000
--- a/btcd/templates/btcd.conf.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-[Application Options]
-externalip={{node_external_ip}}
-uacomment={{btcd_comment}}
-
-datadir={{btcd_data_dir}}
-logdir={{btcd_log_dir}}
-debuglevel=error
-
-rpcuser={{btcd_rpc_user}}
-rpcpass={{btcd_rpc_pass}}
-
-txindex={{btcd_enable_txindex}}
-
-{% for peer in btcd_add_peer %}addpeer={{peer}}
-{% endfor %}
diff --git a/btcd/templates/btcd.service.j2 b/btcd/templates/btcd.service.j2
deleted file mode 100644
index 06f8236..0000000
--- a/btcd/templates/btcd.service.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=btcd
-After=network.target
-
-[Service]
-ExecStart=/usr/local/bin/btcd
-User={{btcd_user}}
-Restart=on-failure
-
-PrivateTmp=true
-ProtectSystem=full
-NoNewPrivileges=true
-PrivateDevices=true
-MemoryDenyWriteExecute=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/lnd/defaults/main.yaml b/lnd/defaults/main.yaml
index 97db985..27fcdfc 100644
--- a/lnd/defaults/main.yaml
+++ b/lnd/defaults/main.yaml
@@ -6,9 +6,10 @@ lnd_arch: "armv7"
 lnd_tar_name: "lnd-linux-{{lnd_arch}}-{{lnd_version}}"
 lnd_tar: "{{lnd_tar_name}}.tar.gz"
 lnd_url: "https://github.com/lightningnetwork/lnd/releases/download/{{lnd_version}}/{{lnd_tar}}"
+lnd_conf_dir: "/home/{{lnd_user}}/.lnd"
 
 lndconnect_user: "{{node_user}}"
 lndconnect_version: "v0.2.0"
-lndconnect_tar_name: "lndconnect-linux-armv7-{{lndconnect_version}}"
+lndconnect_tar_name: "lndconnect-linux-{{lnd_arch}}-{{lndconnect_version}}"
 lndconnect_tar: "{{lndconnect_tar_name}}.tar.gz"
 lndconnect_url: "https://github.com/LN-Zap/lndconnect/releases/download/{{lndconnect_version}}/{{lndconnect_tar}}"
diff --git a/lnd/handlerls/main.yaml b/lnd/handlerls/main.yaml
new file mode 100644
index 0000000..e4b7b18
--- /dev/null
+++ b/lnd/handlerls/main.yaml
@@ -0,0 +1,5 @@
+---
+
+- name: restart lnd
+  become: yes
+  systemd: service="lnd.service" state="restarted" daemon_reload="yes"
diff --git a/lnd/meta/main.yaml b/lnd/meta/main.yaml
deleted file mode 100644
index c3caef1..0000000
--- a/lnd/meta/main.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-
-dependencies:
-  - role: node/install
-    vars:
-      node_install_user:     "{{lnd_user}}"
-      node_install_url:      "{{lnd_url}}"
-      node_install_tar:      "{{lnd_tar}}"
-      node_install_tar_name: "{{lnd_tar_name}}"
-
-  - role: node/install
-    vars:
-      node_install_user:     "{{lndconnect_user}}"
-      node_install_url:      "{{lndconnect_url}}"
-      node_install_tar:      "{{lndconnect_tar}}"
-      node_install_tar_name: "{{lndconnect_tar_name}}"
-
-  - role: node/conf
-    vars:
-      node_type: "lnd"
-      node_conf_template: "lnd.conf.j2"
-      node_service_template: "lnd.service.j2"
-      node_data_dir: "{{lnd_data_dir}}"
-      node_log_dir: "{{lnd_log_dir}}"
diff --git a/lnd/tasks/main.yaml b/lnd/tasks/main.yaml
new file mode 100644
index 0000000..d283ccb
--- /dev/null
+++ b/lnd/tasks/main.yaml
@@ -0,0 +1,71 @@
+---
+
+- name: add lnd user
+  become: yes
+  user: name="{{lnd_user}}"
+
+- name: unarchive lnd
+  become: yes
+  unarchive:
+    remote_src: yes
+    src: "{{item.url}}"
+    dest: "/tmp"
+    creates: "/tmp/{{item.tar_name}}/"
+  loop:
+    - url: "{{lnd_url}}"
+      tar_name: "{{lnd_tar_name}}"
+    - url: "{{lndconnect_url}}"
+      tar_name: "{{lndconnect_tar_name}}"
+
+- name: install lnd
+  become: yes
+  copy:
+    src: "/tmp/{{item.tar_name}}/"
+    dest: "/usr/local/bin/{{item.bins}}"
+    remote_src: yes
+    owner: "root"
+    group: "root"
+    mode: "0755"
+  loop:
+    - tar_name: "{{lnd_tar_name}}"
+      bins:
+        - "lnd"
+        - "lncli"
+    - tar_name: "{{lndconnect_tar_name}}"
+      bins:
+        - "lndconnect"
+
+- name: create lnd data dir
+  become: yes
+  file:
+    path: "{{item}}"
+    state: "directory"
+    owner: "{{lnd_user}}"
+    group: "{{lnd_user}}"
+    mode: "0770"
+  with_items:
+    - "{{lnd_data_dir}}"
+    - "{{lnd_log_dir}}"
+    - "{{lnd_conf_dir}}"
+
+- name: configure lnd
+  become: yes
+  template:
+    src: "lnd.conf.j2"
+    dest: "{{lnd_conf_dir}}/lnd.conf"
+    owner: "{{lnd_user}}"
+    group: "{{lnd_user}}"
+    mode: "0644"
+  notify: restart lnd
+
+- name: install lnd service
+  become: yes
+  template:
+    src: "lnd.service.j2"
+    dest: "/lib/systemd/system/lnd.service"
+    mode: "0644"
+  notify: restart lnd
+
+- name: ensure lnd is started
+  become: yes
+  systemd: service="lnd.service" enabled="yes" state="started" daemon_reload="yes"
diff --git a/node/conf/defaults/main.yaml b/node/conf/defaults/main.yaml
deleted file mode 100644
index eb74e59..0000000
--- a/node/conf/defaults/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-node_conf_dir: "/home/{{node_user}}/.{{node_type}}"
diff --git a/node/conf/handlers/main.yaml b/node/conf/handlers/main.yaml
deleted file mode 100644
index 7477dd1..0000000
--- a/node/conf/handlers/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- name: restart node
-  become: yes
-  systemd: service="{{node_type}}.service" state="restarted" daemon_reload="yes"
diff --git a/node/conf/tasks/main.yaml b/node/conf/tasks/main.yaml
deleted file mode 100644
index 7970743..0000000
--- a/node/conf/tasks/main.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-
-- name: create node data dir
-  become: yes
-  file:
-    path: "{{item}}"
-    state: "directory"
-    owner: "{{node_user}}"
-    group: "{{node_user}}"
-    mode: "0770"
-  with_items:
-    - "{{node_data_dir}}"
-    - "{{node_log_dir}}"
-    - "{{node_conf_dir}}"
-
-- name: configure node
-  become: yes
-  template:
-    src: "{{node_conf_template}}"
-    dest: "{{node_conf_dir}}/{{node_type}}.conf"
-    owner: "{{node_user}}"
-    group: "{{node_user}}"
-    mode: "0644"
-  notify: restart node
-
-- name: install node service
-  become: yes
-  template:
-    src: "{{node_service_template}}"
-    dest: "/lib/systemd/system/{{node_type}}.service"
-    mode: "0644"
-  notify: restart node
-
-- name: ensure node is started
-  become: yes
-  systemd: service="{{node_type}}.service" enabled="yes" state="started" daemon_reload="yes"
diff --git a/node/install/tasks/main.yaml b/node/install/tasks/main.yaml
deleted file mode 100644
index 7d95dbb..0000000
--- a/node/install/tasks/main.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-
-- name: add node user
-  become: yes
-  user: name="{{node_install_user}}"
-
-- name: unarchive node
-  become: yes
-  unarchive:
-    remote_src: yes
-    src: "{{node_install_url}}"
-    dest: "/tmp"
-    creates: "/tmp/{{node_install_tar_name}}/"
-
-- name: install node
-  become: yes
-  copy:
-    src: "/tmp/{{node_install_tar_name}}/"
-    dest: "/usr/local/bin/"
-    remote_src: yes
-    owner: "root"
-    group: "root"
-    mode: "0755"