Bladeren bron

Merge pull request #1345 from GoMatrixHosting/gomatrixhosting-testing

GoMatrixHosting v0.6.3 [hotfix]
pull/1347/head^2
Slavi Pantaleev 4 jaren geleden
committed by GitHub
bovenliggende
commit
86614d6357
Geen bekende sleutel gevonden voor deze handtekening in de database GPG sleutel-ID: 4AEE18F83AFDEB23
2 gewijzigde bestanden met toevoegingen van 13 en 6 verwijderingen
  1. +0
    -5
      roles/matrix-awx/tasks/bridge_discord_appservice.yml
  2. +13
    -1
      roles/matrix-common-after/tasks/awx_post.yml

+ 0
- 5
roles/matrix-awx/tasks/bridge_discord_appservice.yml Bestand weergeven

@@ -11,11 +11,6 @@
'matrix_appservice_discord_client_id': '{{ matrix_appservice_discord_client_id }}'
'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
set_fact:
awx_appservice_discord_admin_rooms_array: |-


+ 13
- 1
roles/matrix-common-after/tasks/awx_post.yml Bestand weergeven

@@ -63,7 +63,19 @@
mode: '0770'
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:
msg: "{{ awx_discord_appservice_link.stdout }}"
when: awx_discord_appservice_link is defined

Laden…
Annuleren
Opslaan