Move matrix-bridge-mx-puppet-slack to its own container network and add native Traefik support
This commit is contained in:
parent
150a40ec26
commit
3c099541a7
@ -1733,19 +1733,35 @@ matrix_hookshot_urlprefix: "{{ 'https' if matrix_playbook_ssl_enabled else 'http
|
|||||||
# We don't enable bridges by default.
|
# We don't enable bridges by default.
|
||||||
matrix_mx_puppet_slack_enabled: false
|
matrix_mx_puppet_slack_enabled: false
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_hostname: "{{ matrix_server_fqn_matrix }}"
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_systemd_required_services_list_auto: |
|
||||||
|
{{
|
||||||
|
matrix_addons_homeserver_systemd_services_list
|
||||||
|
+
|
||||||
|
([devture_postgres_identifier ~ '.service'] if (devture_postgres_enabled and matrix_mx_puppet_slack_database_hostname == devture_postgres_connection_hostname) else [])
|
||||||
|
}}
|
||||||
|
|
||||||
matrix_mx_puppet_slack_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
|
matrix_mx_puppet_slack_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
|
||||||
|
|
||||||
matrix_mx_puppet_slack_systemd_required_services_list: |
|
matrix_mx_puppet_slack_container_network: "{{ matrix_addons_container_network }}"
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_container_additional_networks_auto: |-
|
||||||
{{
|
{{
|
||||||
['docker.service']
|
(
|
||||||
|
([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network])
|
||||||
+
|
+
|
||||||
['matrix-' + matrix_homeserver_implementation + '.service']
|
([devture_postgres_container_network] if (devture_postgres_enabled and matrix_mx_puppet_slack_database_hostname == devture_postgres_connection_hostname and matrix_mx_puppet_slack_container_network != devture_postgres_container_network) else [])
|
||||||
+
|
+
|
||||||
([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
|
([matrix_playbook_reverse_proxyable_services_additional_network] if (matrix_playbook_reverse_proxyable_services_additional_network and matrix_mx_puppet_slack_container_labels_traefik_enabled) else [])
|
||||||
+
|
) | unique
|
||||||
(['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
|
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}"
|
||||||
|
matrix_mx_puppet_slack_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}"
|
||||||
|
matrix_mx_puppet_slack_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}"
|
||||||
|
matrix_mx_puppet_slack_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}"
|
||||||
|
|
||||||
matrix_mx_puppet_slack_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mxslk.as.tok', rounds=655555) | to_uuid }}"
|
matrix_mx_puppet_slack_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'mxslk.as.tok', rounds=655555) | to_uuid }}"
|
||||||
|
|
||||||
matrix_mx_puppet_slack_homeserver_address: "{{ matrix_addons_homeserver_client_api_url }}"
|
matrix_mx_puppet_slack_homeserver_address: "{{ matrix_addons_homeserver_client_api_url }}"
|
||||||
@ -1753,6 +1769,8 @@ matrix_mx_puppet_slack_homeserver_token: "{{ '%s' | format(matrix_homeserver_gen
|
|||||||
|
|
||||||
matrix_mx_puppet_slack_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}"
|
matrix_mx_puppet_slack_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}"
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_presence_enabled: "{{ matrix_homeserver_implementation != 'synapse' or matrix_synapse_presence_enabled }}"
|
||||||
|
|
||||||
# Postgres is the default, except if not using internal Postgres server
|
# Postgres is the default, except if not using internal Postgres server
|
||||||
matrix_mx_puppet_slack_database_engine: "{{ 'postgres' if devture_postgres_enabled else 'sqlite' }}"
|
matrix_mx_puppet_slack_database_engine: "{{ 'postgres' if devture_postgres_enabled else 'sqlite' }}"
|
||||||
matrix_mx_puppet_slack_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}"
|
matrix_mx_puppet_slack_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}"
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
|
|
||||||
matrix_mx_puppet_slack_enabled: true
|
matrix_mx_puppet_slack_enabled: true
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_scheme: https
|
||||||
|
matrix_mx_puppet_slack_hostname: ''
|
||||||
|
matrix_mx_puppet_slack_path_prefix: /slack/oauth
|
||||||
|
|
||||||
matrix_mx_puppet_slack_oauth_client_id: ''
|
matrix_mx_puppet_slack_oauth_client_id: ''
|
||||||
matrix_mx_puppet_slack_oauth_client_secret: ''
|
matrix_mx_puppet_slack_oauth_client_secret: ''
|
||||||
|
|
||||||
@ -34,8 +38,9 @@ matrix_mx_puppet_slack_homeserver_address: ""
|
|||||||
matrix_mx_puppet_slack_homeserver_domain: '{{ matrix_domain }}'
|
matrix_mx_puppet_slack_homeserver_domain: '{{ matrix_domain }}'
|
||||||
matrix_mx_puppet_slack_appservice_address: 'http://matrix-mx-puppet-slack:{{ matrix_mx_puppet_slack_appservice_port }}'
|
matrix_mx_puppet_slack_appservice_address: 'http://matrix-mx-puppet-slack:{{ matrix_mx_puppet_slack_appservice_port }}'
|
||||||
|
|
||||||
matrix_mx_puppet_slack_redirect_path: '/slack/oauth'
|
matrix_mx_puppet_slack_oauth_enabled: true
|
||||||
matrix_mx_puppet_slack_redirect_uri: 'https://{{ matrix_server_fqn_matrix }}{{ matrix_mx_puppet_slack_redirect_path }}'
|
matrix_mx_puppet_slack_oauth_redirect_path: "{{ matrix_mx_puppet_slack_path_prefix }}"
|
||||||
|
matrix_mx_puppet_slack_oauth_redirect_uri: '{{ matrix_mx_puppet_slack_scheme }}://{{ matrix_mx_puppet_slack_hostname }}{{ matrix_mx_puppet_slack_oauth_redirect_path }}'
|
||||||
|
|
||||||
# "@user:server.com" to allow specific user
|
# "@user:server.com" to allow specific user
|
||||||
# "@.*:yourserver.com" to allow users on a specific homeserver
|
# "@.*:yourserver.com" to allow users on a specific homeserver
|
||||||
@ -48,11 +53,48 @@ matrix_mx_puppet_slack_provisioning_whitelist:
|
|||||||
# "@.*:yourserver.com" disallow users on a specific homeserver
|
# "@.*:yourserver.com" disallow users on a specific homeserver
|
||||||
matrix_mx_puppet_slack_provisioning_blacklist: []
|
matrix_mx_puppet_slack_provisioning_blacklist: []
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_container_network: ""
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_container_additional_networks: "{{ matrix_mx_puppet_slack_container_additional_networks_auto + matrix_mx_puppet_slack_container_additional_networks_custom }}"
|
||||||
|
matrix_mx_puppet_slack_container_additional_networks_auto: []
|
||||||
|
matrix_mx_puppet_slack_container_additional_networks_custom: []
|
||||||
|
|
||||||
|
# matrix_mx_puppet_slack_container_labels_traefik_enabled controls whether labels to assist a Traefik reverse-proxy will be attached to the container.
|
||||||
|
# See `../templates/labels.j2` for details.
|
||||||
|
#
|
||||||
|
# To inject your own other container labels, see `matrix_mx_puppet_slack_container_labels_additional_labels`.
|
||||||
|
matrix_mx_puppet_slack_container_labels_traefik_enabled: true
|
||||||
|
matrix_mx_puppet_slack_container_labels_traefik_docker_network: "{{ matrix_mx_puppet_slack_container_network }}"
|
||||||
|
matrix_mx_puppet_slack_container_labels_traefik_entrypoints: web-secure
|
||||||
|
matrix_mx_puppet_slack_container_labels_traefik_tls_certResolver: default # noqa var-naming
|
||||||
|
|
||||||
|
# Controls whether labels will be added that expose mx-puppet-slack's public endpoint
|
||||||
|
matrix_mx_puppet_slack_container_labels_public_endpoint_enabled: true
|
||||||
|
matrix_mx_puppet_slack_container_labels_public_endpoint_hostname: "{{ matrix_mx_puppet_slack_hostname }}"
|
||||||
|
matrix_mx_puppet_slack_container_labels_public_endpoint_path_prefix: "{{ matrix_mx_puppet_slack_path_prefix }}"
|
||||||
|
matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_rule: "Host(`{{ matrix_mx_puppet_slack_container_labels_public_endpoint_hostname }}`) && PathPrefix(`{{ matrix_mx_puppet_slack_container_labels_public_endpoint_path_prefix }}`)"
|
||||||
|
matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_priority: 0
|
||||||
|
matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_entrypoints: "{{ matrix_mx_puppet_slack_container_labels_traefik_entrypoints }}"
|
||||||
|
matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_tls: "{{ matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_entrypoints != 'web' }}"
|
||||||
|
matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_tls_certResolver: "{{ matrix_mx_puppet_slack_container_labels_traefik_tls_certResolver }}" # noqa var-naming
|
||||||
|
|
||||||
|
# matrix_mx_puppet_slack_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file.
|
||||||
|
# See `../templates/labels.j2` for details.
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
# matrix_mx_puppet_slack_container_labels_additional_labels: |
|
||||||
|
# my.label=1
|
||||||
|
# another.label="here"
|
||||||
|
matrix_mx_puppet_slack_container_labels_additional_labels: ''
|
||||||
|
|
||||||
# A list of extra arguments to pass to the container
|
# A list of extra arguments to pass to the container
|
||||||
matrix_mx_puppet_slack_container_extra_arguments: []
|
matrix_mx_puppet_slack_container_extra_arguments: []
|
||||||
|
|
||||||
# List of systemd services that matrix-puppet-slack.service depends on.
|
# List of systemd services that matrix-puppet-slack.service depends on.
|
||||||
matrix_mx_puppet_slack_systemd_required_services_list: ['docker.service']
|
matrix_mx_puppet_slack_systemd_required_services_list: "{{ matrix_mx_puppet_slack_systemd_required_services_list_default + matrix_mx_puppet_slack_systemd_required_services_list_auto + matrix_mx_puppet_slack_systemd_required_services_list_custom }}"
|
||||||
|
matrix_mx_puppet_slack_systemd_required_services_list_default: ['docker.service']
|
||||||
|
matrix_mx_puppet_slack_systemd_required_services_list_auto: []
|
||||||
|
matrix_mx_puppet_slack_systemd_required_services_list_custom: []
|
||||||
|
|
||||||
# List of systemd services that matrix-puppet-slack.service wants
|
# List of systemd services that matrix-puppet-slack.service wants
|
||||||
matrix_mx_puppet_slack_systemd_wanted_services_list: []
|
matrix_mx_puppet_slack_systemd_wanted_services_list: []
|
||||||
@ -63,6 +105,9 @@ matrix_mx_puppet_slack_homeserver_token: ''
|
|||||||
# Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
|
# Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
|
||||||
matrix_mx_puppet_slack_login_shared_secret: ''
|
matrix_mx_puppet_slack_login_shared_secret: ''
|
||||||
|
|
||||||
|
matrix_mx_puppet_slack_presence_enabled: true
|
||||||
|
matrix_mx_puppet_slack_presence_interval: 5000
|
||||||
|
|
||||||
# Database configuration, role uses 'sqlite' per default but playbook sets up postgres by default
|
# Database configuration, role uses 'sqlite' per default but playbook sets up postgres by default
|
||||||
matrix_mx_puppet_slack_database_engine: sqlite
|
matrix_mx_puppet_slack_database_engine: sqlite
|
||||||
|
|
||||||
|
@ -1,44 +0,0 @@
|
|||||||
---
|
|
||||||
|
|
||||||
- name: Fail if matrix-nginx-proxy role already executed
|
|
||||||
ansible.builtin.fail:
|
|
||||||
msg: >-
|
|
||||||
Trying to append Slack Appservice's reverse-proxying configuration to matrix-nginx-proxy,
|
|
||||||
but it's pointless since the matrix-nginx-proxy role had already executed.
|
|
||||||
To fix this, please change the order of roles in your playbook,
|
|
||||||
so that the matrix-nginx-proxy role would run after the matrix-mx-puppet-slack role.
|
|
||||||
when: matrix_nginx_proxy_role_executed | default(False) | bool
|
|
||||||
|
|
||||||
- name: Generate Matrix MX Puppet Slack proxying configuration for matrix-nginx-proxy
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
matrix_mx_puppet_slack_matrix_nginx_proxy_configuration: |
|
|
||||||
location {{ matrix_mx_puppet_slack_redirect_path }} {
|
|
||||||
{% if matrix_nginx_proxy_enabled | default(False) %}
|
|
||||||
{# Use the embedded DNS resolver in Docker containers to discover the service #}
|
|
||||||
resolver 127.0.0.11 valid=5s;
|
|
||||||
set $backend "{{ matrix_mx_puppet_slack_appservice_address }}";
|
|
||||||
proxy_pass $backend;
|
|
||||||
{% else %}
|
|
||||||
{# Generic configuration for use outside of our container setup #}
|
|
||||||
proxy_pass http://127.0.0.1:{{ matrix_mx_puppet_slack_appservice_port }};
|
|
||||||
{% endif %}
|
|
||||||
}
|
|
||||||
|
|
||||||
- name: Register Slack Appservice proxying configuration with matrix-nginx-proxy
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
|
|
||||||
{{
|
|
||||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks | default([])
|
|
||||||
+
|
|
||||||
[matrix_mx_puppet_slack_matrix_nginx_proxy_configuration]
|
|
||||||
}}
|
|
||||||
|
|
||||||
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
|
|
||||||
ansible.builtin.debug:
|
|
||||||
msg: >-
|
|
||||||
NOTE: You've enabled the Matrix Slack bridge but are not using the matrix-nginx-proxy
|
|
||||||
reverse proxy.
|
|
||||||
Please make sure that you're proxying the `{{ matrix_mx_puppet_slack_redirect_path }}`
|
|
||||||
URL endpoint to the matrix-mx-puppet-slack container.
|
|
||||||
You can expose the container's port using the `matrix_appservice_slack_container_http_host_bind_port` variable.
|
|
||||||
when: "not matrix_nginx_proxy_enabled | default(False) | bool"
|
|
@ -1,14 +1,5 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- tags:
|
|
||||||
- setup-all
|
|
||||||
- setup-nginx-proxy
|
|
||||||
- install-all
|
|
||||||
- install-nginx-proxy
|
|
||||||
block:
|
|
||||||
- when: matrix_mx_puppet_slack_enabled | bool
|
|
||||||
ansible.builtin.include_tasks: "{{ role_path }}/tasks/inject_into_nginx_proxy.yml"
|
|
||||||
|
|
||||||
- tags:
|
- tags:
|
||||||
- setup-all
|
- setup-all
|
||||||
- setup-mx-puppet-slack
|
- setup-mx-puppet-slack
|
||||||
|
@ -113,6 +113,21 @@
|
|||||||
owner: "{{ matrix_user_username }}"
|
owner: "{{ matrix_user_username }}"
|
||||||
group: "{{ matrix_user_groupname }}"
|
group: "{{ matrix_user_groupname }}"
|
||||||
|
|
||||||
|
- name: Ensure mx-puppet-slack support files installed
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: "{{ role_path }}/templates/{{ item }}.j2"
|
||||||
|
dest: "{{ matrix_mx_puppet_slack_base_path }}/{{ item }}"
|
||||||
|
mode: 0640
|
||||||
|
owner: "{{ matrix_user_username }}"
|
||||||
|
group: "{{ matrix_user_groupname }}"
|
||||||
|
with_items:
|
||||||
|
- labels
|
||||||
|
|
||||||
|
- name: Ensure mx-puppet-slack container network is created
|
||||||
|
community.general.docker_network:
|
||||||
|
name: "{{ matrix_mx_puppet_slack_container_network }}"
|
||||||
|
driver: bridge
|
||||||
|
|
||||||
- name: Ensure matrix-mx-puppet-slack.service installed
|
- name: Ensure matrix-mx-puppet-slack.service installed
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-mx-puppet-slack.service.j2"
|
src: "{{ role_path }}/templates/systemd/matrix-mx-puppet-slack.service.j2"
|
||||||
|
@ -6,7 +6,20 @@
|
|||||||
You need to define a required configuration setting (`{{ item.name }}`).
|
You need to define a required configuration setting (`{{ item.name }}`).
|
||||||
when: "item.when | bool and vars[item.name] == ''"
|
when: "item.when | bool and vars[item.name] == ''"
|
||||||
with_items:
|
with_items:
|
||||||
|
- {'name': 'matrix_mx_puppet_slack_hostname', when: true}
|
||||||
|
- {'name': 'matrix_mx_puppet_slack_path_prefix', when: true}
|
||||||
- {'name': 'matrix_mx_puppet_slack_appservice_token', when: true}
|
- {'name': 'matrix_mx_puppet_slack_appservice_token', when: true}
|
||||||
- {'name': 'matrix_mx_puppet_slack_homeserver_address', when: true}
|
- {'name': 'matrix_mx_puppet_slack_homeserver_address', when: true}
|
||||||
- {'name': 'matrix_mx_puppet_slack_homeserver_token', when: true}
|
- {'name': 'matrix_mx_puppet_slack_homeserver_token', when: true}
|
||||||
- {'name': 'matrix_mx_puppet_slack_database_hostname', when: "{{ matrix_mx_puppet_slack_database_engine == 'postgres' }}"}
|
- {'name': 'matrix_mx_puppet_slack_database_hostname', when: "{{ matrix_mx_puppet_slack_database_engine == 'postgres' }}"}
|
||||||
|
- {'name': 'matrix_mx_puppet_slack_container_network', when: true}
|
||||||
|
|
||||||
|
- name: (Deprecation) Catch and report renamed mx-puppet-slack settings
|
||||||
|
ansible.builtin.fail:
|
||||||
|
msg: >-
|
||||||
|
Your configuration contains a variable, which now has a different name.
|
||||||
|
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
|
||||||
|
when: "item.old in vars"
|
||||||
|
with_items:
|
||||||
|
- {'old': 'matrix_mx_puppet_slack_redirect_path', 'new': 'matrix_mx_puppet_slack_oauth_redirect_path, but setting matrix_mx_puppet_slack_path_prefix is better'}
|
||||||
|
- {'old': 'matrix_mx_puppet_slack_redirect_uri', 'new': '<matrix_mx_puppet_slack_oauth_redirect_uri, but controlling matrix_mx_puppet_slack_scheme/matrix_mx_puppet_slack_hostname/matrix_mx_puppet_slack_path_prefix is better'}
|
||||||
|
@ -17,22 +17,22 @@ bridge:
|
|||||||
|
|
||||||
# Slack OAuth settings. Create a slack app at https://api.slack.com/apps
|
# Slack OAuth settings. Create a slack app at https://api.slack.com/apps
|
||||||
oauth:
|
oauth:
|
||||||
enabled: true
|
enabled: {{ matrix_mx_puppet_slack_oauth_enabled | to_json }}
|
||||||
# Slack app credentials.
|
# Slack app credentials.
|
||||||
# N.B. This must be quoted so YAML does not parse it as a float.
|
# N.B. This must be quoted so YAML does not parse it as a float.
|
||||||
clientId: '{{ matrix_mx_puppet_slack_oauth_client_id }}'
|
clientId: '{{ matrix_mx_puppet_slack_oauth_client_id }}'
|
||||||
clientSecret: {{ matrix_mx_puppet_slack_oauth_client_secret|to_json }}
|
clientSecret: {{ matrix_mx_puppet_slack_oauth_client_secret|to_json }}
|
||||||
# Path where to listen for OAuth redirect callbacks.
|
# Path where to listen for OAuth redirect callbacks.
|
||||||
redirectPath: {{ matrix_mx_puppet_slack_redirect_path }}
|
redirectPath: {{ matrix_mx_puppet_slack_oauth_redirect_path | to_json }}
|
||||||
# Set up proxying from https://your.domain/redirect_path to http://bindAddress:port/redirect_path,
|
# Set up proxying from https://your.domain/redirect_path to http://bindAddress:port/redirect_path,
|
||||||
# then set this field and the Slack app redirect URI field to the former.
|
# then set this field and the Slack app redirect URI field to the former.
|
||||||
redirectUri: {{ matrix_mx_puppet_slack_redirect_uri }}
|
redirectUri: {{ matrix_mx_puppet_slack_oauth_redirect_uri | to_json }}
|
||||||
|
|
||||||
presence:
|
presence:
|
||||||
# Bridge Discord online/offline status
|
# Bridge Discord online/offline status
|
||||||
enabled: true
|
enabled: {{ matrix_mx_puppet_slack_presence_enabled | to_json }}
|
||||||
# How often to send status to the homeserver in milliseconds
|
# How often to send status to the homeserver in milliseconds
|
||||||
interval: 5000
|
interval: {{ matrix_mx_puppet_slack_presence_interval | to_json }}
|
||||||
|
|
||||||
provisioning:
|
provisioning:
|
||||||
# Regex of Matrix IDs allowed to use the puppet bridge
|
# Regex of Matrix IDs allowed to use the puppet bridge
|
||||||
|
@ -0,0 +1,26 @@
|
|||||||
|
{% if matrix_mx_puppet_slack_container_labels_traefik_enabled %}
|
||||||
|
traefik.enable=true
|
||||||
|
|
||||||
|
{% if matrix_mx_puppet_slack_container_labels_traefik_docker_network %}
|
||||||
|
traefik.docker.network={{ matrix_mx_puppet_slack_container_labels_traefik_docker_network }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{# Public endpoint #}
|
||||||
|
{% if matrix_mx_puppet_slack_container_labels_public_endpoint_enabled %}
|
||||||
|
traefik.http.routers.matrix-mx-puppet-slack-public.rule={{ matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_rule }}
|
||||||
|
{% if matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_priority | int > 0 %}
|
||||||
|
traefik.http.routers.matrix-mx-puppet-slack-public.priority={{ matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_priority }}
|
||||||
|
{% endif %}
|
||||||
|
traefik.http.routers.matrix-mx-puppet-slack-public.service=matrix-mx-puppet-slack
|
||||||
|
traefik.http.routers.matrix-mx-puppet-slack-public.entrypoints={{ matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_entrypoints }}
|
||||||
|
traefik.http.routers.matrix-mx-puppet-slack-public.tls={{ matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_tls | to_json }}
|
||||||
|
{% if matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_tls %}
|
||||||
|
traefik.http.routers.matrix-mx-puppet-slack-public.tls.certResolver={{ matrix_mx_puppet_slack_container_labels_public_endpoint_traefik_tls_certResolver }}
|
||||||
|
{% endif %}
|
||||||
|
traefik.http.services.matrix-mx-puppet-slack.loadbalancer.server.port={{ matrix_mx_puppet_slack_appservice_address }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{{ matrix_mx_puppet_slack_container_labels_additional_labels }}
|
@ -19,23 +19,32 @@ ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_s
|
|||||||
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
|
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
|
||||||
ExecStartPre={{ matrix_host_command_sleep }} 5
|
ExecStartPre={{ matrix_host_command_sleep }} 5
|
||||||
|
|
||||||
ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-mx-puppet-slack \
|
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
||||||
|
--rm \
|
||||||
|
--name=matrix-mx-puppet-slack \
|
||||||
--log-driver=none \
|
--log-driver=none \
|
||||||
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
||||||
--cap-drop=ALL \
|
--cap-drop=ALL \
|
||||||
--network={{ matrix_docker_network }} \
|
--network={{ matrix_mx_puppet_slack_container_network }} \
|
||||||
{% if matrix_mx_puppet_slack_container_http_host_bind_port %}
|
{% if matrix_mx_puppet_slack_container_http_host_bind_port %}
|
||||||
-p {{ matrix_mx_puppet_slack_container_http_host_bind_port }}:{{ matrix_mx_puppet_slack_appservice_port }} \
|
-p {{ matrix_mx_puppet_slack_container_http_host_bind_port }}:{{ matrix_mx_puppet_slack_appservice_port }} \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-e CONFIG_PATH=/config/config.yaml \
|
-e CONFIG_PATH=/config/config.yaml \
|
||||||
-e REGISTRATION_PATH=/config/registration.yaml \
|
-e REGISTRATION_PATH=/config/registration.yaml \
|
||||||
-v {{ matrix_mx_puppet_slack_config_path }}:/config:z \
|
--mount type=bind,src={{ matrix_mx_puppet_slack_config_path }},dst=/config \
|
||||||
-v {{ matrix_mx_puppet_slack_data_path }}:/data:z \
|
--mount type=bind,src={{ matrix_mx_puppet_slack_data_path }},dst=/data \
|
||||||
|
--label-file={{ matrix_mx_puppet_slack_base_path }}/labels \
|
||||||
{% for arg in matrix_mx_puppet_slack_container_extra_arguments %}
|
{% for arg in matrix_mx_puppet_slack_container_extra_arguments %}
|
||||||
{{ arg }} \
|
{{ arg }} \
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{{ matrix_mx_puppet_slack_docker_image }}
|
{{ matrix_mx_puppet_slack_docker_image }}
|
||||||
|
|
||||||
|
{% for network in matrix_mx_puppet_slack_container_additional_networks %}
|
||||||
|
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mx-puppet-slack
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-mx-puppet-slack
|
||||||
|
|
||||||
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-mx-puppet-slack 2>/dev/null || true'
|
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-mx-puppet-slack 2>/dev/null || true'
|
||||||
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-mx-puppet-slack 2>/dev/null || true'
|
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-mx-puppet-slack 2>/dev/null || true'
|
||||||
Restart=always
|
Restart=always
|
||||||
|
Loading…
Reference in New Issue
Block a user