From 8920985ad760c8c42df68174a22c8e664503e789 Mon Sep 17 00:00:00 2001 From: barry Date: Thu, 15 Feb 2024 15:36:02 -0600 Subject: [PATCH] Changed all data directories to ~/vol --- hosts | 2 +- roles/apps/handlers/main.yml | 7 ++++++- roles/apps/tasks/bitcoin.yml | 2 +- roles/apps/tasks/clightning.yml | 2 +- roles/apps/tasks/docs.yml | 16 ++++++++-------- roles/apps/tasks/electrs.yml | 4 ++-- .../templates/bitcoin/bitcoin-node.container.j2 | 2 +- .../clightning/clightning-node.container.j2 | 4 ++-- roles/apps/templates/docs/docs-node.container.j2 | 2 +- .../templates/electrs/electrs-node.container.j2 | 4 ++-- 10 files changed, 25 insertions(+), 20 deletions(-) diff --git a/hosts b/hosts index 2c06621..8377c93 100644 --- a/hosts +++ b/hosts @@ -48,5 +48,5 @@ update_schedule_timezone="America/Eastern" update_schedule_days=['Sat'] update_schedule_starttime="03:00" update_schedule_length=60 - +disable_rebuilds=true diff --git a/roles/apps/handlers/main.yml b/roles/apps/handlers/main.yml index 1f476ed..514f7c7 100644 --- a/roles/apps/handlers/main.yml +++ b/roles/apps/handlers/main.yml @@ -11,30 +11,35 @@ ansible.builtin.shell: chdir: ~/containers/bitcoin cmd: ./build.sh + when: disable_rebuilds != true - name: rebuild_electrs ansible.builtin.shell: chdir: ~/containers/electrs cmd: ./build.sh + when: disable_rebuilds != true - name: rebuild_clightning ansible.builtin.shell: chdir: ~/containers/clightning cmd: ./build.sh + when: disable_rebuilds != true - name: rebuild_rtl ansible.builtin.shell: chdir: ~/containers/rtl cmd: ./build.sh + when: disable_rebuilds != true - name: rebuild_docs ansible.builtin.shell: chdir: ~/containers/docs cmd: ./build.sh + when: disable_rebuilds != true - name: republish_docs ansible.builtin.shell: - chdir: ~/srv/docs + chdir: ~/vol/docs cmd: podman exec -it systemd-docs-node mkdocs build - name: reload_systemctl diff --git a/roles/apps/tasks/bitcoin.yml b/roles/apps/tasks/bitcoin.yml index 6769c85..2284a27 100644 --- a/roles/apps/tasks/bitcoin.yml +++ b/roles/apps/tasks/bitcoin.yml @@ -63,7 +63,7 @@ - name: bitcoin - Create bitcoin data / conf directory ansible.builtin.file: - path: ~/.bitcoin + path: ~/vol/bitcoin/.bitcoin state: directory mode: '0755' tags: [apps,bitcoin] diff --git a/roles/apps/tasks/clightning.yml b/roles/apps/tasks/clightning.yml index 57c2ae4..7ebf7b7 100644 --- a/roles/apps/tasks/clightning.yml +++ b/roles/apps/tasks/clightning.yml @@ -3,7 +3,7 @@ # - name: clightning - Create .clightning dir ansible.builtin.file: - path: ~/.clightning + path: ~/vol/clightning/.clightning state: directory tags: [apps,clightning] diff --git a/roles/apps/tasks/docs.yml b/roles/apps/tasks/docs.yml index f81007a..bd2bfd7 100644 --- a/roles/apps/tasks/docs.yml +++ b/roles/apps/tasks/docs.yml @@ -2,28 +2,28 @@ # tasks file for build # -- name: docs - Create ~/srv/docs +- name: docs - Create ~/vol/docs ansible.builtin.file: - path: ~/srv/docs/ + path: ~/vol/docs/ state: directory tags: [apps,docs] -- name: docs - Create ~/srv/docs/sites +- name: docs - Create ~/vol/docs/sites ansible.builtin.file: - path: ~/srv/docs/site + path: ~/vol/docs/site state: directory tags: [apps,docs] -- name: docs - Create ~/srv/docs/docs +- name: docs - Create ~/vol/docs/docs ansible.builtin.file: - path: ~/srv/docs/docs + path: ~/vol/docs/docs state: directory tags: [apps,docs] - name: docs - Copy documentation ansible.builtin.copy: src: "{{ item }}" - dest: ~/srv/docs/docs + dest: ~/vol/docs/docs with_fileglob: - "docs/docs/*" notify: republish_docs @@ -60,7 +60,7 @@ - name: docs - Copy mkdocs.yml file ansible.builtin.copy: src: docs/mkdocs.yml - dest: ~/srv/docs/mkdocs.yml + dest: ~/vol/docs/mkdocs.yml notify: rebuild_docs tags: [apps,docs] diff --git a/roles/apps/tasks/electrs.yml b/roles/apps/tasks/electrs.yml index d6154b3..d37be76 100644 --- a/roles/apps/tasks/electrs.yml +++ b/roles/apps/tasks/electrs.yml @@ -1,9 +1,9 @@ --- # tasks file for build # -- name: electrs - Create .electrs dir +- name: electrs - Create /vol/.electrs dir ansible.builtin.file: - path: ~/.electrs + path: ~/vol/.electrs state: directory tags: [apps,electrs] diff --git a/roles/apps/templates/bitcoin/bitcoin-node.container.j2 b/roles/apps/templates/bitcoin/bitcoin-node.container.j2 index 98e5b7d..88a1708 100644 --- a/roles/apps/templates/bitcoin/bitcoin-node.container.j2 +++ b/roles/apps/templates/bitcoin/bitcoin-node.container.j2 @@ -9,7 +9,7 @@ PodmanArgs=--pod bitcoin-pod Environment=RPCAUTH={{ bitcoin_rpcauth }} # Use volume -Volume=/home/{{ansible_user}}/.bitcoin:/bitcoin/.bitcoin:Z +Volume=/home/{{ansible_user}}/vol/bitcoin/.bitcoin:/bitcoin/.bitcoin:Z [Service] # Restart service when sleep finishes diff --git a/roles/apps/templates/clightning/clightning-node.container.j2 b/roles/apps/templates/clightning/clightning-node.container.j2 index 2c83b07..1aba658 100644 --- a/roles/apps/templates/clightning/clightning-node.container.j2 +++ b/roles/apps/templates/clightning/clightning-node.container.j2 @@ -7,8 +7,8 @@ PodmanArgs=--pod bitcoin-pod Exec=--bitcoin-rpcuser={{bitcoin_rpcuser}} --bitcoin-rpcpassword={{bitcoin_rpcpassword}} --clnrest-port=3010 --clnrest-host=0.0.0.0 # Use volume -Volume=/home/{{ansible_user}}/.bitcoin:/data/.bitcoin:ro,Z -Volume=/home/{{ansible_user}}/.lightning:/data/.lightning:Z +Volume=/home/{{ansible_user}}/vol/bitcoin/.bitcoin:/data/.bitcoin:ro,Z +Volume=/home/{{ansible_user}}/vol/clightning/.lightning:/data/.lightning:Z [Service] # Restart service when sleep finishes diff --git a/roles/apps/templates/docs/docs-node.container.j2 b/roles/apps/templates/docs/docs-node.container.j2 index 423fbd9..5c5a067 100644 --- a/roles/apps/templates/docs/docs-node.container.j2 +++ b/roles/apps/templates/docs/docs-node.container.j2 @@ -6,7 +6,7 @@ Image={{ registry_url }}/doc-web:1.0 PublishPort=8081:80 # Use volume -Volume=/home/{{ansible_user}}/srv/docs:/srv:Z +Volume=/home/{{ansible_user}}/vol/docs:/srv:Z [Service] # Restart service when sleep finishes diff --git a/roles/apps/templates/electrs/electrs-node.container.j2 b/roles/apps/templates/electrs/electrs-node.container.j2 index 9d0f7a1..ff01dd2 100644 --- a/roles/apps/templates/electrs/electrs-node.container.j2 +++ b/roles/apps/templates/electrs/electrs-node.container.j2 @@ -6,8 +6,8 @@ Image={{ registry_url }}/electrs:{{ electrs_version }} PodmanArgs=--pod bitcoin-pod # Use volume -Volume=/home/{{ansible_user}}/.bitcoin:/root/.bitcoin:ro,Z -Volume=/home/{{ansible_user}}/.electrs:/db:Z +Volume=/home/{{ansible_user}}/vol/bitcoin/.bitcoin:/root/.bitcoin:ro,Z +Volume=/home/{{ansible_user}}/vol/electrs/.electrs:/db:Z [Service] # Restart service when sleep finishes