diff --git a/hosts b/hosts index 6e2d725..488d2ed 100644 --- a/hosts +++ b/hosts @@ -8,7 +8,8 @@ [bitb0x:vars] ansible_user=b0xxy ansible_password=b0xxy -registry_url=git.boxxy.net/b0xxer/ +#registry_url=git.boxxy.net/b0xxer/ +registry_url=localhost registry_user= registry_pass= bitcoin_version=26.0 diff --git a/roles/build/handlers/main.yml b/roles/build/handlers/main.yml index ca91372..5b516a4 100644 --- a/roles/build/handlers/main.yml +++ b/roles/build/handlers/main.yml @@ -1,2 +1,11 @@ --- # handlers file for build +# +- name: rebuild_bitcoin + containers.podman.podman_image: + name: bitcoin:{{ bitcoin_version }} + path: ~/Containers/bitcoin/ + build: + force_rm: true + format: oci + extra_args: VERSION={{ bitcoin_version }} diff --git a/roles/build/tasks/main.yml b/roles/build/tasks/main.yml index 27f14ff..c251ecb 100644 --- a/roles/build/tasks/main.yml +++ b/roles/build/tasks/main.yml @@ -2,42 +2,33 @@ # tasks file for build # - name: Create Containers/bitcoin Dir - register: bitcoin_build ansible.builtin.file: path: ~/Containers/bitcoin/bin recurse: true state: directory + notify: rebuild_bitcoin - name: Copy Containerfile Template - register: bitcoin_build ansible.builtin.copy: src: bitcoin/Containerfile dest: ~/Containers/bitcoin/Containerfile - -- name: Copy btc_init Template - register: bitcoin_build - ansible.builtin.template: - src: bitcoin/bin/btc_init.j2 - dest: ~/Containers/bitcoin/bin/btc_init + notify: rebuild_bitcoin - name: Copy entrypoint.sh - register: bitcoin_build ansible.builtin.copy: src: bitcoin/entrypoint.sh dest: ~/Containers/bitcoin/entrypoint.sh + notify: rebuild_bitcoin + +- name: Copy btc_init + ansible.builtin.copy: + src: bitcoin/bin/btc_init + dest: ~/Containers/bitcoin/bin/btc_init + notify: rebuild_bitcoin - name: Copy btc_oneshot - register: bitcoin_build ansible.builtin.copy: src: bitcoin/bin/btc_oneshot dest: ~/Containers/bitcoin/bin/btc_oneshot + notify: rebuild_bitcoin -- name: Build bitcoin if files changed - containers.podman.podman_image: - name: bitcoin:{{ bitcoin_version }} - path: ~/Containers/bitcoin/ - build: - force_rm: true - format: oci - extra_args: VERSION={{ bitcoin_version }} - when: bitcoin_build['changed']==True diff --git a/roles/config/handlers/main.yml b/roles/config/handlers/main.yml index 272031c..217773d 100644 --- a/roles/config/handlers/main.yml +++ b/roles/config/handlers/main.yml @@ -1,2 +1,9 @@ ---- +-- # handlers file for config +# +- name: restart_avahi + become: yes + become_method: sudo + ansible.builtin.systemd_service: + name: avahi-daemon + state: restarted diff --git a/roles/config/tasks/main.yml b/roles/config/tasks/main.yml index 8b627ce..8c60d2e 100644 --- a/roles/config/tasks/main.yml +++ b/roles/config/tasks/main.yml @@ -43,23 +43,18 @@ path: /etc/nsswitch.conf regexp: '^hosts:' line: 'hosts: files mdns4_minimal [NOTFOUND=return] dns myhostname' + notify: restart_avahi - name: Set hostname to bitb0x become: yes become_method: sudo ansible.builtin.hostname: name: bitb0x + notify: restart_avahi - name: Refresh gpg keys shell: gpg --keyserver hkps://keys.openpgp.org --refresh-keys -- name: Enable Avahi Service - become: yes - become_method: sudo - ansible.builtin.systemd_service: - name: avahi-daemon - state: restarted - - name: Enable Zerotier become: yes become_method: sudo