fix: restructure entrypoint (#5)

getstackhead · Nov 15, 2020 · a611e2c · a611e2c
1 parent 64ff214
commit a611e2c
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 9 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 Nginx Server Block Terraform file
-          import_tasks: "{{ role_path }}/tasks/steps/generate-serverblock-tf.yml"
+          import_tasks: "{{ role_path }}/tasks/nginx_steps/generate-serverblock-tf.yml"
         - name: Generate htpasswd Terraform file
-          import_tasks: "{{ role_path }}/tasks/steps/generate-htpasswd-tf.yml"
+          import_tasks: "{{ role_path }}/tasks/nginx_steps/generate-htpasswd-tf.yml"
       vars:
         role_path: ".."
         nginx_usehttps: 1

diff --git a/tasks/destroy.yml b/tasks/destroy.yml
diff --git a/tasks/load-config.yml b/tasks/load-config.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/steps/generate-htpasswd-tf.yml → tasks/nginx_steps/generate-htpasswd-tf.yml b/tasks/steps/generate-htpasswd-tf.yml → tasks/nginx_steps/generate-htpasswd-tf.yml
diff --git a/tasks/steps/generate-serverblock-tf.yml → ...s/nginx_steps/generate-serverblock-tf.yml b/tasks/steps/generate-serverblock-tf.yml → ...s/nginx_steps/generate-serverblock-tf.yml
diff --git a/tasks/deploy.yml → tasks/steps/deploy.yml b/tasks/deploy.yml → tasks/steps/deploy.yml
@@ -6,10 +6,10 @@
   when: item.security is defined and item.security.authentication is defined
   with_items: "{{ app_config.domains }}"
 
-- include_tasks: "{{ role_path }}/tasks/steps/generate-htpasswd-tf.yml"
+- include_tasks: "{{ role_path }}/tasks/nginx_steps/generate-htpasswd-tf.yml"
   when: auths_basic is defined and auths_basic | length > 0
 
-- include_tasks: "{{ role_path }}/tasks/steps/generate-serverblock-tf.yml"
+- include_tasks: "{{ role_path }}/tasks/nginx_steps/generate-serverblock-tf.yml"
 
 # Generate SSL certificate configurations
 - include_tasks: "{{ stackhead__roles }}/stackhead_module_api/tasks/ssl-certificate.yml"
diff --git a/tasks/setup.yml → tasks/steps/setup.yml b/tasks/setup.yml → tasks/steps/setup.yml