update(nginx): bump version to 1.27.5

galaxy.yml

@@ -1,12 +1,12 @@
 namespace: finallycoffee
 name: base
-version: 0.2.0
+version: 0.2.1
 readme: README.md
 authors:
 - transcaffeine <transcaffeine@finally.coffee>
 description: Roles for base services which are common dependencies other services like databases
 dependencies:
-  "community.docker": "^3.0.0"
+  "community.docker": "^4.2.0"
 license_file: LICENSE.md
 build_ignore:
 - '*.tar.gz'

roles/lego/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 lego_user: "lego"
-lego_version: "4.22.2"
+lego_version: "4.23.0"
 lego_instance: default
 lego_base_path: "/opt/lego"
 lego_cert_user: "acme-{{ lego_instance }}"

roles/lego/tasks/main.yml

@@ -25,35 +25,44 @@
       - "{{ lego_cert_group }}"
     append: true
 
-- name: Ensure lego is installed
+- name: Check if lego is present
-  block:
-    - name: Check if lego is present
   ansible.builtin.command:
     cmd: which lego
   changed_when: false
   failed_when: false
   register: lego_binary_info
+  check_mode: false
 
+- name: Check which version of lego is present
+  ansible.builtin.command:
+    cmd: "lego --version"
+  changed_when: false
+  failed_when: false
+  register: lego_binary_version_info
+  when: lego_binary_info.rc == 0
+  check_mode: false
+
+- name: Ensure lego is installed
+  when: (lego_binary_info.rc != 0) or (lego_version not in lego_binary_version_info.stdout)
+  block:
     - name: Download lego from source
       ansible.builtin.get_url:
         url: "{{ lego_release_archive_url }}"
         url_username: "{{ lego_release_archive_url_username | default(omit) }}"
         url_password: "{{ lego_release_archive_url_password | default(omit) }}"
         dest: "{{ lego_release_archive_file_path }}"
-      when: lego_binary_info.rc != 0
 
     - name: Create folder to uncompress into
       ansible.builtin.file:
         dest: "{{ lego_release_archive_path }}"
         state: directory
-      when: lego_binary_info.rc != 0
 
     - name: Uncompress lego source archive
       ansible.builtin.unarchive:
         src: "{{ lego_release_archive_file_path }}"
         dest: "{{ lego_release_archive_path }}"
         remote_src: true
-      when: lego_binary_info.rc != 0
+      ignore_errors: "{{ ansible_check_mode }}"
 
     - name: Ensure lego binary is present in PATH
       ansible.builtin.copy:
@@ -61,14 +70,7 @@
         dest: "/usr/local/bin/lego"
         mode: "u+rwx,g+rx,o+rx"
         remote_src: true
-      when: lego_binary_info.rc != 0
+      ignore_errors: "{{ ansible_check_mode }}"
-
-    - name: Ensure lego is allowed to bind to ports < 1024
-      community.general.capabilities:
-        path: "/usr/local/bin/lego"
-        capability: "cap_net_bind_service+ep"
-        state: present
-      when: lego_binary_allow_net_bind_service
 
     - name: Ensure intermediate data is gone
       ansible.builtin.file:
@@ -77,7 +79,13 @@
       loop:
         - "{{ lego_release_archive_path }}"
         - "{{ lego_release_archive_file_path }}"
-      when: lego_binary_info.rc != 0
+
+    - name: Ensure lego is allowed to bind to ports < 1024
+      community.general.capabilities:
+        path: "/usr/local/bin/lego"
+        capability: "cap_net_bind_service+ep"
+        state: present
+      when: lego_binary_allow_net_bind_service
 
 - name: Ensure lego base path exists
   ansible.builtin.file:

roles/minio/defaults/main/container.yml

@@ -1,17 +1,7 @@
 ---
-
-minio_user: ~
-minio_data_path: /opt/minio
-
-minio_create_user: false
-minio_manage_host_filesystem: false
-
-minio_root_username: root
-minio_root_password: ~
-
 minio_container_name: minio
-minio_container_image_name: docker.io/minio/minio
+minio_container_image_name: "docker.io/minio/minio"
-minio_container_image_tag: latest
+minio_container_image_tag: "RELEASE.2025-04-08T15-41-24Z"
 minio_container_image: "{{ minio_container_image_name }}:{{ minio_container_image_tag }}"
 minio_container_networks: []
 minio_container_ports: []
@@ -34,6 +24,8 @@ minio_container_command:
   - ":{{ minio_container_listen_port_console }}"
 minio_container_restart_policy: "unless-stopped"
 minio_container_image_force_source: "{{ (minio_container_image_tag == 'latest')|bool }}"
+minio_container_state: >-2
+  {{ (minio_state == 'present') | ternary('started', 'absent') }}
 
 minio_container_listen_port_api: 9000
 minio_container_listen_port_console: 8900

roles/minio/defaults/main/main.yml

@@ -0,0 +1,12 @@
+---
+minio_user: ~
+minio_data_path: /opt/minio
+
+minio_create_user: false
+minio_manage_host_filesystem: false
+
+minio_root_username: root
+minio_root_password: ~
+
+minio_state: present
+minio_deployment_method: docker

roles/minio/tasks/deploy-docker.yml

@@ -0,0 +1,29 @@
+---
+- name: Ensure filesystem mounts ({{ minio_data_path }}) for container volumes are present
+  ansible.builtin.file:
+    path: "{{ minio_data_path }}"
+    state: directory
+    user: "{{ minio_user|default(omit, True) }}"
+    group: "{{ minio_user|default(omit, True) }}"
+  when: minio_manage_host_filesystem
+
+- name: Ensure container image '{{ minio_container_image }}' is {{ minio_state }}
+  community.docker.docker_image:
+    name: "{{ minio_container_image }}"
+    state: "{{ minio_state }}"
+    source: pull
+    force_source: "{{ minio_container_image_force_source }}"
+
+- name: Ensure container '{{ minio_container_name }}' is {{ minio_container_state }}
+  community.docker.docker_container:
+    name: "{{ minio_container_name }}"
+    image: "{{ minio_container_image }}"
+    volumes: "{{ minio_container_volumes }}"
+    env: "{{ minio_container_env }}"
+    labels: "{{ minio_container_labels }}"
+    networks: "{{ minio_container_networks }}"
+    ports: "{{ minio_container_ports }}"
+    user: "{{ minio_user|default(omit, True) }}"
+    command: "{{ minio_container_command }}"
+    restart_policy: "{{ minio_container_restart_policy }}"
+    state: "{{ minio_container_state }}"

roles/minio/tasks/main.yml

@@ -1,37 +1,25 @@
 ---
+- name: Ensure 'minio_state' is valid
+  ansible.builtin.fail:
+    msg: >-
+      Unsupported state '{{ minio_state }}'!
+      Supported states are {{ minio_states | join(', ') }}.
+  when: minio_state not in minio_states
 
-- name: Ensure minio run user is present
+- name: Ensure 'minio_deployment_method' is valid
-  user:
+  ansible.builtin.fail:
+    msg: >-
+      Unsupported state '{{ minio_deployment_method }}'!
+      Supported states are {{ minio_deployment_methods | join(', ') }}.
+  when: minio_deployment_method not in minio_deployment_methods
+
+- name: Ensure minio run user is {{ minio_state }}
+  ansible.builtin.user:
     name: "{{ minio_user }}"
-    state: present
+    state: "{{ minio_state }}"
-    system: yes
+    system: true
   when: minio_create_user
 
-- name: Ensure filesystem mounts ({{ minio_data_path }}) for container volumes are present
+- name: Deploy minio using {{ minio_deployment_method }}
-  file:
+  ansible.builtin.include_tasks:
-    path: "{{ minio_data_path }}"
+    file: "deploy-{{ minio_deployment_method }}.yml"
-    state: directory
-    user: "{{ minio_user|default(omit, True) }}"
-    group: "{{ minio_user|default(omit, True) }}"
-  when: minio_manage_host_filesystem
-
-- name: Ensure container image for minio is present
-  community.docker.docker_image:
-    name: "{{ minio_container_image }}"
-    state: present
-    source: pull
-    force_source: "{{ minio_container_image_force_source }}"
-
-- name: Ensure container {{ minio_container_name }} is running
-  docker_container:
-    name: "{{ minio_container_name }}"
-    image: "{{ minio_container_image }}"
-    volumes: "{{ minio_container_volumes }}"
-    env: "{{ minio_container_env }}"
-    labels: "{{ minio_container_labels }}"
-    networks: "{{ minio_container_networks }}"
-    ports: "{{ minio_container_ports }}"
-    user: "{{ minio_user|default(omit, True) }}"
-    command: "{{ minio_container_command }}"
-    restart_policy: "{{ minio_container_restart_policy }}"
-    state: started

