Solved bug which prevented backup2loc to be activated

This commit is contained in:
Kevin Veen-Birkenbach 2025-08-12 15:42:18 +02:00
parent 6d14f16dfd
commit 0b3b3a810a
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
8 changed files with 36 additions and 35 deletions

View File

@ -2,7 +2,7 @@
application_id: "svc-prx-openresty"
# Deactivate Database for openresty
database_enabled: false
database_type: ""
# Openresty
openresty_image: "openresty/openresty"

View File

@ -1 +0,0 @@
database_enabled: "{{ database_type | default('') | bool }}" # Enables the database backup

View File

@ -1,12 +1,12 @@
- block:
- name: "pkgmgr install {{ bkp_docker_to_local_pkg }}"
- name: "pkgmgr install {{ bkp_docker_2_loc_pkg }}"
include_role:
name: pkgmgr-install
vars:
package_name: "{{ bkp_docker_to_local_pkg }}"
package_name: "{{ bkp_docker_2_loc_pkg }}"
- name: "Retrieve {{ bkp_docker_to_local_pkg }} path from pkgmgr"
command: "pkgmgr path {{ bkp_docker_to_local_pkg }}"
- name: "Retrieve {{ bkp_docker_2_loc_pkg }} path from pkgmgr"
command: "pkgmgr path {{ bkp_docker_2_loc_pkg }}"
register: pkgmgr_output
changed_when: false
@ -16,4 +16,4 @@
changed_when: false
when: backup_docker_to_local_folder is not defined
vars:
bkp_docker_to_local_pkg: backup-docker-to-local
bkp_docker_2_loc_pkg: backup-docker-to-local

View File

@ -52,10 +52,10 @@
database_name is defined and
database_username is defined and
database_password is defined) and
run_once_bkp_docker_to_local_file_permission is not defined
run_once_bkp_docker_2_loc_file_permission is not defined
register: file_permission_result
- name: run the backup_docker_to_local_file_permission tasks once
set_fact:
run_once_bkp_docker_to_local_file_permission: true
when: run_once_bkp_docker_to_local_file_permission is not defined and file_permission_result is defined and file_permission_result.changed
run_once_bkp_docker_2_loc_file_permission: true
when: run_once_bkp_docker_2_loc_file_permission is not defined and file_permission_result is defined and file_permission_result.changed

View File

@ -3,9 +3,8 @@
- include_tasks: utils/run_once.yml
when:
- run_once_sys_bkp_docker_2_loc is not defined
- database_enabled | bool
- name: "include 04_seed-database-to-backup.yml"
include_tasks: 04_seed-database-to-backup.yml
when:
- database_enabled | bool
- bkp_docker_2_loc_db_enabled | bool

View File

@ -5,5 +5,5 @@ OnFailure=sys-alm-compose.infinito@%n.service sys-cln-faild-bkps.infinito.servic
[Service]
Type=oneshot
ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{ system_maintenance_backup_services | reject('equalto', 'sys-bkp-docker-2-loc') | join(' ') }} --timeout "{{system_maintenance_lock_timeout_backup_services}}"'
ExecStart=/bin/sh -c '{{ bkp_docker_to_local_exec }} --everything'
ExecStart=/bin/sh -c '{{ bkp_docker_2_loc_exec }} --everything'
ExecStartPost=/bin/sh -c '/bin/systemctl start sys-rpr-docker-soft.infinito.service &'

View File

@ -5,5 +5,5 @@ OnFailure=sys-alm-compose.infinito@%n.service sys-cln-faild-bkps.infinito.servic
[Service]
Type=oneshot
ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{ system_maintenance_backup_services | reject('equalto', 'sys-bkp-docker-2-loc-everything') | join(' ') }} --timeout "{{system_maintenance_lock_timeout_backup_services}}"'
ExecStart=/bin/sh -c '{{ bkp_docker_to_local_exec }}'
ExecStart=/bin/sh -c '{{ bkp_docker_2_loc_exec }}'
ExecStartPost=/bin/sh -c '/bin/systemctl start sys-rpr-docker-soft.infinito.service &'

