Explorar el Código

Make AWX enabling/disabling consistent with other playbook roles

That is:
- enabled in the role by default
- disabled in the compilation (playbook), if considered an optional
component
pull/964/head
Slavi Pantaleev hace 5 años
padre
commit
5a4ea5f866
Se han modificado 2 ficheros con 4 adiciones y 2 borrados
  1. +3
    -0
      group_vars/matrix_servers
  2. +1
    -2
      roles/matrix-awx/defaults/main.yml

+ 3
- 0
group_vars/matrix_servers Ver fichero

@@ -35,6 +35,9 @@ matrix_homeserver_container_url: "{{ 'http://matrix-nginx-proxy:12080' if matrix
#
######################################################################

# We don't enable AWX support by default.
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' }}"



+ 1
- 2
roles/matrix-awx/defaults/main.yml Ver fichero

@@ -1,2 +1 @@

matrix_awx_enabled: false
matrix_awx_enabled: true

Cargando…
Cancelar
Guardar