changed directory struture to "containers" (lower case)

changed .containers file to go in main containers dir changed .conf/systemd containers to be symlinks to main containers dir
2024-02-15 10:04:13 -06:00 · 2024-02-15 10:04:13 -06:00 · f0b9768a72
commit f0b9768a72
parent 36a67e91c0
7 changed files with 70 additions and 35 deletions
--- a/roles/apps/handlers/main.yml
+++ b/roles/apps/handlers/main.yml
@ -9,27 +9,27 @@

 - name: rebuild_bitcoin
  ansible.builtin.shell:
-    chdir: ~/Containers/bitcoin
+    chdir: ~/containers/bitcoin
    cmd: ./build.sh

 - name: rebuild_electrs
  ansible.builtin.shell:
-    chdir: ~/Containers/electrs
+    chdir: ~/containers/electrs
    cmd: ./build.sh

 - name: rebuild_clightning
  ansible.builtin.shell:
-    chdir: ~/Containers/clightning
+    chdir: ~/containers/clightning
    cmd: ./build.sh

 - name: rebuild_rtl
  ansible.builtin.shell:
-    chdir: ~/Containers/rtl
+    chdir: ~/containers/rtl
    cmd: ./build.sh

 - name: rebuild_docs
  ansible.builtin.shell:
-    chdir: ~/Containers/docs
+    chdir: ~/containers/docs
    cmd: ./build.sh

 - name: republish_docs
--- a/roles/apps/tasks/bitcoin.yml
+++ b/roles/apps/tasks/bitcoin.yml
@ -1,6 +1,7 @@
 ---
 # tasks file for build
 #
+# /home/{{ ansible_user }}/.config/containers/systemd/bitcoin-node.container
 - name: bitcoin - Check rpcauth
  block:
  - name: Generate rpcauth information if unset
@ -76,52 +77,59 @@
 - name: bitcoin - Copy bitcoin-node.container file
  ansible.builtin.template:
    src: bitcoin/bitcoin-node.container.j2
-    dest: /home/{{ ansible_user }}/.config/containers/systemd/bitcoin-node.container
+    dest: ~/containers/bitcoin/bitcoin-node.container
  notify: 
    - reload_systemctl
    - restart_bitcoin
  tags: [apps,bitcoin]

- name: bitcoin - Create Containers/bitcoin Dir
+- name: bitcoin - Link bitcoin-node.container to systemd location
  ansible.builtin.file:
-    path: ~/Containers/bitcoin/bin
+    src: ~/containers/bitcoin/bitcoin-node.container
+    dest: ~/.config/containers/systemd/bitcoin-node.container
+    state: link
+    force: true
+
+- name: bitcoin - Create containers/bitcoin Dir
+  ansible.builtin.file:
+    path: ~/containers/bitcoin/bin
    recurse: true
    state: directory
  notify: rebuild_bitcoin
  tags: [apps,bitcoin]

- name: bitcoin - Copy Containerfile Template
+- name: bitcoin - Copy containerfile Template
  ansible.builtin.copy:
    src: bitcoin/Containerfile
-    dest: ~/Containers/bitcoin/Containerfile
+    dest: ~/containers/bitcoin/Containerfile
  notify: rebuild_bitcoin
  tags: [apps,bitcoin]

 - name: bitcoin - Copy entrypoint.sh
  ansible.builtin.copy:
    src: bitcoin/entrypoint.sh
-    dest: ~/Containers/bitcoin/entrypoint.sh
+    dest: ~/containers/bitcoin/entrypoint.sh
  notify: rebuild_bitcoin
  tags: [apps,bitcoin]

 - name: bitcoin - Copy btc_init
  ansible.builtin.copy:
    src: bitcoin/bin/btc_init
-    dest: ~/Containers/bitcoin/bin/btc_init
+    dest: ~/containers/bitcoin/bin/btc_init
  notify: rebuild_bitcoin
  tags: [apps,bitcoin]

 - name: bitcoin - Copy btc_oneshot
  ansible.builtin.template:
    src: bitcoin/bin/btc_oneshot.j2
