Просмотр исходного кода

Added trailing /n char

pull/516/head
hungrymonkey 5 лет назад
Родитель
Сommit
e85068bd37
6 измененных файлов: 6 добавлений и 6 удалений
  1. +1
    -1
      docs/configuring-playbook-backup.md
  2. +1
    -1
      roles/matrix-backup/defaults/main.yml
  3. +1
    -1
      roles/matrix-backup/tasks/main.yml
  4. +1
    -1
      roles/matrix-backup/tasks/setup_matrix_backup.yml
  5. +1
    -1
      roles/matrix-backup/templates/env-backup.j2
  6. +1
    -1
      roles/matrix-backup/templates/systemd/matrix-backup.service.j2

+ 1
- 1
docs/configuring-playbook-backup.md Просмотреть файл

@@ -138,4 +138,4 @@ Set `matrix_backup_enabled`, `matrix_backup_bucket`, `matrix_backup_bucket_key_
#### Run #### Run
```bash ```bash
ansible-playbook -i inventory/hosts setup.yml --tags=setup-matrix-backup,start ansible-playbook -i inventory/hosts setup.yml --tags=setup-matrix-backup,start
```
```

+ 1
- 1
roles/matrix-backup/defaults/main.yml Просмотреть файл

@@ -30,4 +30,4 @@ matrix_backup_awscli_docker_image_latest: "{{ matrix_backup_awscli_docker_image_
matrix_backup_awscli_docker_image: '{{ matrix_backup_awscli_docker_image_latest }}' matrix_backup_awscli_docker_image: '{{ matrix_backup_awscli_docker_image_latest }}'


# Use Rsync instead # Use Rsync instead
matrix_backup_rsync_target: ""
matrix_backup_rsync_target: ""

+ 1
- 1
roles/matrix-backup/tasks/main.yml Просмотреть файл

@@ -2,4 +2,4 @@
when: run_setup|bool when: run_setup|bool
tags: tags:
- setup-all - setup-all
- setup-matrix-backup
- setup-matrix-backup

+ 1
- 1
roles/matrix-backup/tasks/setup_matrix_backup.yml Просмотреть файл

@@ -102,4 +102,4 @@
docker_image: docker_image:
name: "{{ matrix_backup_awscli_docker_image }}" name: "{{ matrix_backup_awscli_docker_image }}"
state: absent state: absent
when: "not matrix_postgres_enabled|bool or not matrix_backup_enabled|bool"
when: "not matrix_postgres_enabled|bool or not matrix_backup_enabled|bool"

+ 1
- 1
roles/matrix-backup/templates/env-backup.j2 Просмотреть файл

@@ -2,4 +2,4 @@
{% if matrix_backup_bucket_key_id %} {% if matrix_backup_bucket_key_id %}
AWS_ACCESS_KEY_ID={{ matrix_backup_bucket_key_id }} AWS_ACCESS_KEY_ID={{ matrix_backup_bucket_key_id }}
AWS_SECRET_ACCESS_KEY={{ matrix_backup_bucket_key_secret }} AWS_SECRET_ACCESS_KEY={{ matrix_backup_bucket_key_secret }}
{% endif %}
{% endif %}

+ 1
- 1
roles/matrix-backup/templates/systemd/matrix-backup.service.j2 Просмотреть файл

@@ -28,4 +28,4 @@ ExecStart=/bin/sh -c 'docker run --rm --name matrix-backup \
--endpoint-url {{ matrix_backup_bucket_endpoint }} \ --endpoint-url {{ matrix_backup_bucket_endpoint }} \
{% endif %} && rm ${TMP_OUTPUT}' {% endif %} && rm ${TMP_OUTPUT}'
{% endif %} {% endif %}
Group=systemd-journal
Group=systemd-journal

Загрузка…
Отмена
Сохранить