12867e9f18
Since the switch from `-v` to `--mount` (in 1fca917ad1),
we've regressed when `matrix_ssl_retrieval_method == 'none'`.
In such a case, we don't create `/matrix/ssl` directories at all
and shouldn't be trying to mount them into the `matrix-nginx-proxy`
container.
Previously, with `-v`, Docker would auto-create them, effectively hiding
our mistake. Now that `--mount` doesn't do such auto-creation magic,
the `matrix-nginx-proxy` container was failing to start.
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/734
57 lines
2.4 KiB
Django/Jinja
57 lines
2.4 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
[Unit]
|
|
Description=Matrix nginx-proxy server
|
|
{% for service in matrix_nginx_proxy_systemd_required_services_list %}
|
|
Requires={{ service }}
|
|
After={{ service }}
|
|
{% endfor %}
|
|
{% for service in matrix_nginx_proxy_systemd_wanted_services_list %}
|
|
Wants={{ service }}
|
|
{% endfor %}
|
|
|
|
[Service]
|
|
Type=simple
|
|
ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-nginx-proxy
|
|
ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-nginx-proxy
|
|
|
|
ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-nginx-proxy \
|
|
--log-driver=none \
|
|
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
|
|
--cap-drop=ALL \
|
|
--read-only \
|
|
--tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_nginx_proxy_tmp_directory_size_mb }}m \
|
|
--network={{ matrix_docker_network }} \
|
|
{% if matrix_nginx_proxy_container_http_host_bind_port %}
|
|
-p {{ matrix_nginx_proxy_container_http_host_bind_port }}:8080 \
|
|
{% endif %}
|
|
{% if matrix_nginx_proxy_https_enabled and matrix_nginx_proxy_container_https_host_bind_port %}
|
|
-p {{ matrix_nginx_proxy_container_https_host_bind_port }}:8443 \
|
|
{% endif %}
|
|
{% if matrix_nginx_proxy_proxy_matrix_federation_api_enabled and matrix_nginx_proxy_container_federation_host_bind_port %}
|
|
-p {{ matrix_nginx_proxy_container_federation_host_bind_port }}:8448 \
|
|
{% endif %}
|
|
--mount type=bind,src={{ matrix_nginx_proxy_base_path }}/nginx.conf,dst=/etc/nginx/nginx.conf,ro \
|
|
--mount type=bind,src={{ matrix_nginx_proxy_data_path }},dst=/nginx-data,ro \
|
|
--mount type=bind,src={{ matrix_nginx_proxy_confd_path }},dst=/etc/nginx/conf.d,ro \
|
|
{% if matrix_ssl_retrieval_method != 'none' %}
|
|
--mount type=bind,src={{ matrix_ssl_config_dir_path }},dst={{ matrix_ssl_config_dir_path }},ro \
|
|
--mount type=bind,src={{ matrix_static_files_base_path }},dst={{ matrix_static_files_base_path }},ro \
|
|
{% endif %}
|
|
{% for volume in matrix_nginx_proxy_container_additional_volumes %}
|
|
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \
|
|
{% endfor %}
|
|
{% for arg in matrix_nginx_proxy_container_extra_arguments %}
|
|
{{ arg }} \
|
|
{% endfor %}
|
|
{{ matrix_nginx_proxy_docker_image }}
|
|
|
|
ExecStop=-{{ matrix_host_command_docker }} kill matrix-nginx-proxy
|
|
ExecStop=-{{ matrix_host_command_docker }} rm matrix-nginx-proxy
|
|
ExecReload={{ matrix_host_command_docker }} exec matrix-nginx-proxy /usr/sbin/nginx -s reload
|
|
Restart=always
|
|
RestartSec=30
|
|
SyslogIdentifier=matrix-nginx-proxy
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|