diff --git a/roles/cleanup-backups-service/Administration.md b/roles/cleanup-backups-service/Administration.md deleted file mode 100644 index e69de29b..00000000 diff --git a/roles/cleanup-backups-service/tasks/main.yml b/roles/cleanup-backups-service/tasks/main.yml index c324dc93..401cc02d 100644 --- a/roles/cleanup-backups-service/tasks/main.yml +++ b/roles/cleanup-backups-service/tasks/main.yml @@ -6,9 +6,9 @@ state: present when: run_once_cleanup_backups_service is not defined -- name: "create {{docker_cleanup_backups}}" +- name: "create {{cleanup_backups_directory}}" file: - path: "{{docker_cleanup_backups}}" + path: "{{cleanup_backups_directory}}" state: directory mode: 0755 when: run_once_cleanup_backups_service is not defined @@ -16,7 +16,7 @@ - name: create cleanup-backups.py copy: src: "cleanup-backups.py" - dest: "{{docker_cleanup_backups}}cleanup-backups.py" + dest: "{{cleanup_backups_directory}}cleanup-backups.py" when: run_once_cleanup_backups_service is not defined - name: create cleanup-backups.cymais.service diff --git a/roles/cleanup-backups-service/templates/cleanup-backups.service.j2 b/roles/cleanup-backups-service/templates/cleanup-backups.service.j2 index b26c3e8e..57f303ab 100644 --- a/roles/cleanup-backups-service/templates/cleanup-backups.service.j2 +++ b/roles/cleanup-backups-service/templates/cleanup-backups.service.j2 @@ -5,4 +5,4 @@ OnFailure=systemd-notifier.cymais@%n.service [Service] Type=oneshot ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{system_maintenance_cleanup_services| join(' ') }} --timeout "{{system_maintenance_lock_timeout_backup_services}}"' -ExecStart=/bin/sh -c '/usr/bin/python {{docker_cleanup_backups}}cleanup-backups.py --backups-folder-path {{backups_folder_path}} --maximum-backup-size-percent {{size_percent_maximum_backup}}' \ No newline at end of file +ExecStart=/bin/sh -c '/usr/bin/python {{cleanup_backups_directory}}cleanup-backups.py --backups-folder-path {{backups_folder_path}} --maximum-backup-size-percent {{size_percent_maximum_backup}}' \ No newline at end of file diff --git a/roles/cleanup-backups-service/vars/main.yml b/roles/cleanup-backups-service/vars/main.yml new file mode 100644 index 00000000..3490e588 --- /dev/null +++ b/roles/cleanup-backups-service/vars/main.yml @@ -0,0 +1 @@ +cleanup_backups_directory: "{{path_administrator_scripts}}cleanup-backups/" \ No newline at end of file