roles/minio/vars/main.yml

@@ -1,5 +1,9 @@
 ---
-
+minio_states:
+  - present
+  - absent
+minio_deployment_methods:
+  - docker
 minio_container_volumes: "{{ minio_container_base_volumes + minio_container_extra_volumes }}"
 
 minio_container_env: "{{ minio_container_base_env | combine(minio_container_extra_env) }}"

roles/nginx/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-nginx_version: "1.27.4"
+nginx_version: "1.27.5"
 nginx_flavour: alpine
 nginx_base_path: /opt/nginx
 nginx_config_file: "{{ nginx_base_path }}/nginx.conf"

roles/restic/defaults/main.yml

@@ -1,4 +1,5 @@
 ---
+
 restic_repo_url: ~
 restic_repo_password: ~
 restic_s3_key_id: ~
@@ -7,8 +8,6 @@ restic_s3_access_key: ~
 restic_backup_paths: []
 restic_backup_stdin_command: ~
 restic_backup_stdin_command_filename: ~
-restic_backup_generate_metrics_command: >-2
-  {{ restic_script_generate_snapshot_metrics }}
 
 restic_policy_keep_all_within: 1d
 restic_policy_keep_hourly: 12
@@ -19,16 +18,13 @@ restic_policy_keep_yearly: 5
 restic_policy_backup_frequency: hourly
 
 restic_base_environment:
-  RESTIC_REPOSITORY: "{{ restic_repo_url }}"
+  RESTIC_JOBNAME: "{{ restic_job_name | default('unknown') }}"
-  RESTIC_PASSWORD: "{{ restic_repo_password }}"
-  RESTIC_JOBNAME: "{{ restic_job_name }}"
   RESTIC_FORGET_KEEP_WITHIN: "{{ restic_policy_keep_all_within }}"
   RESTIC_FORGET_KEEP_HOURLY: "{{ restic_policy_keep_hourly }}"
   RESTIC_FORGET_KEEP_DAILY: "{{ restic_policy_keep_daily }}"
   RESTIC_FORGET_KEEP_WEEKLY: "{{ restic_policy_keep_weekly }}"
   RESTIC_FORGET_KEEP_MONTHLY: "{{ restic_policy_keep_monthly }}"
   RESTIC_FORGET_KEEP_YEARLY: "{{ restic_policy_keep_yearly }}"
-  RESTIC_GENERATE_SNAPSHOT_METRICS_COMMAND: "{{ restic_backup_generate_metrics_command }}"
 
 restic_s3_environment:
   AWS_ACCESS_KEY_ID: "{{ restic_s3_key_id }}"
@@ -37,8 +33,8 @@ restic_s3_environment:
 restic_complete_environment: >-
   {{
     restic_base_environment
-    | combine((restic_s3_environment | default({}))
+    | combine((restic_s3_environment
-      if (restic_s3_key_id and restic_s3_access_key) else {})
+      if (restic_s3_key_id and restic_s3_access_key) else {}) | default({}))
     | combine(restic_environment | default({}))
   }}
 
@@ -50,3 +46,15 @@ restic_policy:
   monthly: "{{ restic_policy_keep_monthly }}"
   yearly: "{{ restic_policy_keep_yearly }}"
   frequency: "{{ restic_policy_backup_frequency }}"
+
+restic_user: root
+restic_create_user: false
+restic_start_job_on_unit_change: false
+
+restic_job_name: ~
+restic_job_description: "Restic backup job for {{ restic_job_name }}"
+restic_systemd_unit_naming_scheme: "restic.{{ restic_job_name }}"
+restic_systemd_working_directory: /tmp
+restic_systemd_syslog_identifier: "restic-{{ restic_job_name }}"
+
+restic_package_name: restic

