From 0c52fcc5aa8c54fac13e55b5f8859c07fb9abd44 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 30 May 2024 14:23:12 +0200 Subject: [PATCH] Nuovo tentativo di fix ai separatori. --- defaults/main.yml | 4 ++-- templates/epas-client-timbrature-docker-compose.yml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b0f3783..4cf7adf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -32,10 +32,10 @@ epas_client_timbrature_user: 'user' #epas_client_timbrature_password: 'use a vault file' epas_client_timbrature_loglevel: 'INFO' #epas_client_timbrature_regex_stamping: '^(?P\d{2})(?P\d{2})[!|\s](?P\d{4})\w(?P[\w,\s,.]{17})(?P\d\d)(?P\d\d)(?P\d\d)(?P\d\d)(?P\d\d)$' -epas_client_timbrature_regex_stamping: '^(?P\\\d{2})(?P\\\d{2})[!|\\\s](?P\\\d{4})\\\w(?P[\\\w,\\\s,.]{17})(?P\\\d\\\d)(?P\\\d\\\d)(?P\\\d\\\d)(?P\\\d\\\d)(?P\\\d\\\d)$' +epas_client_timbrature_regex_stamping: "^(?P\\\d{2})(?P\\\d{2})[!|\\\s](?P\\\d{4})\\\w(?P[\\\w,\\\s,.]{17})(?P\\\d\\\d)(?P\\\d\\\d)(?P\\\d\\\d)(?P\\\d\\\d)(?P\\\d\\\d)$" epas_client_timbrature_offset_anno_badge: '1980' epas_client_timbrature_fix_causale_pausa_pranzo: 'False' -epas_client_timbrature_mapping_causali_client_server: "{'0000': None, '2345': None,'0001':'motiviDiServizio'}" +epas_client_timbrature_mapping_causali_client_server: "{\'0000\': None, \'2345\': None,\'0001\':\'motiviDiServizio\'}" epas_client_timbrature_causale_pausa_pranzo_min_hour: '12' epas_client_timbrature_causale_pausa_pranzo_max_hour: '15' epas_client_timbrature_send_all_stampings_everytime: 'True' diff --git a/templates/epas-client-timbrature-docker-compose.yml.j2 b/templates/epas-client-timbrature-docker-compose.yml.j2 index 718d8e5..dc93620 100644 --- a/templates/epas-client-timbrature-docker-compose.yml.j2 +++ b/templates/epas-client-timbrature-docker-compose.yml.j2 @@ -41,10 +41,10 @@ services: - EPAS_CLIENT_USER={{ epas_client_timbrature_user }} # utente configurato in epas dentro sorgenti timbrature - EPAS_CLIENT_PASSWORD={{ epas_client_timbrature_password }} - LOG_LEVEL={{ epas_client_timbrature_loglevel }} # Default: INFO - - REGEX_STAMPING='{{ epas_client_timbrature_regex_stamping }}' + - REGEX_STAMPING={{ epas_client_timbrature_regex_stamping }} - OFFSET_ANNO_BADGE={{ epas_client_timbrature_offset_anno_badge }} # Default: 2000 - FIX_CAUSALE_PAUSA_PRANZO={{ epas_client_timbrature_fix_causale_pausa_pranzo}} # Default: False - - MAPPING_CAUSALI_CLIENT_SERVER="{{ epas_client_timbrature_mapping_causali_client_server }}" # Default: {'0000': None, '0001': 'motiviDiServizio', '0007': 'pausaPranzo'} + - MAPPING_CAUSALI_CLIENT_SERVER={{ epas_client_timbrature_mapping_causali_client_server }} # Default: {'0000': None, '0001': 'motiviDiServizio', '0007': 'pausaPranzo'} - CAUSALE_PAUSA_PRANZO_MIN_HOUR={{ epas_client_timbrature_causale_pausa_pranzo_min_hour }} # Default: 12 - CAUSALE_PAUSA_PRANZO_MAX_HOUR={{ epas_client_timbrature_causale_pausa_pranzo_max_hour }} # Default: 15 - SEND_ALL_STAMPINGS_EVERYTIME={{ epas_client_timbrature_send_all_stampings_everytime }}