From 2b9f99568ee7d3c94b2b46719d6ee7ef4ea6f3c3 Mon Sep 17 00:00:00 2001
From: Brian Lee <blee@satstack.cloud>
Date: Tue, 18 Jul 2023 18:31:10 -0700
Subject: [PATCH] Arrange for a hostname to be written to a volume that is
 available the container.

---
 README.md                    |  3 ++-
 defaults/main.yml            |  4 ++--
 docs/examples/nginx_conf.yml |  2 +-
 tasks/main.yml               |  1 -
 tasks/podman.yml             |  7 +++----
 tasks/setup.yml              | 15 +++++++++++++++
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ef78149..10c73e4 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,9 @@ See the [defaults](defaults/main.yml) for the role.
 
 ```yaml
 samourai_dojo_version: "1.20.0"
-samourai_dojo_onion_address: "{{ lookup('ansible.builtin.env', 'SAMOURAI_DOJO_ONION') }}"
+samourai_dojo_onion_service: "{{ lookup('ansible.builtin.env', 'SAMOURAI_DOJO_ONION') }}"
 samourai_dojo_onion_port: 80
+#onion_services_path: /opt/dojo # a globally readable/writable path where the hsv3 hostname will be copied (optional)
 ```
 
 ## Example Playbook
diff --git a/defaults/main.yml b/defaults/main.yml
index 5d8eb1d..0adaba3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,8 +1,8 @@
 ---
 samourai_dojo_version: "1.20.0"
-samourai_dojo_onion_address: "{{ lookup('ansible.builtin.env', 'SAMOURAI_DOJO_ONION') | default('_') }}"
+samourai_dojo_onion_service: "{{ lookup('ansible.builtin.env', 'SAMOURAI_DOJO_ONION') | default('_') }}"
 samourai_dojo_onion_port: 80
-onion_services_path: data-tor
+samourai_dojo_onion_path: data-tor
 #samourai_dojo_https_port: 4480
 samourai_dojo_ws_http_port: 8080
 samourai_dojo_pushtx_http_port: 8081
diff --git a/docs/examples/nginx_conf.yml b/docs/examples/nginx_conf.yml
index 4f1efd8..64d0f21 100644
--- a/docs/examples/nginx_conf.yml
+++ b/docs/examples/nginx_conf.yml
@@ -66,7 +66,7 @@
                       - name: Content-Type
                         value: application/json
             - core:
-                server_name: "{{ samourai_dojo_onion_address|default('_') }}"
+                server_name: "{{ samourai_dojo_onion_service|default('_') }}"
                 listen:
                   - address: "127.0.0.1:{{ samourai_dojo_onion_port|default(80) }}"
                 send_timeout: 600s
diff --git a/tasks/main.yml b/tasks/main.yml
index e9b9e51..e74c278 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -14,7 +14,6 @@
     quiet: true
   no_log: true
   loop:
-    - "{{ samourai_dojo_onion_address }}"
     - "{{ samourai_dojo_config.NODE_API_KEY }}"
     - "{{ samourai_dojo_config.NODE_ADMIN_KEY }}"
     - "{{ samourai_dojo_config.NODE_JWT_SECRET }}"
diff --git a/tasks/podman.yml b/tasks/podman.yml
index 2bce1c1..972ff19 100644
--- a/tasks/podman.yml
+++ b/tasks/podman.yml
@@ -20,9 +20,9 @@
 - name: Dojo | Create volumes
   containers.podman.podman_volume:
     state: present
-    name: data-tor
+    name: "{{ samourai_dojo_onion_path }}"
     recreate: no
-  when: not onion_services_path.startswith('/')
+  when: not samourai_dojo_onion_path.startswith('/')
 
 - name: Dojo | Create container
   register: podman_container_output
@@ -36,8 +36,7 @@
     env: "{{ samourai_dojo_config }}"
     ports: "{{ samourai_dojo_ports }}"
     volume:
-      - /var/lib/tor/hsv3dojo/hostname:/var/lib/tor/hsv3dojo/hostname
-#     - "{{ onion_services_path }}:/var/lib/tor"
+      - "{{ samourai_dojo_onion_path }}:/var/lib/tor/hsv3dojo"
     command: /home/node/app/restart.sh
 #   command: "/home/node/app/wait-for-it.sh host.containers.internal:3306 --timeout=720 --strict -- /home/node/app/restart.sh"
 
diff --git a/tasks/setup.yml b/tasks/setup.yml
index fad6c3b..e707b50 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -31,3 +31,18 @@
     remote_src: yes
     src: "~/src/samourai-dojo/static/admin/conf/index-{{ samourai_dojo_config.COMMON_BTC_NETWORK }}.js"
     dest: ~/src/samourai-dojo/static/admin/conf/index.js
+
+- block:
+    - name: Dojo | Ensure onoion services directory exists
+      ansible.builtin.file:
+        path: "{{ samourai_dojo_onion_path }}"
+        state: directory
+        mode: '0755'
+
+    - name: Dojo | Write the hostname to a file in the samourai_dojo_onion_path
+      ansible.builtin.lineinfile:
+        path: "{{ samourai_dojo_onion_path }}/hostname"
+        line: "{{ samourai_dojo_onion_service }}"
+        create: yes
+        insertbefore: '^$' # avoid creating leading blank lines on multiple runs
+  when: samourai_dojo_onion_path.startswith('/')
\ No newline at end of file