roles/restic/defaults/main/main.yml

@@ -1,16 +0,0 @@
----
-restic_user: root
-restic_user_create: false
-restic_create_user: "{{ restic_user_create }}"
-restic_user_create_home: false
-restic_user_system: false
-
-restic_state: present
-restic_version: "0.17.3"
-restic_job_name: default
-restic_job_state: "{{ restic_state }}"
-restic_job_directory: "/etc/restic"
-
-restic_package_name: restic
-restic_script_generate_snapshot_metrics: "/opt/restic-generate-snapshot-metrics.sh"
-restic_start_job_on_unit_change: true

roles/restic/defaults/main/systemd.yml

@@ -1,20 +0,0 @@
----
-restic_systemd_job_description: "Restic backup service"
-restic_systemd_unit_naming_scheme: "restic-{{ restic_job_name }}"
-restic_systemd_timer_naming_scheme: >-2
-  {{ restic_systemd_unit_naming_scheme }}.timer
-restic_systemd_timer_state_map:
-  present: "started"
-  absent: "stopped"
-  masked: "started"
-restic_systemd_timer_state: >-2
-  {{ restic_systemd_timer_state_map[restic_job_state] }}
-
-restic_systemd_syslog_identifier: "restic@%i"
-restic_systemd_working_directory: /tmp
-restic_systemd_install_wanted_by: "basic.target"
-restic_systemd_install_default_instance: "default"
-
-restic_systemd_start_job_on_unit_change: false
-restic_systemd_service_exec_start: "/opt/restic-backup.sh"
-

roles/restic/files/restic-backup-directories.sh

@@ -6,21 +6,17 @@ if [[ -n ${RESTIC_PRE_BACKUP_HOOK-} ]]; then
     /bin/bash -c "$RESTIC_PRE_BACKUP_HOOK"
 fi
 
-echo "List existing snapshots or initialize repository"
+echo "List existing snapshots or attempt to initialize/unlock repository"
-restic snapshots || restic init
+restic snapshots || restic init || restic unlock
 sleep 1;
 
 echo "Attempting to remove lock if present"
 restic unlock
-sleep 1;
+sleep 2
 
 echo "Start backup on ${@:1}"
 restic --verbose --retry-lock=${RESTIC_RETRY_LOCK:-5m} backup "${@:1}"
-sleep 1;
+sleep 2
-
-if [[ -n ${RESTIC_POIST_BACKUP_HOOK-} ]]; then
-    /bin/bash -c "$RESTIC_POST_BACKUP_HOOK"
-fi
 
 echo "Forget and prune old snapshots"
 restic forget --prune --retry-lock=${RESTIC_RETRY_LOCK:-5m} \
@@ -33,11 +29,9 @@ restic forget --prune --retry-lock=${RESTIC_RETRY_LOCK:-5m} \
 sleep 2
 
 echo "Generate snapshot metrics"
-if [[ -n ${RESTIC_GENERATE_SNAPSHOT_METRICS_COMMAND-} ]]; then
+restic --json snapshots | /opt/restic-generate-snapshot-metrics.sh \
-    restic --json snapshots | ${RESTIC_GENERATE_SNAPSHOT_METRICS_COMMAND} \
     > /var/lib/node_exporter/restic-snapshots-${RESTIC_JOBNAME:-unknown}.prom-src
-    sleep 2;
+sleep 2
-fi
 
 echo "Check repository"
 restic check

roles/restic/handlers/main.yml

@@ -1,12 +1,13 @@
 ---
+
 - name: Ensure system daemon is reloaded
   listen: reload-systemd
-  ansible.builtin.systemd:
+  systemd:
     daemon_reload: true
 
 - name: Ensure systemd service for '{{ restic_job_name }}' is started immediately
   listen: trigger-restic
-  ansible.builtin.systemd:
+  systemd:
-    name: "{{ restic_systemd_timer_naming_scheme }}"
+    name: "{{ restic_systemd_unit_naming_scheme }}.service"
     state: started
-  when: (not ansible_check_mode) and restic_start_job_on_unit_change
+  when: restic_start_job_on_unit_change

