瀏覽代碼

Update wording

pull/2217/head
ikkemaniac 3 年之前
父節點
當前提交
fd25cf8f54
共有 2 個檔案被更改,包括 7 行新增6 行删除
  1. +6
    -5
      roles/matrix-base/defaults/main.yml
  2. +1
    -1
      roles/matrix-base/tasks/setup_matrix_base.yml

+ 6
- 5
roles/matrix-base/defaults/main.yml 查看文件

@@ -284,6 +284,11 @@ matrix_docker_installation_enabled: true
# Possible values are "docker-ce" (default) and "docker.io" (Debian).
matrix_docker_package_name: docker-ce

# Controls whether the current playbook's commit hash is saved in `git_hash.yml` on the target
# Set this to false if GIT is not installed on the local system (the system where the ansible command is run on)
# to suppres the warning message.
matrix_playbook_commit_hash_preservation_enabled: true

# Variables to Control which parts of our roles run.
run_postgres_import: true
run_postgres_upgrade: true
@@ -297,8 +302,4 @@ run_dendrite_register_user: true
run_setup: true
run_self_check: true
run_start: true
run_stop: true

# Saves the git hash in a file called git_hash.yml
# Set this to false if GIT is not installed on the local system (the system where the ansible command is run on)
matrix_playbook_commit_hash_preservation_enabled: true
run_stop: true

+ 1
- 1
roles/matrix-base/tasks/setup_matrix_base.yml 查看文件

@@ -59,7 +59,7 @@
- name: Get GIT hash error
ansible.builtin.fail:
msg: >-
Error when trying to get the GIT hash.
Error when trying to get the GIT hash. Please consult the error message above.
You can disable saving the GIT hash by setting 'matrix_playbook_commit_hash_preservation_enabled: false' in vars.yml
when: "git_describe.stderr.find('git: not found') == -1"



Loading…
取消
儲存