Procházet zdrojové kódy

Add matrix_nginx_proxy_container_network variable

pull/2446/head
Slavi Pantaleev před 3 roky
rodič
revize
4d6a8d049d
3 změnil soubory, kde provedl 6 přidání a 2 odebrání
  1. +4
    -0
      roles/custom/matrix-nginx-proxy/defaults/main.yml
  2. +1
    -1
      roles/custom/matrix-nginx-proxy/templates/bin/lets-encrypt-certificates-renew.j2
  3. +1
    -1
      roles/custom/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2

+ 4
- 0
roles/custom/matrix-nginx-proxy/defaults/main.yml Zobrazit soubor

@@ -21,6 +21,10 @@ matrix_nginx_proxy_systemd_required_services_list: ['docker.service']
# List of systemd services that matrix-nginx-proxy.service wants
matrix_nginx_proxy_systemd_wanted_services_list: []

# The base container network.
# Also see: matrix_nginx_proxy_container_additional_networks
matrix_nginx_proxy_container_network: "{{ matrix_docker_network }}"

# A list of additional container networks that matrix-nginx-proxy would be connected to.
# The playbook does not create these networks, so make sure they already exist.
#


+ 1
- 1
roles/custom/matrix-nginx-proxy/templates/bin/lets-encrypt-certificates-renew.j2 Zobrazit soubor

@@ -12,7 +12,7 @@ docker run \
--name=matrix-certbot \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \
--network="{{ matrix_docker_network }}" \
--network="{{ matrix_nginx_proxy_container_network }}" \
-p 127.0.0.1:{{ matrix_ssl_lets_encrypt_certbot_standalone_http_port }}:8080 \
--mount type=bind,src={{ matrix_ssl_config_dir_path }},dst=/etc/letsencrypt \
--mount type=bind,src={{ matrix_ssl_log_dir_path }},dst=/var/log/letsencrypt \


+ 1
- 1
roles/custom/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 Zobrazit soubor

@@ -24,7 +24,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
--cap-drop=ALL \
--read-only \
--tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_nginx_proxy_tmp_directory_size_mb }}m \
--network={{ matrix_docker_network }} \
--network={{ matrix_nginx_proxy_container_network }} \
{% if matrix_nginx_proxy_container_http_host_bind_port %}
-p {{ matrix_nginx_proxy_container_http_host_bind_port }}:8080 \
{% endif %}


Načítá se…
Zrušit
Uložit