Updates to conduit paths

roles/matrix-conduit/tasks/conduit/setup_install.yml

@@ -13,7 +13,7 @@
 - name: Ensure Conduit configuration installed
   template:
     src: "{{ role_path }}/templates/conduit/conduit.toml.j2"
-    dest: "{{ matrix_conduit_config_dir_path }}/conduit.toml"
+    dest: "{{ matrix_conduit_config_path }}/conduit.toml"
     mode: 0644
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"

roles/matrix-conduit/tasks/setup_conduit.yml

@@ -7,8 +7,20 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - {path: "{{ matrix_conduit_config_dir_path }}", when: true}
-    - {path: "{{ matrix_conduit_data_dir_path }}", when: true}
+    - {path: "{{ matrix_conduit_config_path }}", when: true}
+    - {path: "{{ matrix_conduit_data_path }}", when: true}
   when: "matrix_conduit_enabled|bool and item.when"
 
+# We do this as a separate task, because:
+# - we'd like to do it for the data path only, not for the base path (which contains root-owned environment variable files we'd like to leave as-is)
+# - matrix-postgres does something similar
+- name: Ensure Conduit data path ownership is correct
+  file:
+    path: "{{ matrix_conduit_data_path }}"
+    state: directory
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+    recurse: true
+  when: matrix_conduit_enabled|bool
+
 - import_tasks: "{{ role_path }}/tasks/conduit/setup.yml"