Merge pull request #15 from dbrennand/issue/#12

Issue/#12
dbrennand · Jul 29, 2024 · 135da11 · 135da11
2 parents 0e20a3e + e0b345f
commit 135da11
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,13 +1,12 @@
 {
-    "image": "ghcr.io/ansible/creator-ee:v0.13.0",
+    "image": "ghcr.io/ansible/community-ansible-dev-tools:v24.7.2",
     "customizations": {
         "vscode": {
             "extensions": [
                 "redhat.ansible",
                 "streetsidesoftware.code-spell-checker",
                 "github.copilot",
-                "yzhang.markdown-all-in-one",
-                "eamodio.gitlens"
+                "yzhang.markdown-all-in-one"
             ]
         }
     },

diff --git a/.gitpod.yml b/.gitpod.yml
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Daniel Brennand
+Copyright (c) 2024 Daniel Brennand
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # Ansible Role: dbrennand.autorestic
 
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/dbrennand/ansible-role-autorestic)
 ![Ansible-Lint](https://github.com/dbrennand/ansible-role-autorestic/actions/workflows/ansible-lint.yml/badge.svg)
 ![Molecule](https://github.com/dbrennand/ansible-role-autorestic/actions/workflows/molecule.yml/badge.svg)
 ![Ansible-Release](https://github.com/dbrennand/ansible-role-autorestic/actions/workflows/ansible-release.yml/badge.svg)
@@ -64,6 +63,12 @@ autorestic_config:
 
 See the [autorestic documentation](https://autorestic.vercel.app/config) for details on the YAML configuration.
 
+```yaml
+autorestic_config_template: autorestic.yml.j2
+```
+
+The [`autorestic.yml.j2`](templates/autorestic.yml.j2) template to use for the autorestic YAML configuration. By default the content of `autorestic_config` is templated. This can be overridden to use a custom template. See [#14](https://github.com/dbrennand/ansible-role-autorestic/issues/14#issuecomment-2198394106) for an example.
+
 ```yaml
 autorestic_config_file: ~/.autorestic.yml
 ```

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -21,6 +21,7 @@ autorestic_config:
       env:
         B2_ACCOUNT_ID: ID
         B2_ACCOUNT_KEY: Key
+autorestic_config_template: autorestic.yml.j2
 autorestic_config_file: ~/.autorestic.yml
 autorestic_info: false
 autorestic_check: false

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -46,8 +46,8 @@
   when: autorestic_architecture is defined
 
 - name: Create autorestic configuration file
-  ansible.builtin.copy:
-    content: "{{ autorestic_config | to_yaml }}"
+  ansible.builtin.template:
+    src: "{{ autorestic_config_template }}"
     dest: "{{ autorestic_config_file }}"
     mode: "0600"
 

diff --git a/templates/autorestic.yml.j2 b/templates/autorestic.yml.j2
@@ -0,0 +1 @@
+{{ autorestic_config | to_nice_yaml }}