Переглянути джерело

migrate FluffyChat to SWS; add config mounting with correct server by default

pull/4922/head
Aine 1 місяць тому
джерело
коміт
6c1ec78c59
Не вдалося знайти GPG ключ що відповідає даному підпису Ідентифікатор GPG ключа: 34969C908CCA2804
5 змінених файлів з 11 додано та 1 видалено
  1. +2
    -0
      group_vars/matrix_servers
  2. +4
    -1
      roles/custom/matrix-client-fluffychat/defaults/main.yml
  3. +1
    -0
      roles/custom/matrix-client-fluffychat/tasks/setup_install.yml
  4. +3
    -0
      roles/custom/matrix-client-fluffychat/templates/config.json.j2
  5. +1
    -0
      roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2

+ 2
- 0
group_vars/matrix_servers Переглянути файл

@@ -4221,6 +4221,8 @@ matrix_client_fluffychat_container_labels_traefik_tls_certResolver: "{{ traefik_


matrix_client_fluffychat_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}" matrix_client_fluffychat_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}"


matrix_client_fluffychat_config_defaultHomeserver: "{{ matrix_domain }}"

###################################################################### ######################################################################
# #
# /matrix-client-fluffychat # /matrix-client-fluffychat


+ 4
- 1
roles/custom/matrix-client-fluffychat/defaults/main.yml Переглянути файл

@@ -13,7 +13,7 @@ matrix_client_fluffychat_container_image_self_build_repo: "https://github.com/et
matrix_client_fluffychat_container_image_self_build_version: "{{ 'main' if matrix_client_fluffychat_version == 'latest' else matrix_client_fluffychat_version }}" matrix_client_fluffychat_container_image_self_build_version: "{{ 'main' if matrix_client_fluffychat_version == 'latest' else matrix_client_fluffychat_version }}"


# renovate: datasource=docker depName=ghcr.io/etkecc/fluffychat-web # renovate: datasource=docker depName=ghcr.io/etkecc/fluffychat-web
matrix_client_fluffychat_version: v2.4.0
matrix_client_fluffychat_version: v2.4.1
matrix_client_fluffychat_docker_image: "{{ matrix_client_fluffychat_docker_image_registry_prefix }}etkecc/fluffychat-web:{{ matrix_client_fluffychat_version }}" matrix_client_fluffychat_docker_image: "{{ matrix_client_fluffychat_docker_image_registry_prefix }}etkecc/fluffychat-web:{{ matrix_client_fluffychat_version }}"
matrix_client_fluffychat_docker_image_registry_prefix: "{{ 'localhost/' if matrix_client_fluffychat_container_image_self_build else matrix_client_fluffychat_docker_image_registry_prefix_upstream }}" matrix_client_fluffychat_docker_image_registry_prefix: "{{ 'localhost/' if matrix_client_fluffychat_container_image_self_build else matrix_client_fluffychat_docker_image_registry_prefix_upstream }}"
matrix_client_fluffychat_docker_image_registry_prefix_upstream: "{{ matrix_client_fluffychat_docker_image_registry_prefix_upstream_default }}" matrix_client_fluffychat_docker_image_registry_prefix_upstream: "{{ matrix_client_fluffychat_docker_image_registry_prefix_upstream_default }}"
@@ -148,3 +148,6 @@ matrix_client_fluffychat_path_prefix: /


# Controls whether the self-check feature should validate SSL certificates. # Controls whether the self-check feature should validate SSL certificates.
matrix_client_fluffychat_self_check_validate_certificates: true matrix_client_fluffychat_self_check_validate_certificates: true

# Controls the default homeserver domain (not URL) used in the FluffyChat Web configuration.
matrix_client_fluffychat_config_defaultHomeserver: ~

+ 1
- 0
roles/custom/matrix-client-fluffychat/tasks/setup_install.yml Переглянути файл

@@ -58,6 +58,7 @@
group: "{{ matrix_group_name }}" group: "{{ matrix_group_name }}"
with_items: with_items:
- {src: "{{ role_path }}/templates/labels.j2", name: "labels"} - {src: "{{ role_path }}/templates/labels.j2", name: "labels"}
- {src: "{{ role_path }}/templates/config.json.j2", name: "config.json"}
when: "item.src is not none" when: "item.src is not none"


- name: Ensure FluffyChat Web container network is created - name: Ensure FluffyChat Web container network is created


+ 3
- 0
roles/custom/matrix-client-fluffychat/templates/config.json.j2 Переглянути файл

@@ -0,0 +1,3 @@
{
"defaultHomeserver": {{ matrix_client_fluffychat_config_defaultHomeserver | to_json }}
}

+ 1
- 0
roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 Переглянути файл

@@ -25,6 +25,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
-p {{ matrix_client_fluffychat_container_http_host_bind_port }}:{{ matrix_client_fluffychat_container_http_port }} \ -p {{ matrix_client_fluffychat_container_http_host_bind_port }}:{{ matrix_client_fluffychat_container_http_port }} \
{% endif %} {% endif %}
--label-file={{ matrix_client_fluffychat_data_path }}/labels \ --label-file={{ matrix_client_fluffychat_data_path }}/labels \
--mount type=bind,src={{ matrix_client_fluffychat_data_path }}/config.json,dst=/var/public/config.json,ro \
--tmpfs=/tmp:rw,noexec,nosuid,size=10m \ --tmpfs=/tmp:rw,noexec,nosuid,size=10m \
{% for arg in matrix_client_fluffychat_container_extra_arguments %} {% for arg in matrix_client_fluffychat_container_extra_arguments %}
{{ arg }} \ {{ arg }} \


Завантаження…
Відмінити
Зберегти