dir fixes
Change-Id: Ibf5bfad7ef680a6ad868742b508311293c829f2e
diff --git a/xtrabackup/client.sls b/xtrabackup/client.sls
index 7e066bd..8a246b7 100644
--- a/xtrabackup/client.sls
+++ b/xtrabackup/client.sls
@@ -14,18 +14,16 @@
- require:
- pkg: xtrabackup_client_packages
-xtrabackup_client_restore_script:
- file.managed:
- - name: /usr/local/bin/innobackupex-restore.sh
- - source: salt://xtrabackup/files/innobackupex-client-restore.sh
- - template: jinja
- - mode: 655
- - require:
- - pkg: xtrabackup_client_packages
-
-xtrabackups_dir:
+xtrabackups_full_dir:
file.directory:
- - name: {{ client.backup_dir }}
+ - name: {{ client.backup_dir }}/full
+ - user: root
+ - group: root
+ - makedirs: true
+
+xtrabackups_incr_dir:
+ file.directory:
+ - name: {{ client.backup_dir }}/incr
- user: root
- group: root
- makedirs: true
@@ -52,6 +50,15 @@
{%- if client.restore_full_latest is defined %}
+xtrabackup_client_restore_script:
+ file.managed:
+ - name: /usr/local/bin/innobackupex-restore.sh
+ - source: salt://xtrabackup/files/innobackupex-client-restore.sh
+ - template: jinja
+ - mode: 655
+ - require:
+ - pkg: xtrabackup_client_packages
+
xtrabackup_client_call_restore_script:
file.managed:
- name: /usr/local/bin/innobackupex-restore-call.sh
diff --git a/xtrabackup/server.sls b/xtrabackup/server.sls
index 0205593..8eb1c6e 100644
--- a/xtrabackup/server.sls
+++ b/xtrabackup/server.sls
@@ -11,7 +11,17 @@
- system: true
- home: {{ server.backup_dir }}
-{{ server.backup_dir }}:
+{{ server.backup_dir }}/full:
+ file.directory:
+ - mode: 755
+ - user: xtrabackup
+ - group: xtrabackup
+ - makedirs: true
+ - require:
+ - user: xtrabackup_user
+ - pkg: xtrabackup_server_packages
+
+{{ server.backup_dir }}/incr:
file.directory:
- mode: 755
- user: xtrabackup
@@ -30,7 +40,8 @@
- user: xtrabackup
- name: {{ key.key }}
- require:
- - file: {{ server.backup_dir }}
+ - file: {{ server.backup_dir }}/full
+ - file: {{ server.backup_dir }}/incr
{%- endif %}