From 1ecc38f9c2646f1d12da98a308040431fa672c00 Mon Sep 17 00:00:00 2001
From: Patrick Marchand <pmarchand+git@evolix.ca>
Date: Tue, 27 Aug 2019 09:45:32 -0400
Subject: [PATCH] Modified evoadmin-web template overriding variable names

Made them more in line with the rest of the role.
---
 webapps/evoadmin-web/README.md         | 8 ++++----
 webapps/evoadmin-web/defaults/main.yml | 8 ++++----
 webapps/evoadmin-web/tasks/config.yml  | 8 ++++----
 webapps/evoadmin-web/tasks/user.yml    | 4 ++--
 webapps/evoadmin-web/tasks/web.yml     | 4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/webapps/evoadmin-web/README.md b/webapps/evoadmin-web/README.md
index bf5fd03e..096a8378 100644
--- a/webapps/evoadmin-web/README.md
+++ b/webapps/evoadmin-web/README.md
@@ -3,14 +3,14 @@
 - "templates/evoadmin-web/web-add.{{ host_group }}.conf.j2"
 - "templates/evoadmin-web/web-add.conf.j2"
 And force it to update:
-	web_add_conf_force: True
+	evoadmin_add_conf_force: True
 
 # Set custom web-mail.tpl
 - "templates/evoadmin-web/web-mail.{{ inventory_hostname }}.tpl.j2"
 - "templates/evoadmin-web/web-mail.{{ host_group }}.tpl.j2"
 - "templates/evoadmin-web/web-mail.tpl.j2"
 And force it to update:
-	web_mail_tpl_force: True
+	evoadmin_mail_tpl_force: True
 
 # Set custom evoadmin.conf VHost
 - "templates/evoadmin-web/evoadmin.{{ inventory_hostname }}.conf.j2"
@@ -24,7 +24,7 @@ And force it to update:
 - "templates/evoadmin-web/config.local.{{ host_group }}.php.j2"
 - "templates/evoadmin-web/config.local.php.j2"
 And force it to update:
-	evoadmin_web_config_local_php_force: True
+	evoadmin_config_local_php_force: True
 
 # Set evoadmin-web sudoers file
 - "templates/evoadmin-web/sudoers.{{ inventory_hostname }}.j2"
@@ -32,4 +32,4 @@ And force it to update:
 - "templates/evoadmin-web/sudoers.j2"
 - "sudoers.j2"
 And force it to update:
-	evoadmin_web_sudoers_conf_force: True
\ No newline at end of file
+	evoadmin_sudoers_conf_force: True
\ No newline at end of file
diff --git a/webapps/evoadmin-web/defaults/main.yml b/webapps/evoadmin-web/defaults/main.yml
index fc77c234..b323a258 100644
--- a/webapps/evoadmin-web/defaults/main.yml
+++ b/webapps/evoadmin-web/defaults/main.yml
@@ -12,10 +12,10 @@ evoadmin_username: evoadmin
 
 evoadmin_enable_vhost: True
 evoadmin_force_vhost: False
-evoadmin_web_config_local_php_force: False
-evoadmin_web_sudoers_conf_force: False
-web_add_conf_force: False
-web_mail_tpl_force: False
+evoadmin_config_local_php_force: False
+evoadmin_sudoers_conf_force: False
+evoadmin_add_conf_force: False
+evoadmin_mail_tpl_force: False
 
 evoadmin_tpl_servername: "{{ ansible_fqdn }}"
 evoadmin_tpl_address:  "{{ ansible_default_ipv4.address }}"
diff --git a/webapps/evoadmin-web/tasks/config.yml b/webapps/evoadmin-web/tasks/config.yml
index 68423193..691287df 100644
--- a/webapps/evoadmin-web/tasks/config.yml
+++ b/webapps/evoadmin-web/tasks/config.yml
@@ -10,22 +10,22 @@
   template:
     src: "{{ item }}"
     dest: /etc/evolinux/web-add.conf
-    force: "{{ web_add_conf_force | bool }}"
+    force: "{{ evoadmin_add_conf_force | bool }}"
   with_first_found:
   - "templates/evoadmin-web/web-add.{{ inventory_hostname }}.conf.j2"
   - "templates/evoadmin-web/web-add.{{ host_group }}.conf.j2"
   - "templates/evoadmin-web/web-add.conf.j2"
   - "web-add.conf.j2"
-  register: web_add_conf_template
+  register: evoadmin__add_conf_template
 
 - name: Configure web-add template file for mail
   template:
     src: "{{ item }}"
     dest: "{{ evoadmin_scripts_dir }}/web-mail.tpl"
-    force: "{{ web_mail_tpl_force | bool }}"
+    force: "{{ evoadmin_mail_tpl_force | bool }}"
   with_first_found:
   - "templates/evoadmin-web/web-mail.{{ inventory_hostname }}.tpl.j2"
   - "templates/evoadmin-web/web-mail.{{ host_group }}.tpl.j2"
   - "templates/evoadmin-web/web-mail.tpl.j2"
   - "web-mail.tpl.j2"
-  register: web_mail_tpl_template
\ No newline at end of file
+  register: evoadmin__mail_tpl_template
\ No newline at end of file
diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml
index 08a952a2..3200693e 100644
--- a/webapps/evoadmin-web/tasks/user.yml
+++ b/webapps/evoadmin-web/tasks/user.yml
@@ -106,11 +106,11 @@
     src: "{{ item }}"
     dest: /etc/sudoers.d/evoadmin
     mode: "0600"
-    force: "{{ evoadmin_web_sudoers_conf_force | bool }}"
+    force: "{{ evoadmin_sudoers_conf_force | bool }}"
     validate: "visudo -cf %s"
   with_first_found:
   - "templates/evoadmin-web/sudoers.{{ inventory_hostname }}.j2"
   - "templates/evoadmin-web/sudoers.{{ host_group }}.j2"
   - "templates/evoadmin-web/sudoers.j2"
   - "sudoers.j2"
-  register: evoadmin_web_sudoers_conf
\ No newline at end of file
+  register: evoadmin_sudoers_conf
\ No newline at end of file
diff --git a/webapps/evoadmin-web/tasks/web.yml b/webapps/evoadmin-web/tasks/web.yml
index 8a79b8b2..4aca3ba0 100644
--- a/webapps/evoadmin-web/tasks/web.yml
+++ b/webapps/evoadmin-web/tasks/web.yml
@@ -52,10 +52,10 @@
     mode: "0640"
     owner: evoadmin
     group: evoadmin
-    force: "{{ evoadmin_web_config_local_php_force | bool }}"
+    force: "{{ evoadmin_config_local_php_force | bool }}"
   with_first_found:
   - "templates/evoadmin-web/config.local.{{ inventory_hostname }}.php.j2"
   - "templates/evoadmin-web/config.local.{{ host_group }}.php.j2"
   - "templates/evoadmin-web/config.local.php.j2"
   - "config.local.conf.j2"
-  register: evoadmin_web_config_local_php_template
\ No newline at end of file
+  register: evoadmin_config_local_php_template
\ No newline at end of file