Skip to content
This repository was archived by the owner on May 17, 2022. It is now read-only.

Commit d9d63e2

Browse files
committed
fix: preferably use module_role_path
1 parent adffe82 commit d9d63e2

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

__tests__/test-tf-generation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
- name: Generate Caddyfile
1616
import_tasks: "../tasks/steps/generate-caddyfile-tf.yml"
1717
vars:
18-
role_path: ".."
18+
module_role_path: ".."
1919
caddy_root: "."

tasks/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
with_items: "{{ app_config.domains }}"
1212

1313
- name: Generate Caddy Terraform file
14-
include_tasks: "{{ role_path }}/tasks/steps/generate-serverconfig-tf.yml"
14+
include_tasks: "{{ module_role_path|default(role_path) }}/tasks/steps/generate-serverconfig-tf.yml"
1515

tasks/load-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
- include_vars:
3-
file: "{{ role_path }}/stackhead-module.yml"
3+
file: "{{ module_role_path|default(role_path) }}/stackhead-module.yml"
44
name: "{{ include_varname }}"

tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
- include_tasks: "{{ role_path }}/tasks/{{ stackhead_action }}.yml"
2+
- include_tasks: "{{ module_role_path|default(role_path) }}/tasks/{{ stackhead_action }}.yml"

tasks/setup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
vars:
1313
caddy_install_source: package
1414
- name: Overwrite Caddyfile
15-
include_tasks: "{{ role_path }}/tasks/steps/generate-caddyfile-tf.yml"
15+
include_tasks: "{{ module_role_path|default(role_path) }}/tasks/steps/generate-caddyfile-tf.yml"
1616
- name: Restart Caddy
1717
command: /bin/true
1818
notify:

tasks/steps/generate-caddyfile-tf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- block:
33
- template:
4-
src: "{{ role_path }}/templates/caddy/Caddyfile.j2"
4+
src: "{{ module_role_path|default(role_path) }}/templates/caddy/Caddyfile.j2"
55
dest: "{{ dest_file }}"
66
- block:
77
- slurp: src="{{ dest_file }}"

tasks/steps/generate-serverconfig-tf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- block:
33
- template:
4-
src: "{{ role_path }}/templates/terraform/caddy_server.tf.j2"
4+
src: "{{ module_role_path|default(role_path) }}/templates/terraform/caddy_server.tf.j2"
55
dest: "{{ dest_file }}"
66
force: true
77
- block:

0 commit comments

Comments
 (0)