Преглед изворни кода

use group variables instead

pull/1224/head
Michael Collins пре 4 година
родитељ
комит
2e30802b87
3 измењених фајлова са 3 додато и 5 уклоњено
  1. +1
    -0
      group_vars/matrix_servers
  2. +1
    -0
      roles/matrix-nginx-proxy/defaults/main.yml
  3. +1
    -5
      roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-base-domain.conf.j2

+ 1
- 0
group_vars/matrix_servers Прегледај датотеку

@@ -41,6 +41,7 @@ matrix_awx_enabled: false


matrix_nginx_proxy_data_path: "{{ '/chroot/website' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else (matrix_nginx_proxy_base_path + '/data') }}" matrix_nginx_proxy_data_path: "{{ '/chroot/website' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else (matrix_nginx_proxy_base_path + '/data') }}"
matrix_nginx_proxy_data_path_in_container: "{{ '/nginx-data/matrix-domain' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else '/nginx-data' }}" matrix_nginx_proxy_data_path_in_container: "{{ '/nginx-data/matrix-domain' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else '/nginx-data' }}"
matrix_nginx_proxy_data_path_extension: "{{ '' if (matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled) else '/matrix-domain' }}"


###################################################################### ######################################################################
# #


+ 1
- 0
roles/matrix-nginx-proxy/defaults/main.yml Прегледај датотеку

@@ -10,6 +10,7 @@ matrix_nginx_proxy_docker_image_force_pull: "{{ matrix_nginx_proxy_docker_image.
matrix_nginx_proxy_base_path: "{{ matrix_base_data_path }}/nginx-proxy" matrix_nginx_proxy_base_path: "{{ matrix_base_data_path }}/nginx-proxy"
matrix_nginx_proxy_data_path: "{{ matrix_nginx_proxy_base_path }}/data" matrix_nginx_proxy_data_path: "{{ matrix_nginx_proxy_base_path }}/data"
matrix_nginx_proxy_data_path_in_container: "/nginx-data" matrix_nginx_proxy_data_path_in_container: "/nginx-data"
matrix_nginx_proxy_data_path_extension: "/matrix_domain"
matrix_nginx_proxy_confd_path: "{{ matrix_nginx_proxy_base_path }}/conf.d" matrix_nginx_proxy_confd_path: "{{ matrix_nginx_proxy_base_path }}/conf.d"


# List of systemd services that matrix-nginx-proxy.service depends on # List of systemd services that matrix-nginx-proxy.service depends on


+ 1
- 5
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-base-domain.conf.j2 Прегледај датотеку

@@ -1,11 +1,7 @@
#jinja2: lstrip_blocks: "True" #jinja2: lstrip_blocks: "True"


{% macro render_vhost_directives() %} {% macro render_vhost_directives() %}
{% if matrix_awx_enabled and not matrix_nginx_proxy_base_domain_homepage_enabled %}
root {{ matrix_nginx_proxy_data_path_in_container }};
{% else %}
root {{ matrix_nginx_proxy_data_path_in_container if matrix_nginx_proxy_enabled else matrix_nginx_proxy_data_path }}/matrix-domain;
{% endif %}
root {{ matrix_nginx_proxy_data_path_in_container if matrix_nginx_proxy_enabled else matrix_nginx_proxy_data_path }}{{ matrix_nginx_proxy_data_path_extension }};


gzip on; gzip on;
gzip_types text/plain application/json; gzip_types text/plain application/json;


Loading…
Откажи
Сачувај