From 7fedca66048524b7abb54aa429dd2339e355ae2e Mon Sep 17 00:00:00 2001
From: Zuke97 <zephyrzuke@gmail.com>
Date: Fri, 17 Jan 2025 23:27:17 -0600
Subject: [PATCH] changed to saltbox facts for keys

---
 defaults/settings.yml.default       |  4 ----
 roles/hoarder/defaults/main.yml     |  4 ++--
 roles/hoarder/tasks/main.yml        | 12 ++++++++++++
 roles/meilisearch/defaults/main.yml |  2 +-
 roles/meilisearch/tasks/main.yml    | 12 ++++++++++++
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/defaults/settings.yml.default b/defaults/settings.yml.default
index c50219d98a..329a394464 100644
--- a/defaults/settings.yml.default
+++ b/defaults/settings.yml.default
@@ -85,7 +85,3 @@ transmissionvpn:
 your_spotify:
   public_key:
   secret_key:
-hoarder:
-  nextauth_secret:
-meilisearch:
-  meili_master_key:
diff --git a/roles/hoarder/defaults/main.yml b/roles/hoarder/defaults/main.yml
index 023c14b676..1dda729cdd 100644
--- a/roles/hoarder/defaults/main.yml
+++ b/roles/hoarder/defaults/main.yml
@@ -79,8 +79,8 @@ hoarder_docker_envs_default:
   HOARDER_VERSION: "release"
   MEILI_ADDR: "http://meilisearch:7700"
   BROWSER_WEB_URL: "http://chrome:9222"
-  NEXTAUTH_SECRET: "{{ hoarder.nextauth_secret | default('', true) }}"
-  MEILI_MASTER_KEY: "{{ meilisearch.meili_master_key | default('', true) }}"
+  NEXTAUTH_SECRET: "{{ hoarder_saltbox_facts.facts.secret_key }}"
+  MEILI_MASTER_KEY: "{{ meilisearch_saltbox_facts.facts.secret_key }}"
   NEXTAUTH_URL: "{{ hoarder_web_url }}"
   DATA_DIR: "/data"
 hoarder_docker_envs_custom: {}
diff --git a/roles/hoarder/tasks/main.yml b/roles/hoarder/tasks/main.yml
index d90c5426c1..811f006352 100644
--- a/roles/hoarder/tasks/main.yml
+++ b/roles/hoarder/tasks/main.yml
@@ -8,6 +8,18 @@
 #########################################################################
 # Repository: https://github.com/hoarder-app/hoarder
 ---
+- name: "Save Hoarder Saltbox Facts"
+  saltbox_facts:
+    role: "hoarder"
+    instance: "hoarder"
+    keys:
+      secret_key: "{{ hoarder.secret_key
+                   if hoarder is defined and hoarder.secret_key is defined and hoarder.secret_key | length > 0
+                   else lookup('ansible.builtin.password', '/dev/null', chars=['ascii_letters', 'digits'], length=36) }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
+  register: hoarder_saltbox_facts
+
 - name: Chrome role
   ansible.builtin.include_role:
     name: chrome
diff --git a/roles/meilisearch/defaults/main.yml b/roles/meilisearch/defaults/main.yml
index b44b8e2e7f..12779177a5 100644
--- a/roles/meilisearch/defaults/main.yml
+++ b/roles/meilisearch/defaults/main.yml
@@ -47,7 +47,7 @@ meilisearch_docker_envs_default:
   PUID: "{{ uid }}"
   PGID: "{{ gid }}"
   MEILI_NO_ANALYTICS: "true"
-  MEILI_MASTER_KEY: "{{ meilisearch.meili_master_key }}"
+  MEILI_MASTER_KEY: "{{ meilisearch_saltbox_facts.facts.secret_key }}"
 meilisearch_docker_envs_custom: {}
 meilisearch_docker_envs: "{{ meilisearch_docker_envs_default
                          | combine(meilisearch_docker_envs_custom) }}"
diff --git a/roles/meilisearch/tasks/main.yml b/roles/meilisearch/tasks/main.yml
index bbd7159905..c30ff06c35 100644
--- a/roles/meilisearch/tasks/main.yml
+++ b/roles/meilisearch/tasks/main.yml
@@ -8,6 +8,18 @@
 #########################################################################
 # Repository: https://www.meilisearch.com/
 ---
+- name: "Save Meilisearch Saltbox Facts"
+  saltbox_facts:
+    role: "meilisearch"
+    instance: "meilisearch"
+    keys:
+      secret_key: "{{ meilisearch.secret_key
+                   if meilisearch is defined and meilisearch.secret_key is defined and meilisearch.secret_key | length > 0
+                   else lookup('ansible.builtin.password', '/dev/null', chars=['ascii_letters', 'digits'], length=36) }}"
+    owner: "{{ user.name }}"
+    group: "{{ user.name }}"
+  register: meilisearch_saltbox_facts
+
 - name: Remove existing Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"