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

rename matrix_appservice_polychat_matrix_port to matrix_appservice_polychat_appservice_port

pull/3257/head
Yan Minagawa 2 лет назад
Родитель
Сommit
c7796b3db1
4 измененных файлов: 11 добавлений и 9 удалений
  1. +1
    -1
      group_vars/matrix_servers
  2. +8
    -6
      roles/custom/matrix-bridge-appservice-polychat/defaults/main.yml
  3. +1
    -1
      roles/custom/matrix-bridge-appservice-polychat/templates/labels.j2
  4. +1
    -1
      roles/custom/matrix-bridge-appservice-polychat/templates/systemd/matrix-appservice-polychat.service.j2

+ 1
- 1
group_vars/matrix_servers Просмотреть файл

@@ -619,7 +619,7 @@ matrix_appservice_polychat_systemd_required_services_list_auto: |

matrix_appservice_polychat_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"

matrix_appservice_polychat_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ matrix_appservice_polychat_matrix_port) if matrix_playbook_service_host_bind_interface_prefix else '' }}"
matrix_appservice_polychat_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ matrix_appservice_polychat_appservice_port) if matrix_playbook_service_host_bind_interface_prefix else '' }}"

matrix_appservice_polychat_container_network: "{{ matrix_addons_container_network }}"



+ 8
- 6
roles/custom/matrix-bridge-appservice-polychat/defaults/main.yml Просмотреть файл

@@ -38,7 +38,7 @@ matrix_appservice_polychat_user_prefix: '@polychat_'
matrix_appservice_polychat_sender_localpart: 'polychat'

# Controls the polychat_PORT and MATRIX_PORT of the installation
matrix_appservice_polychat_matrix_port: 9998
matrix_appservice_polychat_appservice_port: 9998
matrix_appservice_polychat_api_port: 9999


@@ -83,13 +83,15 @@ matrix_appservice_polychat_container_labels_additional_labels: ''

# A list of extra arguments to pass to the container
matrix_appservice_polychat_container_extra_arguments:
- "-e API_BIND_ADDRESS=0.0.0.0"
- "-e APPSERVICE_PORT={{ $matrix_appservice_polychat_appservice_port }}"
- "-e APPSERVICE_BIND_ADDRESS=127.0.0.1"
- "-e API_PORT={{ $matrix_appservice_polychat_api_port }}"
- "-e API_BIND_ADDRESS=0.0.0.0"
- "-e APPSERVICE_BIND_ADDRESS=127.0.0.1"
- "-e APPSERVICE_PORT={{ $matrix_appservice_polychat_matrix_port }}"
- "-e DEBUG_MXID=@testuser:polychat.de"
- "-e HOMESERVER_NAME={{ matrix_domain }}"
- "-e HOMESERVER_URL={{ matrix_homeserver_url }}"
- "-e WTF=true"


# List of systemd services that matrix-appservice-polychat.service depends on.
@@ -129,12 +131,12 @@ matrix_appservice_polychat_registration_yaml: |
namespaces:
users:
- exclusive: false
regex: '" {{ $matrix_appservice_polychat_user_prefix }}*'
regex: '" {{ matrix_appservice_polychat_user_prefix }}*'
aliases:
- exclusive: true
regex: '#polychat_*'
url: "{{ matrix_appservice_polychat_appservice_url }}:{{ matrix_appservice_polychat_matrix_port }}"
sender_localpart: "{{ $matrix_appservice_polychat_sender_localpart }}"
url: "{{ matrix_appservice_polychat_appservice_url }}:{{ matrix_appservice_polychat_appservice_port }}"
sender_localpart: "{{ matrix_appservice_polychat_sender_localpart }}"
rate_limited: false
protocols: null



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

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

traefik.http.services.matrix-appservice-polychat.loadbalancer.server.port={{ matrix_appservice_polychat_matrix_port }}
traefik.http.services.matrix-appservice-polychat.loadbalancer.server.port={{ matrix_appservice_polychat_appservice_port }}

{% if matrix_appservice_polychat_container_labels_public_endpoint_enabled %}
############################################################


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

@@ -24,7 +24,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
--cap-drop=ALL \
--network={{ matrix_appservice_polychat_container_network }} \
{% if matrix_appservice_polychat_container_http_host_bind_port %}
-p {{ matrix_appservice_polychat_container_http_host_bind_port }}:{{matrix_appservice_polychat_matrix_port}} \
-p {{ matrix_appservice_polychat_container_http_host_bind_port }}:{{matrix_appservice_polychat_appservice_port}} \
{% endif %}
--mount type=bind,src={{ matrix_appservice_polychat_config_path }},dst=/config \
--mount type=bind,src={{ matrix_appservice_polychat_data_path }},dst=/data \


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