Aine 1 год назад
Родитель
Сommit
73684bf128
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 34969C908CCA2804
7 измененных файлов: 18 добавлений и 18 удалений
  1. +1
    -1
      roles/custom/matrix-base/defaults/main.yml
  2. +2
    -2
      roles/custom/matrix-client-fluffychat/defaults/main.yml
  3. +5
    -5
      roles/custom/matrix-client-fluffychat/tasks/self_check.yml
  4. +6
    -6
      roles/custom/matrix-client-fluffychat/tasks/setup_install.yml
  5. +1
    -1
      roles/custom/matrix-client-fluffychat/tasks/setup_uninstall.yml
  6. +2
    -2
      roles/custom/matrix-client-fluffychat/tasks/validate_config.yml
  7. +1
    -1
      roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2

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

@@ -80,7 +80,7 @@ matrix_server_fqn_cinny: "cinny.{{ matrix_domain }}"
# This is where you access the SchildiChat Web from (if enabled via matrix_client_schildichat_enabled; disabled by default).
matrix_server_fqn_schildichat: "schildichat.{{ matrix_domain }}"

# This is where you access the fluffychat Web from (if enabled via matrix_client_fluffychat_enabled; disabled by default).
# This is where you access the FluffyChat Web from (if enabled via matrix_client_fluffychat_enabled; disabled by default).
matrix_server_fqn_fluffychat: "fluffychat.{{ matrix_domain }}"

# This is where you access the Buscarron bot from (if enabled via matrix_bot_buscarron_enabled; disabled by default).


+ 2
- 2
roles/custom/matrix-client-fluffychat/defaults/main.yml Просмотреть файл

@@ -126,10 +126,10 @@ matrix_client_fluffychat_floc_optout_enabled: true
matrix_client_fluffychat_hsts_preload_enabled: false

matrix_client_fluffychat_scheme: https
# The hostname at which fluffychat Web is served.
# The hostname at which FluffyChat Web is served.
matrix_client_fluffychat_hostname: "{{ matrix_server_fqn_fluffychat }}"

# The path at which fluffychat Web is exposed.
# The path at which FluffyChat Web is exposed.
# This value must either be `/` or not end with a slash (e.g. `/fluffychat`).
matrix_client_fluffychat_path_prefix: /



+ 5
- 5
roles/custom/matrix-client-fluffychat/tasks/self_check.yml Просмотреть файл

@@ -3,7 +3,7 @@
- ansible.builtin.set_fact:
matrix_client_fluffychat_url_endpoint_public: "{{ matrix_client_fluffychat_scheme }}://{{ matrix_client_fluffychat_hostname }}/"

- name: Check fluffychat Web
- name: Check FluffyChat Web
ansible.builtin.uri:
url: "{{ matrix_client_fluffychat_url_endpoint_public }}"
follow_redirects: none
@@ -14,11 +14,11 @@
delegate_to: 127.0.0.1
become: false

- name: Fail if fluffychat Web not working
- name: Fail if FluffyChat Web not working
ansible.builtin.fail:
msg: "Failed checking fluffychat Web is up at `{{ matrix_server_fqn_fluffychat }}` (checked endpoint: `{{ matrix_client_fluffychat_url_endpoint_public }}`). Is fluffychat Web running? Is port 443 open in your firewall? Full error: {{ matrix_client_fluffychat_self_check_result }}"
msg: "Failed checking FluffyChat Web is up at `{{ matrix_server_fqn_fluffychat }}` (checked endpoint: `{{ matrix_client_fluffychat_url_endpoint_public }}`). Is FluffyChat Web running? Is port 443 open in your firewall? Full error: {{ matrix_client_fluffychat_self_check_result }}"
when: "matrix_client_fluffychat_self_check_result.failed or 'json' not in matrix_client_fluffychat_self_check_result"