roles/restic/tasks/check.yml

@@ -1,35 +0,0 @@
----
-- name: Check if 'restic_state' is valid
-  ansible.builtin.fail:
-    msg: >-2
-      Unknown value '{{ restic_state }}' for 'restic_state'!
-      Supported values are {{ restic_states | join(', ') }}
-  when: restic_state not in restic_states
-
-- name: Ensure 'restic_job_name' is properly populated
-  ansible.builtin.fail:
-    msg: >-2
-      Unsupported restic_job_name '{{ restic_job_name | string }}'!
-  when:
-    - not (restic_job_name | string | length > 0)
-
-- name: Ensure either backup_paths or backup_stdin_command is populated
-  ansible.builtin.fail:
-    msg: >-2
-      Setting both `restic_backup_paths` and `restic_backup_stdin_command`
-      is not supported!
-  when: restic_backup_paths|length > 0 and restic_backup_stdin_command and false
-
-- name: Ensure a filename for stdin_command backup is given
-  ansible.builtin.fail:
-    msg: >-2
-      `restic_backup_stdin_command` was set but no filename for the resulting
-      output was supplied in `restic_backup_stdin_command_filename`.
-  when: restic_backup_stdin_command and not restic_backup_stdin_command_filename
-
-- name: Ensure backup frequency adheres to systemd's OnCalender syntax
-  command:
-    cmd: "systemd-analyze calendar {{ restic_policy.frequency }}"
-  register: systemd_calender_parse_res
-  failed_when: systemd_calender_parse_res.rc != 0
-  changed_when: false

roles/restic/tasks/configure.yml

@@ -1,30 +0,0 @@
----
-- name: Ensure systemd timer file for '{{ restic_job_name }}' is {{ restic_state }}'
-  ansible.builtin.template:
-    dest: "/etc/systemd/system/{{ restic_systemd_unit_naming_scheme }}.timer"
-    src: restic.timer.j2
-    owner: root
-    group: root
-    mode: "0640"
-  when: restic_state == 'present'
-  register: restic_systemd_timer_info
-  notify:
-    - reload-systemd
-
-- name: Ensure restic configuration for '{{ restic_job_name }}' is {{ restic_job_state }}
-  ansible.builtin.template:
-    src: "restic.conf.j2"
-    dest: "{{ restic_job_directory }}/{{ restic_job_name }}.conf"
-    mode: "0640"
-  when: restic_job_state in ['present', 'masked']
-  notify:
-    - trigger-restic
-
-- name: Ensure restic configuration for '{{ restic_job_name }}' is {{ restic_job_state }}
-  ansible.builtin.file:
-    path: "{{ restic_job_directory }}/{{ restic_job_name }}.conf"
-    state: "{{ restic_job_state }}"
-  when: restic_job_state not in ['present', 'masked']
-
-- name: Flush handlers to ensure systemd knows about '{{ restic_job_name }}'
-  meta: flush_handlers

roles/restic/tasks/install.yml

@@ -1,48 +0,0 @@
----
-- name: Ensure restic is installed
-  block:
-    - name: Ensure restic is installed via apt
-      apt:
-        package: restic
-        state: latest
-      when: ansible_os_family == 'Debian'
-    - name: Ensure restic is installed via dnf
-      dnf:
-        name: restic
-        state: latest
-      when: ansible_os_family == 'RedHat'
-    - name: Ensure restic is installed using the auto-detected package-manager
-      package:
-        name: "{{ restic_package_name }}"
-        state: present
-      when: ansible_os_family not in ['RedHat', 'Debian']
-
-- name: Ensure restic backup scripts are {{ restic_state }}
-  ansible.builtin.copy:
-    src: "{{ script.source }}"
-    dest: "{{ script.destination }}"
-    mode: "{{ script.mode }}"
-  loop:
-    - source: restic-backup.sh
-      destination: "{{ restic_systemd_service_exec_start }}"
-      mode: "0510"
-    - source: restic-snapshot-metrics.sh
-      destination: "{{ restic_script_generate_snapshot_metrics }}"
-      mode: "0510"
-  loop_control:
-    loop_var: script
-    label: "{{ script.source }}"
-
-- name: Ensure systemd service file for restic template unit is {{ restic_state }}
-  ansible.builtin.template:
-    dest: "/etc/systemd/system/restic@.service"
-    src: "restic@.service.j2"
-    owner: root
-    group: root
-    mode: "0640"
-  when: restic_state == 'present'
-  notify:
-    - reload-systemd
-    - trigger-restic
-
-

