pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #513 from joao-p-marques/fix/mx-puppet-bridge

Browse source 
Fix/mx puppet bridge
This commit is contained in:
Slavi Pantaleev 2020-05-22 10:53:37 +03:00 committed by GitHub
parent 0a9f41719f afd6d7e45a
commit 4111e42070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
View file

@ -68,7 +68,7 @@ matrix_mx_puppet_slack_configuration_yaml: |
# Slack OAuth settings. Create a slack app at https://api.slack.com/apps
oauth:
enabled: false
enabled: true
# Slack app credentials.
# N.B. This must be quoted so YAML wouldn't parse it as a float.
clientId: "{{ matrix_mx_puppet_slack_client_id }}"

4
roles/matrix-bridge-mx-puppet-slack/tasks/init.yml
View file

@ -50,7 +50,7 @@
}}
tags:
- always
when: matrix_appservice_slack_enabled|bool
when: matrix_mx_puppet_slack_enabled|bool
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
debug:
@ -60,7 +60,7 @@
Please make sure that you're proxying the `{{ something }}`
URL endpoint to the matrix-appservice-slack container.
You can expose the container's port using the `matrix_appservice_slack_container_http_host_bind_port` variable.
when: "matrix_appservice_slack_enabled|bool and matrix_nginx_proxy_enabled is not defined"
when: "matrix_mx_puppet_slack_enabled|bool and matrix_nginx_proxy_enabled is not defined"
# ansible lower than 2.8, does not support docker_image build parameters
# for self buildig it is explicitly needed, so we rather fail here