View File

@ -1,43 +1,46 @@
# Mapping logic for backup-docker-to-local CLI arguments
#
# - bkp_docker_to_local_database_routine: All service names where backup.database_routine is set (for --database-containers)
# - bkp_docker_to_local_no_stop_required: All images where backup.no_stop_required is set (for --images-no-stop-required)
# - bkp_docker_to_local_disabled: All images where backup.disabled is set (for --images-no-backup-required)
# - bkp_docker_2_loc_database_routine: All service names where backup.database_routine is set (for --database-containers)
# - bkp_docker_2_loc_no_stop_required: All images where backup.no_stop_required is set (for --images-no-stop-required)
# - bkp_docker_2_loc_disabled: All images where backup.disabled is set (for --images-no-backup-required)
# CLI-ready variables render these lists as argument strings.
# Verify if DB is enabled
bkp_docker_2_loc_db_enabled: "{{ database_type | default('') | bool }}"
# Gather mapped values as lists
bkp_docker_to_local_database_routine: >-
bkp_docker_2_loc_database_routine: >-
{{ applications | find_dock_val_by_bkp_entr('database_routine', 'name') | list }}
bkp_docker_to_local_no_stop_required: >-
bkp_docker_2_loc_no_stop_required: >-
{{ applications | find_dock_val_by_bkp_entr('no_stop_required', 'image') | list }}
bkp_docker_to_local_disabled: >-
bkp_docker_2_loc_disabled: >-
{{ applications | find_dock_val_by_bkp_entr('disabled', 'image') | list }}
# CLI argument strings (only set if list not empty)
bkp_docker_to_local_database_routine_cli: >-
{% if bkp_docker_to_local_database_routine | length > 0 -%}
--database-containers {{ bkp_docker_to_local_database_routine | join(' ') }}
bkp_docker_2_loc_database_routine_cli: >-
{% if bkp_docker_2_loc_database_routine | length > 0 -%}
--database-containers {{ bkp_docker_2_loc_database_routine | join(' ') }}
{%- endif %}
bkp_docker_to_local_no_stop_required_cli: >-
{% if bkp_docker_to_local_no_stop_required | length > 0 -%}
--images-no-stop-required {{ bkp_docker_to_local_no_stop_required | join(' ') }}
bkp_docker_2_loc_no_stop_required_cli: >-
{% if bkp_docker_2_loc_no_stop_required | length > 0 -%}
--images-no-stop-required {{ bkp_docker_2_loc_no_stop_required | join(' ') }}
{%- endif %}
bkp_docker_to_local_disabled_cli: >-
{% if bkp_docker_to_local_disabled | length > 0 -%}
--images-no-backup-required {{ bkp_docker_to_local_disabled | join(' ') }}
bkp_docker_2_loc_disabled_cli: >-
{% if bkp_docker_2_loc_disabled | length > 0 -%}
--images-no-backup-required {{ bkp_docker_2_loc_disabled | join(' ') }}
{%- endif %}
# List of CLI args for convenience (e.g. for looping or joining)
bkp_docker_to_local_cli_args_list:
- "{{ bkp_docker_to_local_database_routine_cli }}"
- "{{ bkp_docker_to_local_no_stop_required_cli }}"
- "{{ bkp_docker_to_local_disabled_cli }}"
bkp_docker_2_loc_cli_args_list:
- "{{ bkp_docker_2_loc_database_routine_cli }}"
- "{{ bkp_docker_2_loc_no_stop_required_cli }}"
- "{{ bkp_docker_2_loc_disabled_cli }}"
bkp_docker_to_local_exec: >-
bkp_docker_2_loc_exec: >-
/usr/bin/python {{ backup_docker_to_local_folder }}backup-docker-to-local.py
--compose-dir {{ path_docker_compose_instances }}
{{ bkp_docker_to_local_cli_args_list | select('string') | join(' ') }}
{{ bkp_docker_2_loc_cli_args_list | select('string') | join(' ') }}