merge upstream

This commit is contained in:
Michael Collins
2021-08-17 13:20:39 +08:00
9 changed files with 164 additions and 0 deletions

View File

@ -42,7 +42,11 @@ 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_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' }}"
<<<<<<< HEAD
matrix_nginx_proxy_base_domain_create_directory: "{{ false if matrix_awx_enabled else true }}"
=======
matrix_nginx_proxy_base_domain_create_directory: "{{ not matrix_awx_enabled }}"
>>>>>>> upstream/master
######################################################################
#