diff --git a/group_vars/all b/group_vars/all index 0b198ee..cad7a42 100644 --- a/group_vars/all +++ b/group_vars/all @@ -123,13 +123,6 @@ browser_choices: - qcode - "| xclip -selection c" -tarsnapper: - deltas: 1h 1d 7d 30d 365d - period: DAILY - ac_only: True - run_on: trusted - random_delay: 600 - gitannex: stop_on_untrusted: True diff --git a/playbook.yml b/playbook.yml index f49f563..bf76a28 100644 --- a/playbook.yml +++ b/playbook.yml @@ -66,7 +66,6 @@ - { role: backitup, tags: ["backitup"] } - { role: cryptshot, tags: ["cryptshot"], when: "cryptshot is defined" } - { role: resnap, tags: ["resnap"], when: "resnap is defined" } - - { role: tarsnap, tags: ["tarsnap"] } - { role: mapping, tags: ["mapping"] } - { role: sound, tags: ["sound"] } - { role: pim, tags: ["pim"] } diff --git a/roles/tarsnap/handlers/main.yml b/roles/tarsnap/handlers/main.yml deleted file mode 100644 index 9e02a97..0000000 --- a/roles/tarsnap/handlers/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Restart tarsnapper - ansible.builtin.service: - name: tarsnapper.timer - state: restarted - when: tarsnapper.run_on == "all" diff --git a/roles/tarsnap/meta/main.yml b/roles/tarsnap/meta/main.yml deleted file mode 100644 index 7e36a5d..0000000 --- a/roles/tarsnap/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - { role: nmtrust } - - { role: backitup } diff --git a/roles/tarsnap/tasks/main.yml b/roles/tarsnap/tasks/main.yml deleted file mode 100644 index 192d94a..0000000 --- a/roles/tarsnap/tasks/main.yml +++ /dev/null @@ -1,66 +0,0 @@ ---- -- name: Install Tarsnap - community.general.pacman: - name: tarsnap - state: present - -- name: Copy default Tarsnap config - ansible.builtin.copy: - src: /etc/tarsnap/tarsnap.conf.sample - dest: /etc/tarsnap/tarsnap.conf - mode: "0644" - -- name: Create Tarsnap cache dir - ansible.builtin.file: - path: /usr/local/tarsnap-cache - state: directory - mode: "0700" - -- name: Humanize Tarsnap numbers - ansible.builtin.lineinfile: - dest: /etc/tarsnap/tarsnap.conf - state: present - line: humanize-numbers - -- name: Install tarsnapper - kewlfft.aur.aur: - name: tarsnapper - become: true - become_user: "{{ aur.user }}" - tags: - - aur - -- name: Create Tarsnapper config include dir - ansible.builtin.file: - path: /usr/local/etc/tarsnapper.d/ - state: directory - mode: "0755" - -- name: Push Tarsnapper config - ansible.builtin.template: - src: tarsnapper.conf.j2 - dest: /usr/local/etc/tarsnapper.conf - mode: "0644" - -- name: Push Tarsnapper service file - ansible.builtin.template: - src: tarsnapper.service.j2 - dest: /etc/systemd/system/tarsnapper.service - mode: "0644" - notify: - - Reload systemd config - -- name: Push Tarsnapper timer file - ansible.builtin.template: - src: tarsnapper.timer.j2 - dest: /etc/systemd/system/tarsnapper.timer - mode: "0644" - notify: - - Reload systemd config - - Restart tarsnapper - -- name: Include nmtrust unit tasks - ansible.builtin.include_tasks: roles/nmtrust/tasks/unit.yml - vars: - unit: tarsnapper.timer - run_on: "{{ tarsnapper.run_on }}" diff --git a/roles/tarsnap/templates/tarsnapper.conf.j2 b/roles/tarsnap/templates/tarsnapper.conf.j2 deleted file mode 100644 index 3a1950c..0000000 --- a/roles/tarsnap/templates/tarsnapper.conf.j2 +++ /dev/null @@ -1,8 +0,0 @@ -# {{ ansible_managed }} -deltas: {{ tarsnapper.deltas }} -target: /{{ ansible_hostname }}/$name-$date -include-jobs: /usr/local/etc/tarsnapper.d/* - -jobs: - etc: - source: /etc diff --git a/roles/tarsnap/templates/tarsnapper.service.j2 b/roles/tarsnap/templates/tarsnapper.service.j2 deleted file mode 100644 index cc95f69..0000000 --- a/roles/tarsnap/templates/tarsnapper.service.j2 +++ /dev/null @@ -1,10 +0,0 @@ -# {{ ansible_managed }} -[Unit] -Description=Tarsnapper Backup Service -After=network.target - -[Service] -Type=oneshot -ExecStart=/usr/local/bin/backitup {% if tarsnapper.ac_only %}-a {% endif %}-p {{ tarsnapper.period }} -l /usr/local/etc/tarsnapper.lastrun -b "/usr/bin/tarsnapper -c /usr/local/etc/tarsnapper.conf make" -StandardOutput=journal -StandardError=journal diff --git a/roles/tarsnap/templates/tarsnapper.timer.j2 b/roles/tarsnap/templates/tarsnapper.timer.j2 deleted file mode 100644 index 3325c9d..0000000 --- a/roles/tarsnap/templates/tarsnapper.timer.j2 +++ /dev/null @@ -1,12 +0,0 @@ -# {{ ansible_managed }} -[Unit] -Description=Tarsnapper Backup Service Timer - -[Timer] -Unit=tarsnapper.service -OnCalendar=hourly -RandomizedDelaySec={{ tarsnapper.random_delay }} -Persistent=True - -[Install] -WantedBy=timers.target