diff --git a/frank/ansible/files/frank.env b/frank/ansible/files/frank.env index 2341f1a..4cfaf54 100644 --- a/frank/ansible/files/frank.env +++ b/frank/ansible/files/frank.env @@ -1,5 +1,5 @@ -NATS_URL=nats://localhost:4222 +NATS_URL={{ nats_url}} DURABLE={{ queue_name }} -SUBJECT="barker.print" -STREAM="barker_print_stream" -ADDRESS={{ printer_port }} +SUBJECT=barker.print +STREAM=barker_print_stream +ADDRESS=/printer diff --git a/frank/ansible/files/frank.service b/frank/ansible/files/frank.service index 242d3a3..1d26f6b 100644 --- a/frank/ansible/files/frank.service +++ b/frank/ansible/files/frank.service @@ -1,9 +1,9 @@ [Unit] Description=Frank container service -After=docker.service {{ server }}-redis-tunnel.service -Wants=network-online.target docker.socket {{ server }}-redis-tunnel.service -Requires=docker.socket {{ server }}-redis-tunnel.service -PartOf={{ server }}-redis-tunnel.service +After=docker.service netbird.service +Wants=network-online.target docker.socket netbird.service +Requires=docker.socket netbird.service +PartOf=netbird.service [Service] Restart=always diff --git a/frank/ansible/roles/frank/tasks/main.yml b/frank/ansible/roles/frank/tasks/main.yml index d8f070c..cd955f1 100644 --- a/frank/ansible/roles/frank/tasks/main.yml +++ b/frank/ansible/roles/frank/tasks/main.yml @@ -1,14 +1,5 @@ --- -- name: Check if frank .env file exists - stat: path="/home/{{ user }}/frank.env" - register: status - -- name: No need to upload the frank .env file - debug: - msg: "No need to upload the frank .env file as it already exists." - - name: Upload the frank .env file - when: not status.stat.exists template: src: files/frank.env dest: "/home/{{ user }}/frank.env" @@ -24,14 +15,14 @@ - name: Pull frank image community.docker.docker_image: - name: "registry.tanshu.com/frank:{{ frank_version | default('latest') }}" + name: "registry.tanshu.com/frank:latest" source: pull force_source: true - name: Create frank worker container community.docker.docker_container: name: "frank" - image: "registry.tanshu.com/frank:{{ frank_version | default('latest') }}" + image: "registry.tanshu.com/frank:latest" state: started restart_policy: "no" env_file: "/home/{{ user }}/frank.env" diff --git a/frank/ansible/vars/devices/moz2.yml b/frank/ansible/vars/devices/moz2.yml index 0556435..18e5afe 100644 --- a/frank/ansible/vars/devices/moz2.yml +++ b/frank/ansible/vars/devices/moz2.yml @@ -3,3 +3,4 @@ hostname: mozimo-backup user: barker queue_name: mozimo-backup printer_port: "/dev/usb/lp0" +nats_url: "nats://clair.lan.tanshu.com:4222" diff --git a/frank/deploy.sh b/frank/deploy.sh index 9d7bb13..39f8661 100755 --- a/frank/deploy.sh +++ b/frank/deploy.sh @@ -12,5 +12,5 @@ fi current_version=$(grep -m 1 '^version = ' pyproject.toml | sed -E 's/version = "([^"]+)"/\1/') make build-production TAG="$current_version" -cd "$parent_path/ansible" || exit -ansible-playbook --inventory=hosts playbook.yml --extra-vars "frank_version=$current_version" +cd ansible || exit +# ansible-playbook --inventory=hosts frank.yml