cleanup (#23)

README.md

@@ -12,10 +12,14 @@ Role Variables
 --------------
 
 ```yaml
-restic_install_path: '/usr/local/bin'
-restic_password_path: '/var/lib/restic'
 restic_version: '0.8.1'
+restic_url: ''
+
+restic_download_path: '/opt/restic'
+restic_install_path: '/usr/local/bin'
 
+restic_jobs: []
+restic_jobs_raw: []
 restic_repos:
   - name: example
     url: '/backup'

defaults/main.yml

@@ -1,11 +1,12 @@
 ---
 
-restic_download_path: '/opt/restic'
-restic_install_path: '/usr/local/bin'
-restic_url: 'https://github.com/restic/restic/releases/download/v{{ restic_version }}/restic_{{ restic_version }}_{{ _platform_suffix }}.bz2'
-
 restic_version: '0.8.1'
+restic_url: ''
 
-_restic_binpath_tpl: '{{ restic_download_path }}/bin/restic-{{ restic_version }}'
+restic_download_path: '/opt/restic'
+restic_install_path: '/usr/local/bin'
 
 restic_repos: []
+
+restic_jobs: []
+restic_jobs_raw: []

meta/main.yml

@@ -6,7 +6,7 @@ galaxy_info:
   author: donat-b
   description: Restic is a simple and effective backup solution
   license: BSD
-  min_ansible_version: 2.4
+  min_ansible_version: 2.2
   platforms:
   - name: Debian
     versions:
@@ -19,6 +19,9 @@ galaxy_info:
     - xenial
     - yakkety
     - zesty
+  - name: EL
+    versions:
+    - 7
   galaxy_tags:
     - system
     - backup

tasks/install.yml

@@ -1,44 +1,31 @@
 ---
-
-- name: Set internal variable platform-suffix
-  set_fact:
-    _platform_suffix: 'linux_amd64'
-  when: ansible_userspace_bits == '64'
-
-- name: Set internal variable platform-suffix
+- name: Set restic_url
   set_fact:
-    _platform_suffix: 'linux_386'
-  when: ansible_userspace_bits == '32'
-
-- name: Check if binary is present
-  stat:
-    path: '{{ _restic_binpath_tpl }}'
-  register: restic_executable
+    restic_url: 'https://github.com/restic/restic/releases/download/v{{ restic_version }}/restic_{{ restic_version }}_{{ ansible_system | lower }}_{{ _platform_map[ansible_architecture] | default(ansible_architecture) }}.bz2'
+  when: restic_url == ''
 
 - name: Download client binary
   get_url:
     url: '{{ restic_url }}'
     dest: '{{ restic_download_path }}/restic.bz2'
     force: True
   register: get_url_restic
-  when: restic_executable.stat.exists == False
 
 - name: Decompress the binary
-  shell: bzip2 -dc {{ get_url_restic.dest }} > {{ _restic_binpath_tpl }}
+  shell: "bzip2 -dc {{ get_url_restic.dest }} > {{ restic_download_path }}/bin/restic-{{ restic_version }}"
   args:
-    creates: '{{ _restic_binpath_tpl }}'
-  when: restic_executable.stat.exists == False
+    creates: '{{ restic_download_path }}/bin/restic-{{ restic_version }}'
 
 - name: Ensure permissions are correct
   file:
-    path: '{{ _restic_binpath_tpl }}'
+    path: '{{ restic_download_path }}/bin/restic-{{ restic_version }}'
     mode: '0755'
     owner: 'root'
     group: 'root'
 
 - name: Create symbolic link to the correct version
   file:
-    src: '{{ _restic_binpath_tpl }}'
+    src: '{{ restic_download_path }}/bin/restic-{{ restic_version }}'
     path: '{{ restic_install_path }}/restic'
     state: link
     force: True

tasks/main.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: Ensure restic directories exist
   file:
     state: 'directory'
@@ -11,8 +10,14 @@
     - '/var/log/restic'
     - '{{ restic_download_path }}/bin'
 
+- name: Check if binary is present
+  stat:
+    path: '{{ restic_download_path }}/bin/restic-{{ restic_version }}'
+  register: restic_executable
+
 - name: Install restic
   include: 'install.yml'
+  when: not restic_executable.stat.exists
 
 - name: Configure restic jobs
   include: 'configure.yml'

vars/main.yml

@@ -0,0 +1,6 @@
+_platform_map:
+  i386: 386
+  x86_64: amd64
+  aarch64: arm64
+  armv7l: arm
+  armv6l: arm