소스 검색

Add missing vars to roles where they are used

pull/74/head
Stuart Mumford 7 년 전
부모
커밋
70dc2aa32c
No known key found for this signature in database GPG 키 ID: 60BC5C03E6276769
2개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. +3
    -1
      roles/matrix-nginx-proxy/defaults/main.yml
  2. +2
    -1
      roles/matrix-synapse/defaults/main.yml

+ 3
- 1
roles/matrix-nginx-proxy/defaults/main.yml 파일 보기

@@ -3,6 +3,8 @@
# But in case that's not the case, you may wish to prevent that # But in case that's not the case, you may wish to prevent that
# and take care of proxying by yourself. # and take care of proxying by yourself.
matrix_nginx_proxy_enabled: true matrix_nginx_proxy_enabled: true
matrix_riot_web_enabled: true
matrix_corporal_enabled: false


matrix_nginx_proxy_docker_image: "nginx:1.15.8-alpine" matrix_nginx_proxy_docker_image: "nginx:1.15.8-alpine"


@@ -47,4 +49,4 @@ matrix_ssl_lets_encrypt_support_email: "{{ host_specific_matrix_ssl_lets_encrypt


matrix_ssl_base_path: "{{ matrix_base_data_path }}/ssl" matrix_ssl_base_path: "{{ matrix_base_data_path }}/ssl"
matrix_ssl_config_dir_path: "{{ matrix_ssl_base_path }}/config" matrix_ssl_config_dir_path: "{{ matrix_ssl_base_path }}/config"
matrix_ssl_log_dir_path: "{{ matrix_ssl_base_path }}/log"
matrix_ssl_log_dir_path: "{{ matrix_ssl_base_path }}/log"

+ 2
- 1
roles/matrix-synapse/defaults/main.yml 파일 보기

@@ -11,6 +11,7 @@ matrix_synapse_ext_path: "{{ matrix_synapse_base_path }}/ext"
# Normally, matrix-nginx-proxy is enabled and nginx can reach Synapse over the container network. # Normally, matrix-nginx-proxy is enabled and nginx can reach Synapse over the container network.
# If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
# the Client/Server API's port to the local host (`127.0.0.1:8008`). # the Client/Server API's port to the local host (`127.0.0.1:8008`).
matrix_nginx_proxy_enabled: true
matrix_synapse_container_expose_client_server_api_port: "{{ not matrix_nginx_proxy_enabled }}" matrix_synapse_container_expose_client_server_api_port: "{{ not matrix_nginx_proxy_enabled }}"


matrix_synapse_in_container_python_packages_path: "/usr/local/lib/python3.6/site-packages" matrix_synapse_in_container_python_packages_path: "/usr/local/lib/python3.6/site-packages"
@@ -173,4 +174,4 @@ matrix_mautrix_whatsapp_enabled: false


matrix_mautrix_whatsapp_docker_image: "tulir/mautrix-whatsapp:latest" matrix_mautrix_whatsapp_docker_image: "tulir/mautrix-whatsapp:latest"


matrix_mautrix_whatsapp_base_path: "{{ matrix_base_data_path }}/mautrix-whatsapp"
matrix_mautrix_whatsapp_base_path: "{{ matrix_base_data_path }}/mautrix-whatsapp"

불러오는 중...
취소
저장