Path and name fixes

tasks/apache.yml

@@ -1,7 +1,7 @@
 ---
 - name: "Apache | Copy virtualhost configuration"
   ansible.builtin.template:
-    src: apache2.conf.j2
+    src: apache.conf.j2
     dest: "/etc/apache2/sites-available/{{ dmarcsrg_domain }}.conf"
     mode: "0644"
   notify: Reload apache2

tasks/install.yml

@@ -46,7 +46,7 @@
     - src: "{{ dmarcsrg_home }}/{{ latest_version.stdout }}"
       dest: "{{ dmarcsrg_home }}/current"
     - src: "{{ overrides_path }}/conf.php"
-      dest: "{{ dmarcsrg_home }}/{{ latest_version.stdout }}/conf.php"
+      dest: "{{ dmarcsrg_home }}/{{ latest_version.stdout }}/config/conf.php"
 
 - name: "Install | Initiate database"
   ansible.builtin.command:

tasks/user.yml

@@ -10,5 +10,5 @@
 - name: "User | Add www-data to user group"
   ansible.builtin.user:
     name: www-data
-    groups: "{{ dmarcsrg }}"
+    groups: "{{ dmarcsrg_user  }}"
     append: true

templates/conf.php.j2

@@ -7,8 +7,8 @@ $database = [
     'host'         => '{{ database_host }}',
     'type'         => 'mysql',
     'name'         => '{{ dmarcsrg_database }}',
-    'user'         => '{{ dmarcsrg_datababse }}',
+    'user'         => '{{ dmarcsrg_database }}',
-    'password'     => '{{ dmarcsrg_datababse_password }}',
+    'password'     => '{{ dmarcsrg_database_password }}',
     'table_prefix' => ''
 ];