diff --git a/meta/argument_specs.yml b/meta/argument_specs.yml index 11265c9..b668fe9 100644 --- a/meta/argument_specs.yml +++ b/meta/argument_specs.yml @@ -25,7 +25,7 @@ argument_specs: borg_venv_path: type: str required: false - description: Path to store the venv for borg(backup) and borgmatic. + description: Path to store the venv for borg(backup) and borgmatic. borg_install_method: type: str required: false @@ -115,34 +115,37 @@ argument_specs: type: bool description: Bypass Borg error about a repository that has been moved. borg_retention_policy: - keep_secondly: - type: int - required: false - description: Number of secondly archives to keep. - keep_minutely: - type: int - required: false - description: Number of minutely archives to keep. - keep_hourly: - type: int - required: false - description: Number of hourly archives to keep. - keep_daily: - type: int - required: false - description: Number of daily archives to keep. - keep_weekly: - type: int - required: false - description: Number of weekly archives to keep. - keep_monthly: - type: int - required: false - description: Number of monthly archives to keep. - keep_yearly: - type: int - required: false - description: Number of yearly archives to keep. + type: dict + description: Define the pruning policy + options: + keep_secondly: + type: int + required: false + description: Number of secondly archives to keep. + keep_minutely: + type: int + required: false + description: Number of minutely archives to keep. + keep_hourly: + type: int + required: false + description: Number of hourly archives to keep. + keep_daily: + type: int + required: false + description: Number of daily archives to keep. + keep_weekly: + type: int + required: false + description: Number of weekly archives to keep. + keep_monthly: + type: int + required: false + description: Number of monthly archives to keep. + keep_yearly: + type: int + required: false + description: Number of yearly archives to keep. borgmatic_checks: type: list required: false diff --git a/tasks/noauto_create_timer_cron.yml b/tasks/noauto_create_timer_cron.yml index 4f999d8..d1241db 100644 --- a/tasks/noauto_create_timer_cron.yml +++ b/tasks/noauto_create_timer_cron.yml @@ -26,6 +26,6 @@ user: "{{ borg_user }}" cron_file: "{{ borgmatic_timer_cron_name }}" name: PATH - env: yes + env: true value: /usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ... diff --git a/tasks/noauto_create_timer_systemd.yml b/tasks/noauto_create_timer_systemd.yml index aa454b6..40619df 100644 --- a/tasks/noauto_create_timer_systemd.yml +++ b/tasks/noauto_create_timer_systemd.yml @@ -61,5 +61,7 @@ - name: Show hints when: "'backup_init_repo' not in ansible_run_tags" ansible.builtin.debug: - msg: "Attention: Since the repo was not initialized automatically, the systemd service (borgmatic.service) and the timer (borgmatic.timer) are not activated." + msg: >- + Attention: Since the repo was not initialized automatically, + the systemd service (borgmatic.service) and the timer (borgmatic.timer) are not activated. ... diff --git a/tasks/noauto_install_package.yml b/tasks/noauto_install_package.yml index 5f28a58..5b9346a 100644 --- a/tasks/noauto_install_package.yml +++ b/tasks/noauto_install_package.yml @@ -4,14 +4,14 @@ - name: Check if EPEL repo is enabled, if installation from distro is requested when: borg_require_epel block: - - name: Get list of installed packages - ansible.builtin.package_facts: - manager: auto - - name: Ensure EPEL is enabled - ansible.builtin.assert: - that: - - "'epel-release' in ansible_facts.packages" - fail_msg: Need EPEL repo to install via distro package. + - name: Get list of installed packages + ansible.builtin.package_facts: + manager: auto + - name: Ensure EPEL is enabled + ansible.builtin.assert: + that: + - "'epel-release' in ansible_facts.packages" + fail_msg: Need EPEL repo to install via distro package. - name: Install borgmatic and borg via distribution package manager ansible.builtin.package: