diff --git a/defaults/main.yml b/defaults/main.yml index c2c89ad..beb03c1 100755 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,7 +5,7 @@ borg_one_file_system: true borg_exclude_from: [] borg_encryption_passcommand: false borg_lock_wait_time: 5 -borg_ssh_command: false +borg_ssh_command: false # If you use a useraccount and not root see at the bottom of this file borg_remote_path: false borg_remote_rate_limit: 0 borg_retention_policy: @@ -44,4 +44,9 @@ borgmatic_version: false borg_venv_path: "/opt/borgmatic" borgbackup_user: "root" borgbackup_group: "root" + + +# backup_ssh_key_file: "{{ backup_user_info.home }}/.ssh/id_rsa" +# backup_ssh_command: "ssh -i {{ backup_ssh_key_file }} -o StrictHostKeyChecking=no" +# borg_ssh_command: "{{ backup_ssh_command }}" ... diff --git a/tasks/05_create_timer.yml b/tasks/05_create_timer.yml deleted file mode 100644 index 9d40956..0000000 --- a/tasks/05_create_timer.yml +++ /dev/null @@ -1,89 +0,0 @@ ---- -- name: Create borgbackup timer - when: - - install_backup is not defined or install_backup - tags: - - install_backup - block: - - name: Add systemd.timer for borgmatic (large repo, create and check separate) - when: borgmatic_large_repo - block: - - name: Copy systemd files - ansible.builtin.template: - src: "{{ item.src }}" - dest: "{{ item.dest }}" - owner: root - group: root - backup: true - mode: "{{ item.mode }}" - with_items: - - { src: "backup_large_repo_check.timer.j2", dest: "/usr/lib/systemd/system/backup_large_repo_check.timer", mode: "0644" } - - { src: "backup_large_repo_check.service.j2", dest: "/usr/lib/systemd/system/backup_large_repo_check.service", mode: "0644" } - - { src: "backup_large_repo.timer.j2", dest: "/usr/lib/systemd/system/backup_large_repo.timer", mode: "0644" } - - { src: "backup_large_repo.service.j2", dest: "/usr/lib/systemd/system/backup_large_repo.service", mode: "0644" } - - - name: Populate service facts (large repo, create and check separate) - ansible.builtin.service_facts: - - - name: Restart borgmatic services (large repo, create and check separate) - ansible.builtin.systemd: - name: "{{ item }}" - state: restarted - enabled: true - masked: false - daemon_reload: true - when: "item in services" - with_items: - - "backup_large_repo_check.service" - - "backup_large_repo.service" - - # bug: Need own section without masked else the timer are skipped - - name: Restart borgmatic timers (large repo, create and check separate) - ansible.builtin.systemd: - name: "{{ item }}" - state: started - enabled: true - daemon_reload: true - with_items: - - "backup_large_repo_check.timer" - - "backup_large_repo.timer" - - - name: Add systemd.timer for borgmatic (normal-sized repo) - when: not borgmatic_large_repo - block: - - name: Copy systemd files (normal-sized repo) - ansible.builtin.template: - src: "{{ item.src }}" - dest: "{{ item.dest }}" - owner: root - group: root - backup: true - mode: "{{ item.mode }}" - with_items: - - { src: "backup_normal_repo.timer.j2", dest: "/usr/lib/systemd/system/backup_normal_repo.timer", mode: "0644" } - - { src: "backup_normal_repo.service.j2", dest: "/usr/lib/systemd/system/backup_normal_repo.service", mode: "0644" } - - - name: Populate service facts - ansible.builtin.service_facts: - - - name: Restart borgmatic services (normal-sized repo) - ansible.builtin.systemd: - name: "{{ item }}" - state: started - enabled: true - masked: false - daemon_reload: true - when: "item in services" - with_items: - - backup_normal_repo.service - - # bug: Need own section without masked else the timer ar skipped - - name: Restart borgmatic timers (normal-sized repo) - ansible.builtin.systemd: - name: "{{ item }}" - state: started - enabled: true - daemon_reload: true - with_items: - - "backup_normal_repo.timer" -...