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

Add missing matrix_mx_puppet_slack_container_http_host_bind_port variable

pull/457/merge
Slavi Pantaleev 5 лет назад
Родитель
Сommit
3198ed0dc9
3 измененных файлов: 10 добавлений и 2 удалений
  1. +5
    -0
      roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
  2. +2
    -2
      roles/matrix-bridge-mx-puppet-slack/tasks/init.yml
  3. +3
    -0
      roles/matrix-bridge-mx-puppet-slack/templates/systemd/matrix-mx-puppet-slack.service.j2

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

@@ -5,6 +5,11 @@ matrix_mx_puppet_slack_enabled: true

matrix_mx_puppet_slack_container_image_self_build: false

# Controls whether the mx-puppet-slack container exposes its HTTP port (tcp/8432 in the container).
#
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8432"), or empty string to not expose.
matrix_mx_puppet_slack_container_http_host_bind_port: ''

matrix_mx_puppet_slack_docker_image: "sorunome/mx-puppet-slack:latest"
matrix_mx_puppet_slack_docker_image_force_pull: "{{ matrix_mx_puppet_slack_docker_image.endswith(':latest') }}"



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

@@ -57,8 +57,8 @@
msg: >-
NOTE: You've enabled the Matrix Slack bridge but are not using the matrix-nginx-proxy
reverse proxy.
Please make sure that you're proxying the `{{ something }}`
URL endpoint to the matrix-appservice-slack container.
Please make sure that you're proxying the `{{ matrix_mx_puppet_slack_redirect_path }}`
URL endpoint to the matrix-mx-puppet-slack container.
You can expose the container's port using the `matrix_appservice_slack_container_http_host_bind_port` variable.
when: "matrix_mx_puppet_slack_enabled|bool and matrix_nginx_proxy_enabled is not defined"



+ 3
- 0
roles/matrix-bridge-mx-puppet-slack/templates/systemd/matrix-mx-puppet-slack.service.j2 Просмотреть файл

@@ -22,6 +22,9 @@ ExecStart=/usr/bin/docker run --rm --name matrix-mx-puppet-slack \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \
--network={{ matrix_docker_network }} \
{% if matrix_mx_puppet_slack_container_http_host_bind_port %}
-p {{ matrix_mx_puppet_slack_container_http_host_bind_port }}:{{ matrix_mx_puppet_slack_appservice_port }} \
{% endif %}
-e CONFIG_PATH=/config/config.yaml \
-e REGISTRATION_PATH=/config/registration.yaml \
-v {{ matrix_mx_puppet_slack_config_path }}:/config:z \


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