From b99de011fc040afe3f6c8045f155168f7402707b Mon Sep 17 00:00:00 2001 From: Luc Stroobant Date: Mon, 21 Jun 2021 19:58:51 +0200 Subject: [PATCH] Install borgmatic in virtualenv. By @stroobl. Fixes #60 (#68) --- tasks/main.yml | 22 ++++++++++++++++------ vars/Debian.yml | 1 + vars/RedHat-8.yml | 1 + 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 6213950..7de97f3 100755 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -19,19 +19,29 @@ name: "{{ borg_packages }}" state: present -- name: Update setuptools if needed - tags: skip_ansible_lint +- name: Create virtualenv for borg pip: - name: setuptools - state: latest - executable: "{{ pip_bin }}" + name: pip-tools + virtualenv: /opt/borgmatic + virtualenv_command: "{{ python_bin }} -m venv" - name: Install required Python Packages pip: name: "{{ borg_python_packages }}" - executable: "{{ pip_bin }}" + virtualenv: /opt/borgmatic when: borg_python_packages is defined +- name: Create borgmatic command in /usr/local/bin + copy: + content: | + #!/bin/bash + . /opt/borgmatic/bin/activate + borgmatic "$@" + dest: /usr/local/bin/borgmatic + owner: root + group: root + mode: "0755" + - name: Ensure root has SSH key. user: name: "root" diff --git a/vars/Debian.yml b/vars/Debian.yml index af83fac..ce11e99 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -8,6 +8,7 @@ borg_packages: - python3-dev - python3-pip - python3-msgpack + - python3-venv - openssh-client - cron diff --git a/vars/RedHat-8.yml b/vars/RedHat-8.yml index 90b9760..54366d9 100644 --- a/vars/RedHat-8.yml +++ b/vars/RedHat-8.yml @@ -9,6 +9,7 @@ borg_packages: - python3-wheel - python3-devel - python3-setuptools + - python3-virtualenv - openssh-clients - cronie