roles/restic/tasks/main.yml

@@ -1,39 +1,77 @@
 ---
-- name: Check if role input is valid
-  ansible.builtin.include_tasks:
-    file: check.yml
 
-- name: Ensure restic is {{ restic_state }}
+- name: Ensure {{ restic_user }} system user exists
-  ansible.builtin.include_tasks:
+  user:
-    file: install.yml
-
-- name: Ensure restic user '{{ restic_user }}' is {{ restic_state }}
-  ansible.builtin.user:
     name: "{{ restic_user }}"
-    state: "{{ restic_state }}"
+    state: present
-    system: "{{ restic_user_system }}"
+    system: true
-    create_home: "{{ restic_user_create_home }}"
   when: restic_create_user
 
-- name: Ensure restic configuration for job is {{ restic_job_state }}
+- name: Ensure either backup_paths or backup_stdin_command is populated
-  ansible.builtin.include_tasks:
+  when: restic_backup_paths|length > 0 and restic_backup_stdin_command and false
-    file: "configure.yml"
+  fail:
+    msg: "Setting both `restic_backup_paths` and `restic_backup_stdin_command` is not supported"
+
+- name: Ensure a filename for stdin_command backup is given
+  when: restic_backup_stdin_command and not restic_backup_stdin_command_filename
+  fail:
+    msg: "`restic_backup_stdin_command` was set but no filename for the resulting output was supplied in `restic_backup_stdin_command_filename`"
+
+- name: Ensure backup frequency adheres to systemd's OnCalender syntax
+  command:
+    cmd: "systemd-analyze calendar {{ restic_policy.frequency }}"
+  register: systemd_calender_parse_res
+  failed_when: systemd_calender_parse_res.rc != 0
+  changed_when: false
+
+- name: Ensure restic is installed
+  block:
+    - name: Ensure restic is installed via apt
+      apt:
+        package: restic
+        state: latest
+      when: ansible_os_family == 'Debian'
+    - name: Ensure restic is installed via dnf
+      dnf:
+        name: restic
+        state: latest
+      when: ansible_os_family == 'RedHat'
+    - name: Ensure restic is installed using the auto-detected package-manager
+      package:
+        name: "{{ restic_package_name }}"
+        state: present
+      when: ansible_os_family not in ['RedHat', 'Debian']
+
+- name: Ensure systemd service file for '{{ restic_job_name }}' is templated
+  template:
+    dest: "/etc/systemd/system/{{ restic_systemd_unit_naming_scheme }}.service"
+    src: restic.service.j2
+    owner: root
+    group: root
+    mode: 0640
+  notify:
+    - reload-systemd
+    - trigger-restic
+
+- name: Ensure systemd service file for '{{ restic_job_name }}' is templated
+  template:
+    dest: "/etc/systemd/system/{{ restic_systemd_unit_naming_scheme }}.timer"
+    src: restic.timer.j2
+    owner: root
+    group: root
+    mode: 0640
+  notify:
+    - reload-systemd
+
+- name: Flush handlers to ensure systemd knows about '{{ restic_job_name }}'
+  meta: flush_handlers
 
 - name: Ensure systemd timer for '{{ restic_job_name }}' is activated
-  ansible.builtin.systemd:
+  systemd:
-    name: "{{ restic_systemd_timer_naming_scheme }}"
+    name: "{{ restic_systemd_unit_naming_scheme }}.timer"
     enabled: true
-  when:
-    - restic_systemd_timer_info.changed
-    - not restic_systemd_timer_info.failed
-    - not ansible_check_mode
 
