Add "Web" to Element and SchildiChat web application (#3755)
* Replace "Element" with "Element Web" - If Element indicates the web application, then it is changed to Element Web. - If it indicates clients branded with Element such as Element desktop, web, mobile clients, then it is changed to Element clients. - If it is combined with location sharing functionality, it is not changed. with other some changes, including: - Change "app.element.io" anchor link to "https://github.com/element-hq/element-web" on README.md, following other documentation files Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org> * Replace "SchildiChat" with "SchildiChat Web" - If SchildiChat indicates the web application, then it is changed to SchildiChat Web. - If it indicates clients branded with SchildiChat such as SchildiChat desktop, web, mobile clients, then it is changed to SchildiChat clients. - If it is combined with location sharing functionality, it is not changed. Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org> * Rename configuring-playbook-client-schildichat.md to configuring-playbook-client-schildichat-web.md Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org> * Rename configuring-playbook-client-element.md to configuring-playbook-client-element-web.md Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org> --------- Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org> Co-authored-by: Suguru Hirahara <acioustick@noreply.codeberg.org>
This commit is contained in:
@ -124,14 +124,14 @@ matrix_client_schildichat_floc_optout_enabled: true
|
||||
matrix_client_schildichat_hsts_preload_enabled: false
|
||||
|
||||
matrix_client_schildichat_scheme: https
|
||||
# The hostname at which SchildiChat is served.
|
||||
# The hostname at which SchildiChat Web is served.
|
||||
matrix_client_schildichat_hostname: "{{ matrix_server_fqn_schildichat }}"
|
||||
|
||||
# The path at which SchildiChat is exposed.
|
||||
# The path at which SchildiChat Web is exposed.
|
||||
# This value must either be `/` or not end with a slash (e.g. `/schildichat`).
|
||||
matrix_client_schildichat_path_prefix: /
|
||||
|
||||
# SchildiChat config.json customizations
|
||||
# SchildiChat Web config.json customizations
|
||||
matrix_client_schildichat_default_server_name: "{{ matrix_domain }}"
|
||||
matrix_client_schildichat_default_hs_url: ""
|
||||
matrix_client_schildichat_default_is_url: ~
|
||||
@ -145,9 +145,9 @@ matrix_client_schildichat_integrations_jitsi_widget_url: "https://scalar.vector.
|
||||
matrix_client_schildichat_permalink_prefix: "https://matrix.to" # noqa var-naming
|
||||
matrix_client_schildichat_bug_report_endpoint_url: "https://element.io/bugreports/submit"
|
||||
matrix_client_schildichat_show_lab_settings: true # noqa var-naming
|
||||
# SchildiChat public room directory server(s)
|
||||
# SchildiChat Web public room directory server(s)
|
||||
matrix_client_schildichat_room_directory_servers: ['matrix.org']
|
||||
# Branding of SchildiChat
|
||||
# Branding of SchildiChat Web
|
||||
matrix_client_schildichat_brand: "schildichat"
|
||||
|
||||
# URL to Logo on welcome page
|
||||
@ -171,7 +171,7 @@ matrix_client_schildichat_branding_welcome_background_url: ~ # noqa var-naming
|
||||
|
||||
matrix_client_schildichat_page_template_welcome_path: "{{ role_path }}/templates/welcome.html.j2"
|
||||
|
||||
# By default, there's no SchildiChat homepage (when logged in). If you wish to have one,
|
||||
# By default, there's no SchildiChat Web homepage (when logged in). If you wish to have one,
|
||||
# point this to a `home.html` template file on your local filesystem.
|
||||
matrix_client_schildichat_embedded_pages_home_path: ~
|
||||
|
||||
@ -189,7 +189,7 @@ matrix_client_schildichat_default_country_code: "GB"
|
||||
# Controls whether presence will be enabled
|
||||
matrix_client_schildichat_enable_presence_by_hs_url: ~
|
||||
|
||||
# Controls whether custom SchildiChat themes will be installed.
|
||||
# Controls whether custom SchildiChat Web themes will be installed.
|
||||
# When enabled, all themes found in the `matrix_client_schildichat_themes_repository_url` repository
|
||||
# will be installed and enabled automatically.
|
||||
matrix_client_schildichat_themes_enabled: false
|
||||
@ -199,16 +199,16 @@ matrix_client_schildichat_themes_repository_version: master
|
||||
# Controls the default theme
|
||||
matrix_client_schildichat_default_theme: 'light'
|
||||
|
||||
# Controls the `setting_defaults.custom_themes` setting of the SchildiChat configuration.
|
||||
# Controls the `setting_defaults.custom_themes` setting of the SchildiChat Web configuration.
|
||||
# You can use this setting to define custom themes.
|
||||
#
|
||||
# Also, look at `matrix_client_schildichat_themes_enabled` for a way to pull in a bunch of custom themes automatically.
|
||||
# If you define your own themes here and set `matrix_client_schildichat_themes_enabled: true`, your themes will be preserved as well.
|
||||
#
|
||||
# Note that for a custom theme to work well, all SchildiChat instances that you use must have the same theme installed.
|
||||
# Note that for a custom theme to work well, all SchildiChat Web instances that you use must have the same theme installed.
|
||||
matrix_client_schildichat_setting_defaults_custom_themes: [] # noqa var-naming
|
||||
|
||||
# Default SchildiChat configuration template which covers the generic use case.
|
||||
# Default SchildiChat Web configuration template which covers the generic use case.
|
||||
# You can customize it by controlling the various variables inside it.
|
||||
#
|
||||
# For a more advanced customization, you can extend the default (see `matrix_client_schildichat_configuration_extension_json`)
|
||||
@ -218,7 +218,7 @@ matrix_client_schildichat_setting_defaults_custom_themes: [] # noqa var-naming
|
||||
# This is unlike what it does when looking up YAML template files (no automatic parsing there).
|
||||
matrix_client_schildichat_configuration_default: "{{ lookup('template', 'templates/config.json.j2') }}"
|
||||
|
||||
# Your custom JSON configuration for SchildiChat should go to `matrix_client_schildichat_configuration_extension_json`.
|
||||
# Your custom JSON configuration for SchildiChat Web should go to `matrix_client_schildichat_configuration_extension_json`.
|
||||
# This configuration extends the default starting configuration (`matrix_client_schildichat_configuration_default`).
|
||||
#
|
||||
# You can override individual variables from the default configuration, or introduce new ones.
|
||||
@ -237,7 +237,7 @@ matrix_client_schildichat_configuration_extension_json: '{}'
|
||||
|
||||
matrix_client_schildichat_configuration_extension: "{{ matrix_client_schildichat_configuration_extension_json | from_json if matrix_client_schildichat_configuration_extension_json | from_json is mapping else {} }}"
|
||||
|
||||
# Holds the final SchildiChat configuration (a combination of the default and its extension).
|
||||
# Holds the final SchildiChat Web configuration (a combination of the default and its extension).
|
||||
# You most likely don't need to touch this variable. Instead, see `matrix_client_schildichat_configuration_default`.
|
||||
matrix_client_schildichat_configuration: "{{ matrix_client_schildichat_configuration_default | combine(matrix_client_schildichat_configuration_extension, recursive=True) }}"
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
---
|
||||
|
||||
#
|
||||
# Tasks related to setting up SchildiChat themes
|
||||
# Tasks related to setting up SchildiChat Web themes
|
||||
#
|
||||
|
||||
- when: matrix_client_schildichat_themes_enabled | bool
|
||||
@ -9,35 +9,35 @@
|
||||
delegate_to: 127.0.0.1
|
||||
become: false
|
||||
block:
|
||||
- name: Ensure SchildiChat themes repository is pulled
|
||||
- name: Ensure SchildiChat Web themes repository is pulled
|
||||
ansible.builtin.git:
|
||||
repo: "{{ matrix_client_schildichat_themes_repository_url }}"
|
||||
version: "{{ matrix_client_schildichat_themes_repository_version }}"
|
||||
dest: "{{ role_path }}/files/scratchpad/themes"
|
||||
|
||||
- name: Find all SchildiChat theme files
|
||||
- name: Find all SchildiChat Web theme files
|
||||
ansible.builtin.find:
|
||||
paths: "{{ role_path }}/files/scratchpad/themes"
|
||||
patterns: "*.json"
|
||||
recurse: true
|
||||
register: matrix_client_schildichat_theme_file_list
|
||||
|
||||
- name: Read SchildiChat theme
|
||||
- name: Read SchildiChat Web theme
|
||||
ansible.builtin.slurp:
|
||||
path: "{{ item.path }}"
|
||||
register: "matrix_client_schildichat_theme_file_contents"
|
||||
with_items: "{{ matrix_client_schildichat_theme_file_list.files }}"
|
||||
|
||||
- name: Load SchildiChat theme
|
||||
- name: Load SchildiChat Web theme
|
||||
ansible.builtin.set_fact:
|
||||
matrix_client_schildichat_setting_defaults_custom_themes: "{{ matrix_client_schildichat_setting_defaults_custom_themes + [item['content'] | b64decode | from_json] }}" # noqa var-naming
|
||||
with_items: "{{ matrix_client_schildichat_theme_file_contents.results }}"
|
||||
|
||||
#
|
||||
# Tasks related to getting rid of SchildiChat themes (if it was previously enabled)
|
||||
# Tasks related to getting rid of SchildiChat Web themes (if it was previously enabled)
|
||||
#
|
||||
|
||||
- name: Ensure SchildiChat themes repository is removed
|
||||
- name: Ensure SchildiChat Web themes repository is removed
|
||||
ansible.builtin.file:
|
||||
path: "{{ role_path }}/files/scratchpad/themes"
|
||||
state: absent
|
||||
|
@ -3,7 +3,7 @@
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_client_schildichat_url_endpoint_public: "{{ matrix_client_schildichat_scheme }}://{{ matrix_client_schildichat_hostname }}/config.json"
|
||||
|
||||
- name: Check SchildiChat
|
||||
- name: Check SchildiChat Web
|
||||
ansible.builtin.uri:
|
||||
url: "{{ matrix_client_schildichat_url_endpoint_public }}"
|
||||
follow_redirects: none
|
||||
@ -14,11 +14,11 @@
|
||||
delegate_to: 127.0.0.1
|
||||
become: false
|
||||
|
||||
- name: Fail if SchildiChat not working
|
||||
- name: Fail if SchildiChat Web not working
|
||||
ansible.builtin.fail:
|
||||
msg: "Failed checking SchildiChat is up at `{{ matrix_server_fqn_schildichat }}` (checked endpoint: `{{ matrix_client_schildichat_url_endpoint_public }}`). Is SchildiChat running? Is port 443 open in your firewall? Full error: {{ matrix_client_schildichat_self_check_result }}"
|
||||
msg: "Failed checking SchildiChat Web is up at `{{ matrix_server_fqn_schildichat }}` (checked endpoint: `{{ matrix_client_schildichat_url_endpoint_public }}`). Is SchildiChat Web running? Is port 443 open in your firewall? Full error: {{ matrix_client_schildichat_self_check_result }}"
|
||||
when: "matrix_client_schildichat_self_check_result.failed or 'json' not in matrix_client_schildichat_self_check_result"
|
||||
|
||||
- name: Report working SchildiChat
|
||||
- name: Report working SchildiChat Web
|
||||
ansible.builtin.debug:
|
||||
msg: "SchildiChat at `{{ matrix_server_fqn_schildichat }}` is working (checked endpoint: `{{ matrix_client_schildichat_url_endpoint_public }}`)"
|
||||
msg: "SchildiChat Web at `{{ matrix_server_fqn_schildichat }}` is working (checked endpoint: `{{ matrix_client_schildichat_url_endpoint_public }}`)"
|
||||
|
@ -1,6 +1,6 @@
|
||||
---
|
||||
|
||||
- name: Ensure SchildiChat paths exists
|
||||
- name: Ensure SchildiChat Web paths exists
|
||||
ansible.builtin.file:
|
||||
path: "{{ item.path }}"
|
||||
state: directory
|
||||
@ -12,7 +12,7 @@
|
||||
- {path: "{{ matrix_client_schildichat_docker_src_files_path }}", when: "{{ matrix_client_schildichat_container_image_self_build }}"}
|
||||
when: "item.when | bool"
|
||||
|
||||
- name: Ensure SchildiChat Docker image is pulled
|
||||
- name: Ensure SchildiChat Web Docker image is pulled
|
||||
community.docker.docker_image:
|
||||
name: "{{ matrix_client_schildichat_docker_image }}"
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
@ -24,7 +24,7 @@
|
||||
delay: "{{ devture_playbook_help_container_retries_delay }}"
|
||||
until: result is not failed
|
||||
|
||||
- name: Ensure SchildiChat repository is present on self-build
|
||||
- name: Ensure SchildiChat Web repository is present on self-build
|
||||
ansible.builtin.git:
|
||||
repo: "{{ matrix_client_schildichat_container_image_self_build_repo }}"
|
||||
dest: "{{ matrix_client_schildichat_docker_src_files_path }}"
|
||||
@ -49,7 +49,7 @@
|
||||
mode: '0644'
|
||||
when: "matrix_client_schildichat_container_image_self_build | bool and matrix_client_schildichat_container_image_self_build_low_memory_system_patch_enabled | bool"
|
||||
|
||||
- name: Ensure SchildiChat Docker image is built
|
||||
- name: Ensure SchildiChat Web Docker image is built
|
||||
ansible.builtin.command:
|
||||
cmd: |-
|
||||
{{ devture_systemd_docker_base_host_command_docker }} buildx build
|
||||
@ -59,7 +59,7 @@
|
||||
changed_when: true
|
||||
when: matrix_client_schildichat_container_image_self_build | bool
|
||||
|
||||
- name: Ensure SchildiChat configuration installed
|
||||
- name: Ensure SchildiChat Web configuration installed
|
||||
ansible.builtin.copy:
|
||||
content: "{{ matrix_client_schildichat_configuration | to_nice_json }}"
|
||||
dest: "{{ matrix_client_schildichat_data_path }}/config.json"
|
||||
@ -76,7 +76,7 @@
|
||||
owner: "{{ matrix_user_username }}"
|
||||
group: "{{ matrix_user_groupname }}"
|
||||
|
||||
- name: Ensure SchildiChat config files installed
|
||||
- name: Ensure SchildiChat Web config files installed
|
||||
ansible.builtin.template:
|
||||
src: "{{ item.src }}"
|
||||
dest: "{{ matrix_client_schildichat_data_path }}/{{ item.name }}"
|
||||
@ -89,7 +89,7 @@
|
||||
- {src: "{{ matrix_client_schildichat_embedded_pages_home_path }}", name: "home.html"}
|
||||
when: "item.src is not none"
|
||||
|
||||
- name: Ensure SchildiChat config files removed
|
||||
- name: Ensure SchildiChat Web config files removed
|
||||
ansible.builtin.file:
|
||||
path: "{{ matrix_client_schildichat_data_path }}/{{ item.name }}"
|
||||
state: absent
|
||||
@ -97,7 +97,7 @@
|
||||
- {src: "{{ matrix_client_schildichat_embedded_pages_home_path }}", name: "home.html"}
|
||||
when: "item.src is none"
|
||||
|
||||
- name: Ensure SchildiChat container network is created
|
||||
- name: Ensure SchildiChat Web container network is created
|
||||
community.general.docker_network:
|
||||
enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
|
||||
name: "{{ matrix_client_schildichat_container_network }}"
|
||||
|
@ -19,7 +19,7 @@
|
||||
path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-client-schildichat.service"
|
||||
state: absent
|
||||
|
||||
- name: Ensure SchildiChat path doesn't exist
|
||||
- name: Ensure SchildiChat Web path doesn't exist
|
||||
ansible.builtin.file:
|
||||
path: "{{ matrix_client_schildichat_data_path }}"
|
||||
state: absent
|
||||
|
@ -1,6 +1,6 @@
|
||||
---
|
||||
|
||||
- name: (Deprecation) Catch and report renamed Schildichat settings
|
||||
- name: (Deprecation) Catch and report renamed SchildiChat Web settings
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
Your configuration contains a variable, which now has a different name.
|
||||
@ -9,10 +9,10 @@
|
||||
with_items:
|
||||
- {'old': 'matrix_client_schildichat_welcome_user_id', 'new': '<removed>'}
|
||||
|
||||
- name: Fail if required SchildiChat settings not defined
|
||||
- name: Fail if required SchildiChat Web settings not defined
|
||||
ansible.builtin.fail:
|
||||
msg: >
|
||||
You need to define a required configuration setting (`{{ item }}`) for using SchildiChat.
|
||||
You need to define a required configuration setting (`{{ item }}`) for using SchildiChat Web.
|
||||
when: "vars[item] == ''"
|
||||
with_items:
|
||||
- matrix_client_schildichat_default_hs_url
|
||||
|
@ -1,6 +1,6 @@
|
||||
#jinja2: lstrip_blocks: "True"
|
||||
[Unit]
|
||||
Description=Matrix SchildiChat server
|
||||
Description=Matrix SchildiChat Web server
|
||||
{% for service in matrix_client_schildichat_systemd_required_services_list %}
|
||||
Requires={{ service }}
|
||||
After={{ service }}
|
||||
|
Reference in New Issue
Block a user