Просмотр исходного кода

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

Fix/mx puppet bridge
pull/457/merge
Slavi Pantaleev 5 лет назад
committed by GitHub
Родитель
Сommit
4111e42070
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 4AEE18F83AFDEB23
2 измененных файлов: 3 добавлений и 3 удалений
  1. +1
    -1
      roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
  2. +2
    -2
      roles/matrix-bridge-mx-puppet-slack/tasks/init.yml

+ 1
- 1
roles/matrix-bridge-mx-puppet-slack/defaults/main.yml Просмотреть файл

@@ -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 }}"


+ 2
- 2
roles/matrix-bridge-mx-puppet-slack/tasks/init.yml Просмотреть файл

@@ -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


Загрузка…
Отмена
Сохранить