diff --git a/ansible/roles/synapse-with-pav_jsonfile/defaults/defaults.json b/ansible/roles/synapse-with-pav_jsonfile/defaults/defaults.json index 500a7af..c9432ce 100644 --- a/ansible/roles/synapse-with-pav_jsonfile/defaults/defaults.json +++ b/ansible/roles/synapse-with-pav_jsonfile/defaults/defaults.json @@ -1,5 +1,6 @@ { - "var_synapse_with_pav_jsonfile_module_path": "/usr/lib/python3.11/matrix-synapse-pav-jsonfile.py", + "var_synapse_with_pav_jsonfile_module_directory": "/usr/lib/python3.11/", + "var_synapse_with_pav_jsonfile_module_name": "matrix-synapse-pav-jsonfile", "var_synapse_with_pav_jsonfile_conf_path": "/etc/matrix-synapse/conf.d/pav-jsonfile.yaml", "var_synapse_with_pav_jsonfile_data_path_local": null, "var_synapse_with_pav_jsonfile_data_path_remote": "/etc/matrix-synapse/users.json" diff --git a/ansible/roles/synapse-with-pav_jsonfile/tasks/main.json b/ansible/roles/synapse-with-pav_jsonfile/tasks/main.json index 1efd94a..76eebb0 100644 --- a/ansible/roles/synapse-with-pav_jsonfile/tasks/main.json +++ b/ansible/roles/synapse-with-pav_jsonfile/tasks/main.json @@ -4,7 +4,7 @@ "become": true, "ansible.builtin.copy": { "src": "module.py", - "dest": "{{var_synapse_with_pav_jsonfile_module_path}}" + "dest": "{{var_synapse_with_pav_jsonfile_module_directory}}/{{var_synapse_with_pav_jsonfile_module_name}}.py" } }, { @@ -18,7 +18,7 @@ { "name": "place user data file | fallback", "become": true, - "ansible.builtin.file": { + "ansible.builtin.copy": { "src": "data-empty.json", "dest": "{{var_synapse_with_pav_jsonfile_data_path_remote}}" } @@ -41,4 +41,3 @@ } } ] -] diff --git a/ansible/roles/synapse-with-pav_jsonfile/templates/conf.yaml.j2 b/ansible/roles/synapse-with-pav_jsonfile/templates/conf.yaml.j2 index 31b601d..b14d4c0 100644 --- a/ansible/roles/synapse-with-pav_jsonfile/templates/conf.yaml.j2 +++ b/ansible/roles/synapse-with-pav_jsonfile/templates/conf.yaml.j2 @@ -1,4 +1,4 @@ password_providers: - - module: {{var_synapse_with_pav_jsonfile_module_path}} + - module: {{var_synapse_with_pav_jsonfile_module_name}}.class_pav_jsonfile config: path: {{var_synapse_with_pav_jsonfile_data_path_remote}}