ソースを参照

Use a template option for the env with variable extension

pull/2038/head
Julian-Samuel Gebühr 3年前
コミット
949ca115fe
3個のファイルの変更11行の追加7行の削除
  1. +6
    -5
      roles/matrix-ldap-registration-proxy/defaults/main.yml
  2. +2
    -2
      roles/matrix-ldap-registration-proxy/tasks/setup_install.yml
  3. +3
    -0
      roles/matrix-ldap-registration-proxy/templates/ldap-registration-proxy.env.j2

+ 6
- 5
roles/matrix-ldap-registration-proxy/defaults/main.yml ファイルの表示

@@ -39,9 +39,10 @@ matrix_ldap_registration_proxy_systemd_required_services_list: ['docker.service'
# List of systemd services that matrix_ldap_registration_proxy.service wants
matrix_ldap_registration_proxy_systemd_wanted_services_list: []

# Default LDAP configuration template which covers the generic use case.
# You can customize it by controlling the various variables inside it.
matrix_ldap_registration_proxy_configuration_env: "{{ lookup('template', 'templates/ldap-registration-proxy.env.j2') }}"
# Additional environment variables to pass to the LDAP proxy environment variables.
#
# Example:
# matrix_ldap_registration_proxy_env_variables_extension: |
# KEY=value
matrix_ldap_registration_proxy_env_variables_extension: ''

# Holds the final LDAP configuration (a combination of the default and its extension).
matrix_ldap_registration_proxy_configuration: "{{ matrix_ldap_registration_proxy_configuration_env }}"

+ 2
- 2
roles/matrix-ldap-registration-proxy/tasks/setup_install.yml ファイルの表示

@@ -37,8 +37,8 @@
when: true

- name: Ensure matrix_ldap_registration_proxy config installed
ansible.builtin.copy:
content: "{{ matrix_ldap_registration_proxy_configuration }}"
ansible.builtin.template:
src: "{{ role_path }}/templates/ldap-registration-proxy.env.j2"
dest: "{{ matrix_ldap_registration_proxy_config_path }}/ldap-registration-proxy.env"
mode: 0644
owner: "{{ matrix_user_username }}"


+ 3
- 0
roles/matrix-ldap-registration-proxy/templates/ldap-registration-proxy.env.j2 ファイルの表示

@@ -30,3 +30,6 @@ MATRIX_SERVER_URL={{ matrix_ldap_registration_proxy_matrix_server_url }}

# Specify the port to listen on. Default to 8080
LISTEN_PORT={{ matrix_ldap_registration_proxy_container_port }}

# Use this to extend the configuration with custom variables
{{ matrix_ldap_registration_proxy_env_variables_extension }}

読み込み中…
キャンセル
保存