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

Merge pull request #538 from izissise/slack-double-puppeting

Browse Source 
Fix missing conf for double puppeting in mx-puppet-slack
This commit is contained in:
Slavi Pantaleev 2020-06-11 12:32:47 +03:00 committed by GitHub
commit 8275739926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
View File

@ -52,6 +52,9 @@ matrix_mx_puppet_slack_systemd_wanted_services_list: []
matrix_mx_puppet_slack_appservice_token: '' matrix_mx_puppet_slack_appservice_token: ''
matrix_mx_puppet_slack_homeserver_token: '' matrix_mx_puppet_slack_homeserver_token: ''
# Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
matrix_mx_puppet_slack_login_shared_secret: ''
# Default configuration template which covers the generic use case. # Default configuration template which covers the generic use case.
# You can customize it by controlling the various variables inside it. # You can customize it by controlling the various variables inside it.
# #

4
roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2
View File

@ -9,6 +9,10 @@ bridge:
domain: {{ matrix_mx_puppet_slack_homeserver_domain }} domain: {{ matrix_mx_puppet_slack_homeserver_domain }}
# Reachable URL of the Matrix homeserver # Reachable URL of the Matrix homeserver
homeserverUrl: {{ matrix_mx_puppet_slack_homeserver_address }} homeserverUrl: {{ matrix_mx_puppet_slack_homeserver_address }}
{% if matrix_mx_puppet_slack_login_shared_secret != '' %}
loginSharedSecretMap:
{{ matrix_domain }}: {{ matrix_mx_puppet_slack_login_shared_secret }}
{% endif %}
# Slack OAuth settings. Create a slack app at https://api.slack.com/apps # Slack OAuth settings. Create a slack app at https://api.slack.com/apps