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

Add `matrix_matrixzulipbridge_container_http_port`

Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org>
pull/4695/head
Suguru Hirahara 4 месяцев назад
committed by Suguru Hirahara
Родитель
Сommit
9dd47f4421
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: E4F9743DAB4B7B75
3 измененных файлов: 6 добавлений и 3 удалений
  1. +4
    -1
      roles/custom/matrix-bridge-matrixzulipbridge/defaults/main.yml
  2. +1
    -1
      roles/custom/matrix-bridge-matrixzulipbridge/templates/labels.j2
  3. +1
    -1
      roles/custom/matrix-bridge-matrixzulipbridge/templates/systemd/matrix-matrixzulipbridge.service.j2

+ 4
- 1
roles/custom/matrix-bridge-matrixzulipbridge/defaults/main.yml Просмотреть файл

@@ -33,6 +33,9 @@ matrix_matrixzulipbridge_base_path: "{{ matrix_base_data_path }}/matrixzulipbrid

matrix_matrixzulipbridge_container_network: ""

# The port number in the container
matrix_matrixzulipbridge_container_http_port: 9898

matrix_matrixzulipbridge_container_additional_networks: "{{ matrix_matrixzulipbridge_container_additional_networks_auto + matrix_matrixzulipbridge_container_additional_networks_custom }}"
matrix_matrixzulipbridge_container_additional_networks_auto: []
matrix_matrixzulipbridge_container_additional_networks_custom: []
@@ -106,7 +109,7 @@ matrix_matrixzulipbridge_registration_yaml_matrixzulipbridge:
# Besides registration information, it contains configuration (see the MatrixZulipBridge key).
matrix_matrixzulipbridge_registration_yaml:
id: matrixzulipbridge
url: http://matrix-matrixzulipbridge:9898
url: http://matrix-matrixzulipbridge:{{ matrix_matrixzulipbridge_container_http_port }}
as_token: "{{ matrix_matrixzulipbridge_appservice_token }}"
hs_token: "{{ matrix_matrixzulipbridge_homeserver_token }}"
rate_limited: false


+ 1
- 1
roles/custom/matrix-bridge-matrixzulipbridge/templates/labels.j2 Просмотреть файл

@@ -11,7 +11,7 @@ traefik.enable=true
traefik.docker.network={{ matrix_matrixzulipbridge_container_labels_traefik_docker_network }}
{% endif %}

traefik.http.services.matrix-matrixzulipbridge.loadbalancer.server.port=9898
traefik.http.services.matrix-matrixzulipbridge.loadbalancer.server.port={{ matrix_matrixzulipbridge_container_http_port }}

{% set middlewares = [] %}



+ 1
- 1
roles/custom/matrix-bridge-matrixzulipbridge/templates/systemd/matrix-matrixzulipbridge.service.j2 Просмотреть файл

@@ -41,7 +41,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
{% endif %}
--config /config/registration.yaml \
--listen-address 0.0.0.0 \
--listen-port 9898 \
--listen-port {{ matrix_matrixzulipbridge_container_http_port }} \
{{ matrix_matrixzulipbridge_homeserver_url }}

{% for network in matrix_matrixzulipbridge_container_additional_networks %}


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