From a8b34daccc10f8ecdfdd0e4d4faff18457f55f9d Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 6 Mar 2024 16:26:53 +0200 Subject: radicle_node: deal with a node config missing after install Signed-off-by: Lars Wirzenius Sponsored-by: author --- roles/radicle_node/files/rad-config-update | 2 +- roles/radicle_node/tasks/main.yml | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/roles/radicle_node/files/rad-config-update b/roles/radicle_node/files/rad-config-update index a47e3d6..40dd1a9 100644 --- a/roles/radicle_node/files/rad-config-update +++ b/roles/radicle_node/files/rad-config-update @@ -8,7 +8,7 @@ policy = sys.argv[3] scope = sys.argv[4] peer = sys.argv[5] -p = subprocess.run(["rad", "config", "show"], check=True, capture_output=True) +p = subprocess.run(["rad", "config", "show"], capture_output=True) if p.returncode != 0: sys.exit("rad config show failed") config = json.loads(p.stdout.decode()) diff --git a/roles/radicle_node/tasks/main.yml b/roles/radicle_node/tasks/main.yml index 4cb9bf8..961faf7 100644 --- a/roles/radicle_node/tasks/main.yml +++ b/roles/radicle_node/tasks/main.yml @@ -56,6 +56,7 @@ mode: 0755 - name: "create directory for Radicle backup" + when: radicle_node_backup is defined file: state: directory path: radicle-backup @@ -108,6 +109,20 @@ src: radicle-node.service.j2 dest: /lib/systemd/system/radicle-node.service +- name: "init Radicle node config" + shell: | + if [ ! -e /home/_rad/.radicle/config.json ]; then + sudo -u _rad -i rad config init --alias "{{ radicle_node_domain_name }}" + fi + +- name: "(re)start systemd unit for Radicle node" + systemd: + name: radicle-node + state: restarted + masked: no + enabled: yes + daemon_reload: yes + - name: "install script to add update Radicle config file" when: radicle_node_connections is defined copy: @@ -144,14 +159,6 @@ sudo -u _rad rad seed "{{ item.rid }}" sudo -u _rad -i ./rad-config-pin "{{ item.rid }}" -- name: "(re)start systemd unit for Radicle node" - systemd: - name: radicle-node - state: restarted - masked: no - enabled: yes - daemon_reload: yes - - name: "install Caddy configuation file" template: src: Caddyfile.j2 -- cgit v1.2.1