refactor(roles): new variable naming standard

1 files changed, 9 insertions, 23 deletions

diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml
index 584ae0b..194f198 100644
--- a/roles/httpd/tasks/main.yml
+++ b/roles/httpd/tasks/main.yml
@@ -1,39 +1,25 @@
 ---
 
-- name: create httpd directory
+- name: create static sites directories
   ansible.builtin.file:
-    path: "{{ httpd_configuration_dir }}"
+    path: "{{ httpd_pre__sites_dir }}/{{ item.domain }}"
     state: directory
-    owner: 0
-    group: 0
-    mode: "0644"
-
-- name: create passwords directory
-  ansible.builtin.file:
-    path: "{{ httpd_passwords_dir }}"
-    state: directory
-    owner: "{{ httpd_user }}"
-    group: "{{ httpd_group }}"
-    mode: "0700"
-
-- name: create sites directory
-  ansible.builtin.file:
-    path: "{{ httpd_sites_dir }}"
-    state: directory
-    owner: 0
-    group: 0
+    owner: "{{ httpd_pre__user }}"
+    group: "{{ httpd_pre__group }}"
     mode: "0755"
+  loop: "{{ httpd__rules }}"
+  when: item.extra.type is defined and item.extra.type == "static"
 
 - name: retrieve all configuration files
   ansible.builtin.find:
-    path: "{{ httpd_configuration_dir }}"
+    path: "{{ httpd_pre__configuration_dir }}"
     patterns: "*.conf"
-  register: httpd_configuration_files
+  register: httpd__configuration_files
 
 - name: generate httpd configuration
   ansible.builtin.template:
     src: httpd.conf.j2
-    dest: "{{ httpd_configuration_file }}"
+    dest: "{{ httpd_pre__configuration_file }}"
     owner: 0
     group: 0
     mode: "0644"