From abeef25f097a8d7746d346a2161bcbe264b00cef Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Wed, 27 Nov 2024 16:29:50 -0500
Subject: [PATCH] feat: Updates variable names

---
 justfile           | 10 +++++++++-
 project/justfile   |  1 +
 repo_vars/vars.yml | 15 ++++++++-------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/justfile b/justfile
index f43d520..4dbc84a 100644
--- a/justfile
+++ b/justfile
@@ -1,21 +1,29 @@
 playbook_dir := "${ANSIBLE_LOCAL}/ansible-hpa-playbook"
-project_files := "project_files"
+project_files := "project"
 
+[private]
+default:
+  @just --list
+
+[group('template')]
 edit-repo-vault:
   @ansible-vault edit \
     --vault-id "consults@$SCRIPTS/vault-gopass-client" \
     ./repo_vars/vault.yml
 
+[group('template')]
 create-repo-vault:
   @ansible-vault create \
     --vault-id "consults@$SCRIPTS/vault-gopass-client" \
     ./repo_vars/vault.yml
 
+[group('template')]
 edit-project-vault:
   @ansible-vault edit \
     --vault-id "consults@$SCRIPTS/vault-gopass-client" \
     {{project_files}}/vault.yml
 
+[group('project')]
 create-project dir *ARGS:
   @ansible-playbook {{playbook_dir}}/main.yml \
     --inventory {{playbook_dir}}/inventory.ini \
diff --git a/project/justfile b/project/justfile
index c636d71..ecb1b95 100644
--- a/project/justfile
+++ b/project/justfile
@@ -19,6 +19,7 @@ run_pandoc dir output_file: build
 run-playbook *ARGS:
   @ansible-playbook {{playbook_dir}}/main.yml \
     --inventory {{playbook_dir}}/inventory.ini \
+    --vault-id "consults@${SCRIPTS}/vault-gopass-client" \
     --extra-vars "output_dir={{justfile_directory()}}" \
     --extra-vars "project_dir={{justfile_directory()}}" \
     {{ARGS}}
diff --git a/repo_vars/vars.yml b/repo_vars/vars.yml
index dec422f..df7e616 100644
--- a/repo_vars/vars.yml
+++ b/repo_vars/vars.yml
@@ -3,9 +3,10 @@
 document_title: "Home Performance Report"
 
 template:
-  repo:
-    url: "https://git.housh.dev/hhe/consult-template.git"
-    version: "main"
+  #path: "{{ lookup('env', 'REPOS') }}/hhe-consult-template"
+   repo:
+     url: "https://git.housh.dev/hhe/consult-template.git"
+     version: "main"
 
 # Files to copy to the project directory when setting up a new consult project.
 #
@@ -15,7 +16,7 @@ template:
 # src: "/path/to/the/file"
 # dest: "FileName"
 # mode: '0600' # optional mode, defaults to 0600
-unsafe_copy_directory_on_setup:
+copy_directory_on_setup:
   - "project"
 
 # Files to copy to the build directory when building a consult document.
@@ -27,8 +28,8 @@ unsafe_copy_directory_on_setup:
 # dest: "Name"
 # mode: '0600' # optional mode, defaults to 0600
 copy_on_build:
-  - "{{ template_path }}/Definitions.md"
-  - "{{ template_path }}/head.tex"
+  - "{{ template_dir }}/Definitions.md"
+  - "{{ template_dir }}/head.tex"
 
 # Files to fill with their template values and copy to the build directory.
 #
@@ -39,5 +40,5 @@ copy_on_build:
 # dest: "Name"
 # mode: '0600' # optional mode, defaults to 0600
 template_on_build:
-  - "{{ template_path }}/footer.tex"
+  - "{{ template_dir }}/footer.tex"
   - "{{ project_dir }}/Report.md"