cronjob fixes
Change-Id: Icddee723d13631f9594e329550fe8e022c07cfc5
diff --git a/xtrabackup/client.sls b/xtrabackup/client.sls
index 800d941..7e066bd 100644
--- a/xtrabackup/client.sls
+++ b/xtrabackup/client.sls
@@ -34,6 +34,9 @@
cron.present:
- name: /usr/local/bin/innobackupex-runner.sh
- user: root
+{%- if not client.cron %}
+ - commented: True
+{%- endif %}
- minute: 0
{%- if client.hours_before_incr is defined %}
{%- if client.hours_before_incr <= 23 and client.hours_before_incr > 1 %}
diff --git a/xtrabackup/map.jinja b/xtrabackup/map.jinja
index dcd518e..3209a7a 100644
--- a/xtrabackup/map.jinja
+++ b/xtrabackup/map.jinja
@@ -2,10 +2,12 @@
{% set client = salt['grains.filter_by']({
'Debian': {
'pkgs': ['percona-xtrabackup'],
+ 'cron': True,
'backup_dir': '/var/backups/mysql/xtrabackup'
},
'RedHat': {
'pkgs': ['percona-xtrabackup'],
+ 'cron': True,
'backup_dir': '/var/backups/mysql/xtrabackup'
},
}, merge=salt['pillar.get']('xtrabackup:client')) %}
@@ -13,10 +15,12 @@
{% set server = salt['grains.filter_by']({
'Debian': {
'pkgs': ['rsync'],
+ 'cron': True,
'backup_dir': '/var/backups/mysql/xtrabackup'
},
'RedHat': {
'pkgs': ['rsync'],
+ 'cron': True,
'backup_dir': '/var/backups/mysql/xtrabackup'
},
}, merge=salt['pillar.get']('xtrabackup:server')) %}
diff --git a/xtrabackup/server.sls b/xtrabackup/server.sls
index ad7658f..0205593 100644
--- a/xtrabackup/server.sls
+++ b/xtrabackup/server.sls
@@ -49,6 +49,9 @@
cron.present:
- name: /usr/local/bin/innobackupex-runner.sh
- user: xtrabackup
+{%- if not server.cron %}
+ - commented: True
+{%- endif %}
- minute: 0
- hour: 2
- require: