finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some hardcoded matrix-postgres references

Browse Source
This commit is contained in:
Slavi Pantaleev
2022-11-27 08:23:43 +02:00
parent 04b9483f0d
commit eedf5ad94d
23 changed files with 80 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml
View File

@ -62,7 +62,7 @@ matrix_mx_puppet_steam_sqlite_database_path_in_container: "/data/database.db"
matrix_mx_puppet_steam_database_username: matrix_mx_puppet_steam
matrix_mx_puppet_steam_database_password: ~
matrix_mx_puppet_steam_database_hostname: 'matrix-postgres'
matrix_mx_puppet_steam_database_hostname: ''
matrix_mx_puppet_steam_database_port: 5432
matrix_mx_puppet_steam_database_name: matrix_mx_puppet_steam

11
roles/custom/matrix-bridge-mx-puppet-steam/tasks/validate_config.yml
View File

@ -1,10 +1,11 @@
---
- name: Fail if required settings not defined
- name: Fail if required mx-puppet-steam settings not defined
ansible.builtin.fail:
msg: >-
You need to define a required configuration setting (`{{ item }}`).
when: "vars[item] == ''"
You need to define a required configuration setting (`{{ item.name }}`).
when: "item.when | bool and vars[item.name] == ''"
with_items:
- "matrix_mx_puppet_steam_appservice_token"
- "matrix_mx_puppet_steam_homeserver_token"
- {'name': 'matrix_mx_puppet_steam_appservice_token', when: true}
- {'name': 'matrix_mx_puppet_steam_homeserver_token', when: true}
- {'name': 'matrix_mx_puppet_steam_database_hostname', when: "{{ matrix_mx_puppet_steam_database_engine == 'postgres' }}"}