-    dest: ~/Containers/bitcoin/bin/btc_oneshot
+    dest: ~/containers/bitcoin/bin/btc_oneshot
  notify: rebuild_bitcoin
  tags: [apps,bitcoin]
  
 - name: bitcoin - Copy build script
  ansible.builtin.template:
    src: bitcoin/build.sh.j2
-    dest: ~/Containers/bitcoin/build.sh
+    dest: ~/containers/bitcoin/build.sh
    mode: '0700'
  notify: rebuild_bitcoin
  tags: [apps,bitcoin]
@ -129,6 +137,6 @@
 - name: bitcoin - copy rpcauth.py utility
  ansible.builtin.copy:
    src: bitcoin/rpcauth.py
-    dest: ~/Containers/bitcoin/rpcauth.py
+    dest: ~/containers/bitcoin/rpcauth.py
    mode: '0700'
  tags: [apps,bitcoin]
--- a/roles/apps/tasks/clightning.yml
+++ b/roles/apps/tasks/clightning.yml
@ -10,13 +10,20 @@
 - name: clightning - Copy clightning-node.container file
  ansible.builtin.template:
    src: clightning/clightning-node.container.j2
-    dest: /home/{{ ansible_user }}/.config/containers/systemd/clightning-node.container
+    dest: ~/containers/clightning/clightning-node.container
  notify: reload_systemctl
  tags: [apps,clightning]

+- name: clightning - Link clightning-node.container to systemd location
+  ansible.builtin.file:
+    src: ~/containers/clightning/clightning-node.container
+    dest: ~/.config/containers/systemd/clightning-node.container
+    state: link
+    force: true
+
 - name: clightning - Create Containers/bitcoin Dir
  ansible.builtin.file:
-    path: ~/Containers/clightning
+    path: ~/containers/clightning
    recurse: true
    state: directory
  notify: rebuild_clightning
@ -25,20 +32,20 @@
 - name: clightning - Copy Containerfile Template
  ansible.builtin.template:
    src: clightning/Containerfile.j2
-    dest: ~/Containers/clightning/Containerfile
+    dest: ~/containers/clightning/Containerfile
  notify: rebuild_clightning
  tags: [apps,clightning]

 - name: clightning - Copy entrypoint.sh
  ansible.builtin.copy:
    src: clightning/entrypoint.sh
-    dest: ~/Containers/clightning/entrypoint.sh
+    dest: ~/containers/clightning/entrypoint.sh
  tags: [apps,clightning]

 - name: clightning - Copy build script
  ansible.builtin.template:
    src: clightning/build.sh.j2
-    dest: ~/Containers/clightning/build.sh
+    dest: ~/containers/clightning/build.sh
    mode: '0700'
  notify: rebuild_clightning
  tags: [apps,clightning]
--- a/roles/apps/tasks/docs.yml
+++ b/roles/apps/tasks/docs.yml
@ -31,21 +31,21 @@

 - name: docs - Make dir for docs Containers
  ansible.builtin.file:
-    path: ~/Containers/docs
+    path: ~/containers/docs
    state: directory
  tags: [apps,docs]

 - name: docs - Copy Containerfile Template
  ansible.builtin.copy:
    src: docs/Containerfile
-    dest: ~/Containers/docs/Containerfile
+    dest: ~/containers/docs/Containerfile
  notify: rebuild_docs
  tags: [apps,docs]

 - name: docs - Copy build script
  ansible.builtin.copy:
    src: docs/build.sh
-    dest: ~/Containers/docs/build.sh
+    dest: ~/containers/docs/build.sh
    mode: '0700'
  notify: rebuild_docs
  tags: [apps,docs]
@ -53,7 +53,7 @@
 - name: docs - Copy requirements.txt file
  ansible.builtin.copy:
    src: docs/requirements.txt
-    dest: ~/Containers/docs/requirements.txt
+    dest: ~/containers/docs/requirements.txt
  notify: rebuild_docs
  tags: [apps,docs]

@ -67,6 +67,13 @@
 - name: docs - Copy docs-node.container file
  ansible.builtin.template:
    src: docs/docs-node.container.j2
-    dest: /home/{{ ansible_user }}/.config/containers/systemd/docs-node.container
+    dest: ~/containers/docs/docs-node.container
  notify: reload_systemctl
  tags: [apps,docs]
+
+- name: docs - Link docs-node.container to systemd location
+  ansible.builtin.file:
+    src: ~/containers/docs/docs-node.container
+    dest: ~/.config/containers/systemd/docs-node.container
+    state: link
+    force: true
--- a/roles/apps/tasks/electrs.yml
+++ b/roles/apps/tasks/electrs.yml
@ -10,13 +10,20 @@
 - name: electrs - Copy electrs-node.container file
  ansible.builtin.template:
    src: electrs/electrs-node.container.j2
-    dest: /home/{{ ansible_user }}/.config/containers/systemd/electrs-node.container
+    dest: ~/containers/electrs/electrs-node.container
  notify: reload_systemctl
  tags: [apps,electrs]

+- name: electrs - Link electrs-node.container to systemd location
+  ansible.builtin.file:
+    src: ~/containers/electrs/electrs-node.container
+    dest: ~/.config/containers/systemd/electrs-node.container
+    state: link
+    force: true
+
 - name: electrs - Create Containers/bitcoin Dir
  ansible.builtin.file:
-    path: ~/Containers/electrs
+    path: ~/containers/electrs
    recurse: true
    state: directory
  notify: rebuild_electrs
@ -25,20 +32,20 @@
 - name: electrs - Copy Containerfile Template
  ansible.builtin.template:
    src: electrs/Containerfile.j2
-    dest: ~/Containers/electrs/Containerfile
+    dest: ~/containers/electrs/Containerfile
  notify: rebuild_electrs
  tags: [apps,electrs]

 - name: electrs - Copy electrs-init.sh
  ansible.builtin.template:
    src: electrs/electrs-init.sh.j2
-    dest: ~/Containers/electrs/electrs-init.sh
+    dest: ~/containers/electrs/electrs-init.sh
  tags: [apps,electrs]

 - name: electrs - Copy build script
  ansible.builtin.template:
    src: electrs/build.sh.j2
-    dest: ~/Containers/electrs/build.sh
+    dest: ~/containers/electrs/build.sh
    mode: '0700'
  notify: rebuild_electrs
  tags: [apps,electrs]
--- a/roles/apps/tasks/rtl.yml
+++ b/roles/apps/tasks/rtl.yml
@ -1,7 +1,7 @@

 - name: rtl - Create Containers/rtl Dir
  ansible.builtin.file:
-    path: ~/Containers/rtl
+    path: ~/containers/rtl
    recurse: true
    state: directory
  notify: rebuild_rtl
@ -10,14 +10,14 @@
 - name: rtl - Copy Containerfile Template
  ansible.builtin.template:
    src: rtl/Containerfile.j2
-    dest: ~/Containers/rtl/Containerfile
+    dest: ~/containers/rtl/Containerfile
  notify: rebuild_rtl
  tags: [apps,rtl]

 - name: rtl - Copy Containerfile build.sh
  ansible.builtin.template:
    src: rtl/build.sh.j2
-    dest: ~/Containers/rtl/build.sh
+    dest: ~/containers/rtl/build.sh
    mode: '0700'
  notify: rebuild_rtl
  tags: [apps,rtl]
@ -25,7 +25,13 @@
 - name: rtl - Copy rtl-node.container file
  ansible.builtin.template:
    src: rtl/rtl-node.container.j2
-    dest: /home/{{ ansible_user }}/.config/containers/systemd/rtl-node.container
+    dest: ~/containers/rtl/rtl-node.container
  notify: reload_systemctl
  tags: [apps,rtl]

+- name: rtl - Link rtl-node.container to systemd location
+  ansible.builtin.file:
+    src: ~/containers/rtl/rtl-node.container
+    dest: ~/.config/containers/systemd/rtl-node.container
+    state: link
+    force: true
--- a/roles/apps/templates/clightning/build.sh.j2
+++ b/roles/apps/templates/clightning/build.sh.j2
@ -5,5 +5,5 @@
 # Distributed under terms of the MIT license.
 #

-buildah bud -f Containerfile -t clightning-node:{{clightning_version}}
+buildah bud -f Containerfile -t clightning:{{clightning_version}}