mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-02-01 09:21:00 +03:00
Compare commits
2 Commits
master
...
synapse-ad
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5bbb1930cb | ||
|
|
f621eb8018 |
@@ -4723,6 +4723,9 @@ matrix_synapse_admin_enabled: false
|
|||||||
|
|
||||||
matrix_synapse_admin_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_synapse_admin_docker_image_registry_prefix_upstream_default }}"
|
matrix_synapse_admin_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_synapse_admin_docker_image_registry_prefix_upstream_default }}"
|
||||||
|
|
||||||
|
matrix_synapse_admin_container_uid: "{{ matrix_user_uid }}"
|
||||||
|
matrix_synapse_admin_container_gid: "{{ matrix_user_gid }}"
|
||||||
|
|
||||||
matrix_synapse_admin_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '8766') if matrix_playbook_service_host_bind_interface_prefix else '' }}"
|
matrix_synapse_admin_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '8766') if matrix_playbook_service_host_bind_interface_prefix else '' }}"
|
||||||
|
|
||||||
matrix_synapse_admin_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
|
matrix_synapse_admin_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
|
||||||
|
|||||||
@@ -21,11 +21,14 @@ matrix_synapse_admin_base_path: "{{ matrix_base_data_path }}/synapse-admin"
|
|||||||
matrix_synapse_admin_config_path: "{{ matrix_synapse_admin_base_path }}/config"
|
matrix_synapse_admin_config_path: "{{ matrix_synapse_admin_base_path }}/config"
|
||||||
matrix_synapse_admin_docker_src_files_path: "{{ matrix_synapse_admin_base_path }}/docker-src"
|
matrix_synapse_admin_docker_src_files_path: "{{ matrix_synapse_admin_base_path }}/docker-src"
|
||||||
|
|
||||||
|
matrix_synapse_admin_container_uid: ''
|
||||||
|
matrix_synapse_admin_container_gid: ''
|
||||||
|
|
||||||
matrix_synapse_admin_container_image_self_build: false
|
matrix_synapse_admin_container_image_self_build: false
|
||||||
matrix_synapse_admin_container_image_self_build_repo: "https://github.com/etkecc/synapse-admin.git"
|
matrix_synapse_admin_container_image_self_build_repo: "https://github.com/etkecc/synapse-admin.git"
|
||||||
|
|
||||||
# renovate: datasource=docker depName=ghcr.io/etkecc/synapse-admin
|
# renovate: datasource=docker depName=ghcr.io/etkecc/synapse-admin
|
||||||
matrix_synapse_admin_version: v0.11.1-etke52
|
matrix_synapse_admin_version: v0.11.1-etke53
|
||||||
matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_registry_prefix }}etkecc/synapse-admin:{{ matrix_synapse_admin_version }}"
|
matrix_synapse_admin_docker_image: "{{ matrix_synapse_admin_docker_image_registry_prefix }}etkecc/synapse-admin:{{ matrix_synapse_admin_version }}"
|
||||||
matrix_synapse_admin_docker_image_registry_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else matrix_synapse_admin_docker_image_registry_prefix_upstream }}"
|
matrix_synapse_admin_docker_image_registry_prefix: "{{ 'localhost/' if matrix_synapse_admin_container_image_self_build else matrix_synapse_admin_docker_image_registry_prefix_upstream }}"
|
||||||
matrix_synapse_admin_docker_image_registry_prefix_upstream: "{{ matrix_synapse_admin_docker_image_registry_prefix_upstream_default }}"
|
matrix_synapse_admin_docker_image_registry_prefix_upstream: "{{ matrix_synapse_admin_docker_image_registry_prefix_upstream_default }}"
|
||||||
@@ -40,7 +43,7 @@ matrix_synapse_admin_container_network: matrix-synapse-admin
|
|||||||
# Use this to expose this container to a reverse proxy, which runs in a different container network.
|
# Use this to expose this container to a reverse proxy, which runs in a different container network.
|
||||||
matrix_synapse_admin_container_additional_networks: []
|
matrix_synapse_admin_container_additional_networks: []
|
||||||
|
|
||||||
# Controls whether the matrix-synapse-admin container exposes its HTTP port (tcp/80 in the container).
|
# Controls whether the matrix-synapse-admin container exposes its HTTP port (tcp/8080 in the container).
|
||||||
#
|
#
|
||||||
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8766"), or empty string to not expose.
|
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:8766"), or empty string to not expose.
|
||||||
matrix_synapse_admin_container_http_host_bind_port: ''
|
matrix_synapse_admin_container_http_host_bind_port: ''
|
||||||
@@ -212,15 +215,21 @@ matrix_synapse_admin_config_corsCredentials: "same-origin" # noqa var-naming
|
|||||||
|
|
||||||
# Controls the menu configuration setting, which, if defined, adds new menu items to the Synapse Admin UI.
|
# Controls the menu configuration setting, which, if defined, adds new menu items to the Synapse Admin UI.
|
||||||
# The format is a list of objects, where each object has the following keys:
|
# The format is a list of objects, where each object has the following keys:
|
||||||
# - `label` (string): The label of the menu item.
|
# - `label` (string, required): The label of the menu item.
|
||||||
# - `icon` (string): The icon of the menu item, one of the https://github.com/etkecc/synapse-admin/blob/main/src/components/icons.ts
|
# - `i18n` (dict, optional): Dictionary of translations for the label. The keys should be BCP 47 language tags (e.g., en, fr, de) supported by Synapse Admin (see src/i18n).
|
||||||
# - `url` (string): The URL of the menu item.
|
# - `icon` (string, optional): The icon of the menu item, one of the https://github.com/etkecc/synapse-admin/blob/main/src/components/icons.ts
|
||||||
|
# - `url` (string, required): The URL of the menu item.
|
||||||
# Example:
|
# Example:
|
||||||
# [
|
# [
|
||||||
# {
|
# {
|
||||||
# "label": "Contact support",
|
# "label": "Contact support",
|
||||||
|
# "i18n": {
|
||||||
|
# "de": "Support kontaktieren",
|
||||||
|
# "fr": "Contacter le support",
|
||||||
|
# "zh": "联系支持"
|
||||||
|
# },
|
||||||
# "icon": "SupportAgent",
|
# "icon": "SupportAgent",
|
||||||
# "url": "https://github.com/spantaleev/matrix-docker-ansible-deploy/issues"
|
# "url": "https://github.com/etkecc/synapse-admin/issues"
|
||||||
# }
|
# }
|
||||||
# ]
|
# ]
|
||||||
matrix_synapse_admin_config_menu: []
|
matrix_synapse_admin_config_menu: []
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ traefik.enable=true
|
|||||||
traefik.docker.network={{ matrix_synapse_admin_container_labels_traefik_docker_network }}
|
traefik.docker.network={{ matrix_synapse_admin_container_labels_traefik_docker_network }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
traefik.http.services.matrix-synapse-admin.loadbalancer.server.port=80
|
traefik.http.services.matrix-synapse-admin.loadbalancer.server.port=8080
|
||||||
|
|
||||||
{% set middlewares = [] %}
|
{% set middlewares = [] %}
|
||||||
|
|
||||||
|
|||||||
@@ -21,16 +21,14 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
|||||||
--name=matrix-synapse-admin \
|
--name=matrix-synapse-admin \
|
||||||
--log-driver=none \
|
--log-driver=none \
|
||||||
--cap-drop=ALL \
|
--cap-drop=ALL \
|
||||||
--cap-add=CHOWN \
|
--read-only \
|
||||||
--cap-add=NET_BIND_SERVICE \
|
--user={{ matrix_synapse_admin_container_user_uid }}:{{ matrix_synapse_admin_container_user_gid }} \
|
||||||
--cap-add=SETUID \
|
|
||||||
--cap-add=SETGID \
|
|
||||||
--network={{ matrix_synapse_admin_container_network }} \
|
--network={{ matrix_synapse_admin_container_network }} \
|
||||||
{% if matrix_synapse_admin_container_http_host_bind_port %}
|
{% if matrix_synapse_admin_container_http_host_bind_port %}
|
||||||
-p {{ matrix_synapse_admin_container_http_host_bind_port }}:80 \
|
-p {{ matrix_synapse_admin_container_http_host_bind_port }}:8080 \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--label-file={{ matrix_synapse_admin_base_path }}/labels \
|
--label-file={{ matrix_synapse_admin_base_path }}/labels \
|
||||||
--mount type=bind,src={{ matrix_synapse_admin_config_path }}/config.json,dst=/app/config.json,ro \
|
--mount type=bind,src={{ matrix_synapse_admin_config_path }}/config.json,dst=/var/public/config.json,ro \
|
||||||
{% for arg in matrix_synapse_admin_container_extra_arguments %}
|
{% for arg in matrix_synapse_admin_container_extra_arguments %}
|
||||||
{{ arg }} \
|
{{ arg }} \
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|||||||
Reference in New Issue
Block a user