- name: Report working fluffychat Web
- name: Report working FluffyChat Web
ansible.builtin.debug:
msg: "fluffychat Web at `{{ matrix_server_fqn_fluffychat }}` is working (checked endpoint: `{{ matrix_client_fluffychat_url_endpoint_public }}`)"
msg: "FluffyChat Web at `{{ matrix_server_fqn_fluffychat }}` is working (checked endpoint: `{{ matrix_client_fluffychat_url_endpoint_public }}`)"

+ 6
- 6
roles/custom/matrix-client-fluffychat/tasks/setup_install.yml Просмотреть файл

@@ -1,6 +1,6 @@
---

- name: Ensure fluffychat Web paths exists
- name: Ensure FluffyChat Web paths exists
ansible.builtin.file:
path: "{{ item.path }}"
state: directory
@@ -12,7 +12,7 @@
- {path: "{{ matrix_client_fluffychat_container_src_files_path }}", when: "{{ matrix_client_fluffychat_container_image_self_build }}"}
when: "item.when | bool"

- name: Ensure fluffychat Web container image is pulled
- name: Ensure FluffyChat Web container image is pulled
community.docker.docker_image:
name: "{{ matrix_client_fluffychat_docker_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -26,7 +26,7 @@

- when: "matrix_client_fluffychat_container_image_self_build | bool"
block:
- name: Ensure fluffychat Web repository is present on self-build
- name: Ensure FluffyChat Web repository is present on self-build
ansible.builtin.git:
repo: "{{ matrix_client_fluffychat_container_image_self_build_repo }}"
dest: "{{ matrix_client_fluffychat_container_src_files_path }}"
@@ -36,7 +36,7 @@
become_user: "{{ matrix_user_username }}"
register: matrix_client_fluffychat_git_pull_results

- name: Ensure fluffychat Web container image is built
- name: Ensure FluffyChat Web container image is built
ansible.builtin.command:
cmd: |-
{{ devture_systemd_docker_base_host_command_docker }} buildx build
@@ -45,7 +45,7 @@
{{ matrix_client_fluffychat_container_src_files_path }}
changed_when: true

- name: Ensure fluffychat Web config files installed
- name: Ensure FluffyChat Web config files installed
ansible.builtin.template:
src: "{{ item.src }}"
dest: "{{ matrix_client_fluffychat_data_path }}/{{ item.name }}"
@@ -56,7 +56,7 @@
- {src: "{{ role_path }}/templates/labels.j2", name: "labels"}
when: "item.src is not none"

- name: Ensure fluffychat Web container network is created
- name: Ensure FluffyChat Web container network is created
community.general.docker_network:
enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
name: "{{ matrix_client_fluffychat_container_network }}"


+ 1
- 1
roles/custom/matrix-client-fluffychat/tasks/setup_uninstall.yml Просмотреть файл

@@ -19,7 +19,7 @@
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-client-fluffychat.service"
state: absent

- name: Ensure fluffychat Web path doesn't exist
- name: Ensure FluffyChat Web path doesn't exist
ansible.builtin.file:
path: "{{ matrix_client_fluffychat_data_path }}"
state: absent

+ 2
- 2
roles/custom/matrix-client-fluffychat/tasks/validate_config.yml Просмотреть файл

@@ -1,9 +1,9 @@
---

- name: Fail if required fluffychat Web settings not defined
- name: Fail if required FluffyChat Web settings not defined
ansible.builtin.fail:
msg: >
You need to define a required configuration setting (`{{ item }}`) for using fluffychat Web.
You need to define a required configuration setting (`{{ item }}`) for using FluffyChat Web.
when: "vars[item] == ''"
with_items:
- matrix_client_fluffychat_container_network


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

@@ -1,6 +1,6 @@
#jinja2: lstrip_blocks: "True"
[Unit]
Description=Matrix fluffychat Web server
Description=Matrix FluffyChat Web server
{% for service in matrix_client_fluffychat_systemd_required_services_list %}
Requires={{ service }}
After={{ service }}


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