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

Merge pull request #1345 from GoMatrixHosting/gomatrixhosting-testing

Browse Source 
GoMatrixHosting v0.6.3 [hotfix]
This commit is contained in:
Slavi Pantaleev 2021-10-20 17:04:55 +03:00 committed by GitHub
commit 86614d6357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/matrix-awx/tasks/bridge_discord_appservice.yml
View File

@ -11,11 +11,6 @@
'matrix_appservice_discord_client_id': '{{ matrix_appservice_discord_client_id }}' 'matrix_appservice_discord_client_id': '{{ matrix_appservice_discord_client_id }}'
'matrix_appservice_discord_bot_token': '{{ matrix_appservice_discord_bot_token }}' 'matrix_appservice_discord_bot_token': '{{ matrix_appservice_discord_bot_token }}'
- name: Collect discord bot invite link
shell:
cat /matrix/appservice-discord/config/invite_link
register: awx_discord_appservice_link
- name: If the raw inputs is not empty start constructing parsed awx_appservice_discord_admin_rooms list - name: If the raw inputs is not empty start constructing parsed awx_appservice_discord_admin_rooms list
set_fact: set_fact:
awx_appservice_discord_admin_rooms_array: |- awx_appservice_discord_admin_rooms_array: |-

14
roles/matrix-common-after/tasks/awx_post.yml
View File

@ -63,7 +63,19 @@
mode: '0770' mode: '0770'
when: awx_customise_base_domain_website is defined when: awx_customise_base_domain_website is defined
- name: Print Discord AppService Bot Link for user - name: Check if Discord AppService invite file exists
stat:
path: /matrix/appservice-discord/config/invite_link
register: awx_discord_appservice_link_file
when: ( awx_appservice_discord_admin_user is defined )
- name: Collect Discord AppService bot invite link if file exists
command:
cat /matrix/appservice-discord/config/invite_link
register: awx_discord_appservice_link
when: ( awx_discord_appservice_link_file.stat.exists == true ) and ( awx_appservice_discord_admin_user is defined )
- name: Print Discord AppService bot link for user
debug: debug:
msg: "{{ awx_discord_appservice_link.stdout }}" msg: "{{ awx_discord_appservice_link.stdout }}"
when: awx_discord_appservice_link is defined when: awx_discord_appservice_link is defined