Преглед на файлове

remove matrix_awx_enabled from these

pull/1224/head
Michael Collins преди 4 години
родител
ревизия
4d57a41b3f
променени са 3 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. +1
    -0
      group_vars/matrix_servers
  2. +3
    -0
      roles/matrix-nginx-proxy/defaults/main.yml
  3. +2
    -2
      roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml

+ 1
- 0
group_vars/matrix_servers Целия файл

@@ -42,6 +42,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_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' }}"
matrix_nginx_proxy_base_domain_create_directory: "{{ false if matrix_awx_enabled else true }}"

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


+ 3
- 0
roles/matrix-nginx-proxy/defaults/main.yml Целия файл

@@ -76,6 +76,9 @@ matrix_nginx_proxy_container_federation_host_bind_port: '8448'
# in the `{{ matrix_nginx_proxy_data_path }}/matrix-domain` (`/matrix/nginx-proxy/data/matrix-domain`) directory.
matrix_nginx_proxy_base_domain_serving_enabled: false

# Controls whether the base domain directory and default index.html file are created.
matrix_nginx_proxy_base_domain_create_directory: true

matrix_nginx_proxy_base_domain_hostname: "{{ matrix_domain }}"

# Controls whether `matrix_nginx_proxy_base_domain_homepage_template` would be dumped to an `index.html` file


+ 2
- 2
roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml Целия файл

@@ -127,7 +127,7 @@
mode: 0750
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: matrix_nginx_proxy_base_domain_serving_enabled|bool and not matrix_awx_enabled|bool
when: matrix_nginx_proxy_base_domain_serving_enabled|bool and matrix_nginx_proxy_base_domain_create_directory|bool

- name: Ensure Matrix nginx-proxy homepage for base domain exists
copy:
@@ -136,7 +136,7 @@
mode: 0644
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: matrix_nginx_proxy_base_domain_serving_enabled|bool and matrix_nginx_proxy_base_domain_homepage_enabled|bool and not matrix_awx_enabled|bool
when: matrix_nginx_proxy_base_domain_serving_enabled|bool and matrix_nginx_proxy_base_domain_homepage_enabled|bool and matrix_nginx_proxy_base_domain_create_directory|bool

- name: Ensure Matrix nginx-proxy configuration for base domain exists
template:


Зареждане…
Отказ
Запис