Merge "cron fix"
diff --git a/README.rst b/README.rst
index a7e0b72..6a003ea 100644
--- a/README.rst
+++ b/README.rst
@@ -84,7 +84,7 @@
incr_before_full: 3
backup_dir: /var/backups/mysql/xtrabackup
backup_times:
- dayOfWeek: 0
+ day_of_week: 0
hour: 4
minute: 52
compression: true
@@ -101,7 +101,7 @@
``backup_times`` parameters is not defined, the defalut ``*`` value will be
used. For example, if minute parameter is ``*``, it will run the backup every minute,
which is ususally not desired.
- Available parameters are ``dayOfWeek``, ``dayOfMonth``, ``month``, ``hour`` and ``minute``.
+ Available parameters are ``day_of_week``, ``day_of_month``, ``month``, ``hour`` and ``minute``.
Please see the crontab reference for further info on how to set these parameters.
.. note:: Please be aware that only ``backup_times`` section OR
@@ -154,7 +154,7 @@
incr_before_full: 3
backup_dir: /srv/backup
backup_times:
- dayOfWeek: 0
+ day_of_week: 0
hour: 4
minute: 52
key:
diff --git a/tests/pillar/client_backup_times.sls b/tests/pillar/client_backup_times.sls
index 2e83129..e4cd6b0 100644
--- a/tests/pillar/client_backup_times.sls
+++ b/tests/pillar/client_backup_times.sls
@@ -5,9 +5,9 @@
incr_before_full: 3
backup_dir: /var/backups/mysql/xtrabackup
backup_times:
- dayOfWeek: 0
+ day_of_week: 0
# month: *
-# dayOfMonth: *
+# day_of_month: *
hour: 4
minute: 52
compression: true
diff --git a/tests/pillar/server_backup_times.sls b/tests/pillar/server_backup_times.sls
index 44a141b..e593291 100644
--- a/tests/pillar/server_backup_times.sls
+++ b/tests/pillar/server_backup_times.sls
@@ -5,9 +5,9 @@
incr_before_full: 3
backup_dir: /srv/backup
backup_times:
- dayOfWeek: 0
+ day_of_week: 0
# month: *
-# dayOfMonth: *
+# day_of_month: *
hour: 4
minute: 52
key:
diff --git a/xtrabackup/client.sls b/xtrabackup/client.sls
index f43da4f..625218b 100644
--- a/xtrabackup/client.sls
+++ b/xtrabackup/client.sls
@@ -35,14 +35,14 @@
- name: /usr/local/bin/innobackupex-runner.sh
- user: root
{%- if client.backup_times is defined %}
-{%- if client.backup_times.dayOfWeek is defined %}
- - dayweek: {{ client.backup_times.dayOfWeek }}
+{%- if client.backup_times.day_of_week is defined %}
+ - dayweek: {{ client.backup_times.day_of_week }}
{%- endif -%}
{%- if client.backup_times.month is defined %}
- month: {{ client.backup_times.month }}
{%- endif %}
-{%- if client.backup_times.dayOfMonth is defined %}
- - daymonth: {{ client.backup_times.dayOfMonth }}
+{%- if client.backup_times.day_of_month is defined %}
+ - daymonth: {{ client.backup_times.day_of_month }}
{%- endif %}
{%- if client.backup_times.hour is defined %}
- hour: {{ client.backup_times.hour }}
diff --git a/xtrabackup/server.sls b/xtrabackup/server.sls
index 59296ff..745e9a3 100644
--- a/xtrabackup/server.sls
+++ b/xtrabackup/server.sls
@@ -42,6 +42,14 @@
- user: xtrabackup_user
- pkg: xtrabackup_server_packages
+{{ server.backup_dir }}/.ssh:
+ file.directory:
+ - mode: 700
+ - user: xtrabackup
+ - group: xtrabackup
+ - require:
+ - user: xtrabackup_user
+
{{ server.backup_dir }}/.ssh/authorized_keys:
file.managed:
- user: xtrabackup
@@ -51,6 +59,7 @@
- require:
- file: {{ server.backup_dir }}/full
- file: {{ server.backup_dir }}/incr
+ - file: {{ server.backup_dir }}/.ssh
xtrabackup_server_script:
file.managed: