Merge pull request #24 from coopdevs/fix-backup-module

fix backup path & folder path
coopdevs · Jun 8, 2022 · 5ff94c0 · 5ff94c0
2 parents f97a8ba + 01a1eb7
commit 5ff94c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -26,8 +26,9 @@ monitoring_promtail_modules_enabled:
 monitoring_promtail_modules_available:
   backups:
     # Use backups-role var if available.
-    log_path: "{{ backups_role_cron_stdout_file | default('/var/log/cron.d/restic-std{err,out}.log') }}"
+    log_path: "{{ backups_role_cron_stdout_file | default('/var/log/cron.d/restic-std*.log') }}"
     template: "backups-role.j2"
+    log_path_folder: "{{ backups_role_cron_std_folder | default('/var/log/cron.d') }}"
   odoo:
     # Use odoo-role var if available.
     log_path: "{{ odoo_role_odoo_log_path | default('/var/log/odoo') }}/odoo.log"

diff --git a/templates/monitoring-docker-compose.yml.j2 b/templates/monitoring-docker-compose.yml.j2
@@ -24,7 +24,7 @@ services:
     volumes:
       - {{ monitoring_promtail_config_dir }}:{{ monitoring_promtail_config_dir }}
 {% for module in monitoring_promtail_modules_enabled %}
-{% set log_path = monitoring_promtail_modules_available[module]["log_path"] %}
+{% set log_path = monitoring_promtail_modules_available[module]["log_path_folder"] %}
       - {{ log_path }}:{{ log_path }}:ro
 {% endfor %}
 #    healthcheck: