remove custom installation path

README.md

@@ -26,7 +26,6 @@ All variables which can be overridden are stored in [defaults/main.yml](defaults
 | `restic_user` | "root" | system user to run restic |
 | `restic_group` | "root" | system group to run restic |
 | `restic_shell` | "/bin/false" | the shell for the restic user, change this if you want to be able to su to it |
-| `restic_install_path` | "/usr/local/bin" | directory where restic binary will be installed |
 | `restic_cron_mailto` | restic_user | who to mail results of the restic crons to, set to "" to not mail |
 | `restic_cron_stdout_file` | null | what file to log restic output to, null means include in mailto, use /dev/null to discard |
 | `restic_cron_stderr_file` | null | what file to log restic errors to, null means include in mailto, use /dev/null to discard |

defaults/main.yml

@@ -4,9 +4,6 @@ restic_version: '0.9.4'
 restic_user: root
 restic_group: "{{ restic_user }}"
 restic_shell: "/bin/false"
-restic_home: "/var/lib/restic"
-
-restic_install_path: '/usr/local/bin'
 
 restic_initialize_repos: true
 

molecule/alternative/playbook.yml

@@ -7,7 +7,6 @@
   vars:
     restic_user: restic
     restic_group: restic
-    restic_install_path: "/opt"
     restic_initialize_repos: false
     restic_repos:
       - name: s3-example

molecule/alternative/tests/test_alternative.py

@@ -6,7 +6,7 @@
 
 
 def test_binary(host):
-    binary = host.file("/opt/restic")
+    binary = host.file("/usr/local/bin/restic")
     assert binary.exists
     assert binary.is_file
     assert binary.mode == 0o750

tasks/configure.yml

@@ -11,7 +11,7 @@
 - name: Deploy helper commands
   template:
     src: 'restic.helper.j2'
-    dest: "{{ restic_install_path }}/restic-{{ item.name }}"
+    dest: "{{ _restic_install_path }}/restic-{{ item.name }}"
     owner: "{{ restic_user }}"
     group: "{{ restic_group }}"
     mode: '0750'
@@ -29,7 +29,7 @@
   when: restic_user != 'root'
 
 - name: Initialize restic repositories
-  command: "{{ restic_install_path }}/restic-{{ item.name }} init"
+  command: "{{ _restic_install_path }}/restic-{{ item.name }} init"
   ignore_errors: true
   no_log: true
   with_items: "{{ restic_repos }}"

tasks/install.yml

@@ -11,15 +11,10 @@
     shell: "{{ restic_shell }}"
     system: true
     createhome: true
-    home: "{{ restic_home }}"
+    home: "{{ _restic_home }}"
     state: present
   when: restic_user != 'root'
 
-- name: Ensure restic installation directory exist
-  file:
-    state: 'directory'
-    path: '{{ restic_install_path }}'
-
 - name: Ensure restic user can write to log dirs if defined
   file:
     state: 'directory'
@@ -83,7 +78,7 @@
 
 - name: Set proper capabilities for restic binary
   capabilities:
-    path: '{{ restic_install_path }}/restic'
+    path: '{{ _restic_install_path }}/restic'
     capability: cap_dac_read_search+ep
     state: present
   when:

templates/restic.cron.j2

@@ -2,7 +2,7 @@
 {{ ansible_managed | comment }}
 MAILTO="{{ restic_cron_mailto }}"
 SHELL=/bin/sh
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:{{ restic_install_path }} 
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:{{ _restic_install_path }}
 RESTIC_REPOSITORY={{ item.url | trim | quote }}
 RESTIC_PASSWORD={{ item.password | trim | quote }}
 {% if item.remote_credentials is defined %}

templates/restic.helper.j2

@@ -4,7 +4,7 @@
 # vi: ft=jinja.crontab
 {{ ansible_managed | comment }}
 (
-  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:{{ restic_install_path }}
+  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:{{ _restic_install_path }}
   export PATH
   RESTIC_REPOSITORY={{ item.url | trim | quote }}
   export RESTIC_REPOSITORY

vars/main.yml

@@ -7,3 +7,5 @@ go_arch_map:
   armv6l: arm
 
 go_arch: "{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
+_restic_home: "/var/lib/restic"
+_restic_install_path: '/usr/local/bin'