From bdc2031f0d33fcdca71fff7a83881160739f59d7 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 9 Jul 2020 16:33:35 +0200 Subject: [PATCH] make cron optional --- defaults/main.yml | 2 ++ tasks/main.yml | 3 ++- vars/main.yml | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4bb04cd..8fe5ef4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,9 +5,11 @@ submodules_versioncheck: false postgresql_backup: required_packages: - postgresql-client + - cron backup_dir: /var/backup/postgresql date_format: '%Y-%m-%d_%H-%M' user: root + cron: true cron_minute: '*' cron_hour: '0' databases: [] diff --git a/tasks/main.yml b/tasks/main.yml index b77ea90..bccafbf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: combine postgresql_backup configuration set_fact: - ranger: "{{ _postgresql_backup|combine(postgresql_backup, recursive=True) }}" + postgresql_backup: "{{ _postgresql_backup|combine(postgresql_backup, recursive=True) }}" - include_tasks: versioncheck.yml when: submodules_versioncheck|bool @@ -26,3 +26,4 @@ hour: "{{ postgresql_backup.cron_hour | default( '0' ) }}" job: /opt/postgresql-backup-script.sh >/dev/null 2>&1 user: "{{ postgresql_backup.user }}" + when: postgresql_backup.cron diff --git a/vars/main.yml b/vars/main.yml index 855ee1e..190481a 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -2,13 +2,15 @@ _postgresql_backup: required_packages: - postgresql-client + - cron backup_dir: /var/backup/postgresql date_format: '%Y-%m-%d_%H-%M' user: root + cron: true cron_minute: '*' cron_hour: '0' databases: [] # versionscheck -playbook_version_number: 20 # should be int +playbook_version_number: 21 # should be int playbook_version_path: 'role-postgresql-backup_roles-ansible_github.com.version' # unique string