-- name: Ensure systemd timer for '{{ restic_job_name }}' is {{ restic_job_state }}
+- name: Ensure systemd timer for '{{ restic_job_name }}' is started
-  ansible.builtin.systemd:
+  systemd:
-    name: "{{ restic_systemd_timer_naming_scheme }}"
+    name: "{{ restic_systemd_unit_naming_scheme }}.timer"
-    state: "{{ restic_job_state }}"
+    state: started
-    masked: "{{ (restic_job_state == 'masked') | ternary('true', omit) }}"
-  when:
-    - restic_systemd_timer_info.changed
-    - not restic_systemd_timer_info.failed
-    - not ansible_check_mode

roles/restic/templates/restic.conf.j2

@@ -1,3 +0,0 @@
-{% for kv in restic_complete_environment | dict2items %}
-{{ kv.key }}={{ kv.value }}
-{% endfor %}

roles/restic/templates/restic.service.j2

@@ -0,0 +1,51 @@
+[Unit]
+Description={{ restic_job_description }}
+
+[Service]
+Type=simple
+User={{ restic_user }}
+WorkingDirectory={{ restic_systemd_working_directory }}
+SyslogIdentifier={{ restic_systemd_syslog_identifier }}
+
+Environment=RESTIC_REPOSITORY={{ restic_repo_url }}
+Environment=RESTIC_PASSWORD={{ restic_repo_password }}
+{% for kv in restic_complete_environment | dict2items %}
+Environment={{ kv.key }}={{ kv.value }}
+{% endfor %}
+
+{% if restic_init | default(true) %}
+ExecStartPre=-/bin/sh -c '/usr/bin/restic snapshots || /usr/bin/restic init'
+{% endif %}
+{% if restic_unlock_before_backup | default(false) %}
+ExecStartPre=-/bin/sh -c 'sleep 3 && /usr/bin/restic unlock'
+{% endif %}
+{% if restic_backup_pre_hook | default(false) %}
+ExecStartPre=-{{ restic_backup_pre_hook }}
+{% endif %}
+{% if restic_backup_stdin_command %}
+ExecStart=/bin/sh -c '{{ restic_backup_stdin_command }} | /usr/bin/restic backup \
+	--retry-lock {{ restic_retry_lock | default('5m') }} \
+	--verbose --stdin \
+	--stdin-filename {{ restic_backup_stdin_command_filename }}'
+{% else %}
+ExecStart=/opt/restic-backup-directories.sh {{ restic_backup_paths | join(' ') }}
+{% endif %}
+{% if restic_forget_prune | default(true) %}
+ExecStartPost=/usr/bin/restic forget --prune \
+	--retry-lock {{ restic_retry_lock | default('5m') }} \
+	--keep-within={{ restic_policy.keep_within }} \
+	--keep-hourly={{ restic_policy.hourly }} \
+	--keep-daily={{ restic_policy.daily }} \
+	--keep-weekly={{ restic_policy.weekly }} \
+	--keep-monthly={{ restic_policy.monthly }} \
+	--keep-yearly={{ restic_policy.yearly }}
+{% endif %}
+{% if restic_list_snapshots | default(true) %}
+ExecStartPost=-/usr/bin/restic snapshots --retry-lock {{ restic_retry_lock | default('5m') }}
+{% endif %}
+{% if restic_backup_post_hook | default(false) %}
+ExecStartPost=-{{ restic_backup_post_hook }}
+{% endif %}
+{% if restic_check | default(true) %}
+ExecStartPost=/usr/bin/restic check --retry-lock {{ restic_retry_lock | default('5m') }}
+{% endif %}

roles/restic/templates/restic@.service.j2

@@ -1,15 +0,0 @@
-[Unit]
-Description={{ restic_systemd_job_description }}
-
-[Service]
-Type=simple
-EnvironmentFile={{ restic_job_directory }}/%i.conf
-User={{ restic_user }}
-WorkingDirectory={{ restic_systemd_working_directory }}
-SyslogIdentifier={{ restic_systemd_syslog_identifier }}
-
-ExecStart={{ restic_systemd_service_exec_start }}
-
-[Install]
-WantedBy={{ restic_systemd_install_wanted_by }}
-DefaultInstance={{ restic_systemd_install_default_instance }}

roles/restic/vars/main.yml

@@ -1,9 +0,0 @@
----
-restic_states:
-  - "present"
-  - "absent"
-
-restic_job_states:
-  - "present"
-  - "masked"
-  - "absent"