feat: use main task from StackHead module API

getstackhead · Nov 15, 2020 · b022eb5 · b022eb5
1 parent 05864a9
commit b022eb5
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 7 deletions.
diff --git a/__tests__/test-tf-generation.yml b/__tests__/test-tf-generation.yml
@@ -11,9 +11,9 @@
       with_items: "{{ app_config.domains }}"
     - block:
         - name: Generate Caddy Terraform file
-          import_tasks: "../tasks/steps/generate-serverconfig-tf.yml"
+          import_tasks: "../tasks/caddy_steps/generate-serverconfig-tf.yml"
         - name: Generate Caddyfile
-          import_tasks: "../tasks/steps/generate-caddyfile-tf.yml"
+          import_tasks: "../tasks/caddy_steps/generate-caddyfile-tf.yml"
       vars:
         role_path: ".."
         caddy_root: "."
diff --git a/tasks/steps/generate-caddyfile-tf.yml → tasks/caddy_steps/generate-caddyfile-tf.yml b/tasks/steps/generate-caddyfile-tf.yml → tasks/caddy_steps/generate-caddyfile-tf.yml
diff --git a/tasks/steps/generate-serverconfig-tf.yml → .../caddy_steps/generate-serverconfig-tf.yml b/tasks/steps/generate-serverconfig-tf.yml → .../caddy_steps/generate-serverconfig-tf.yml
diff --git a/tasks/destroy.yml b/tasks/destroy.yml
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- include_tasks: "{{ role_path }}/tasks/{{ stackhead_action }}.yml"
+- include_tasks: "{{ stackhead__roles }}/stackhead_module_api/tasks/module-main.yml"
diff --git a/tasks/deploy.yml → tasks/steps/deploy.yml b/tasks/deploy.yml → tasks/steps/deploy.yml
@@ -11,5 +11,5 @@
   with_items: "{{ app_config.domains }}"
 
 - name: Generate Caddy Terraform file
-  include_tasks: "{{ role_path }}/tasks/steps/generate-serverconfig-tf.yml"
+  include_tasks: "{{ role_path }}/tasks/caddy_steps/generate-serverconfig-tf.yml"
 
diff --git a/tasks/setup.yml → tasks/steps/setup.yml b/tasks/setup.yml → tasks/steps/setup.yml
@@ -12,7 +12,7 @@
   vars:
     caddy_install_source: package
 - name: Overwrite Caddyfile
-  include_tasks: "{{ role_path }}/tasks/steps/generate-caddyfile-tf.yml"
+  include_tasks: "{{ role_path }}/tasks/caddy_steps/generate-caddyfile-tf.yml"
 - name: Restart Caddy
   command: /bin/true
   notify: