From e81d9b8f0cf5202f0ffadcf8ca976f463a707224 Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Tue, 26 Nov 2024 19:38:55 -0500 Subject: [PATCH] feat: Changes template_dir to template in build-project --- roles/build-project/defaults/main.yml | 10 +++++----- roles/build-project/tasks/main.yml | 12 ++++++------ roles/setup-project/tasks/main.yml | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/roles/build-project/defaults/main.yml b/roles/build-project/defaults/main.yml index 37569a9..72f1838 100644 --- a/roles/build-project/defaults/main.yml +++ b/roles/build-project/defaults/main.yml @@ -5,11 +5,11 @@ build_dir: "{{ project_dir }}/{{ build_dir_name }}" project_dir: "{{ lookup('env', 'PWD') }}" project_vars_dir: "{{ project_dir }}" -# template_dir: +# template: # path: "/path/to/template/dir # vars: "repo_vars" # repo: (optional if using a repo as a template) -template_dir: +template: path: "/path/to/template/dir" vars: "repo_vars" @@ -23,9 +23,9 @@ template_dir: repo: {} copy_on_build: - - "{{ template_dir.path }}/head.tex" - - "{{ template_dir.path }}/Definitions.md" + - "{{ template.path }}/head.tex" + - "{{ template.path }}/Definitions.md" template_on_build: - "{{ project_dir }}/Report.md" - - "{{ template_dir.path }}/footer.tex" + - "{{ template.path }}/footer.tex" diff --git a/roles/build-project/tasks/main.yml b/roles/build-project/tasks/main.yml index 34dbc79..ffffe01 100644 --- a/roles/build-project/tasks/main.yml +++ b/roles/build-project/tasks/main.yml @@ -15,19 +15,19 @@ - name: Ensure template repo. ansible.builtin.git: - repo: "{{ template_dir.repo.url }}" - dest: "{{ template_dir.path }}" - version: "{{ template_dir.repo.version | default('main') }}" - when: template_dir.repo.url is defined + repo: "{{ template.repo.url }}" + dest: "{{ template.path }}" + version: "{{ template.repo.version | default('main') }}" + when: template.repo.url is defined - name: Check for repo vars directory. ansible.builtin.stat: - path: "{{ template_dir.path }}/{{ template_dir.vars }}" + path: "{{ template.path }}/{{ template.vars }}" register: repo_vars - name: Load repo vars if available. ansible.builtin.include_vars: - dir: "{{ template_dir.path }}/{{ template_dir.vars }}" + dir: "{{ template.path }}/{{ template.vars }}" when: repo_vars.stat.isdir is defined diff --git a/roles/setup-project/tasks/main.yml b/roles/setup-project/tasks/main.yml index 7133c7c..3500f99 100644 --- a/roles/setup-project/tasks/main.yml +++ b/roles/setup-project/tasks/main.yml @@ -17,12 +17,12 @@ - name: Check for repo vars directory. ansible.builtin.stat: - path: "{{ template.path }}/{{ template_dir.vars }}" + path: "{{ template.path }}/{{ template.vars }}" register: repo_vars - name: Load repo vars if available. ansible.builtin.include_vars: - dir: "{{ template.path }}/{{ template_dir.vars }}" + dir: "{{ template.path }}/{{ template.vars }}" when: repo_vars.stat.isdir is defined - name: Debug on_setup.