slapcat-all.sh: Use ldapsearch(1) to generate the LDIF.

Unlike slapcat(1) it doesn't require write access to ~openldap, so we
don't have to weaken bacula-fd.service.

1 files changed, 1 insertions, 1 deletions

diff --git a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
index 0ab213b..3e37614 100644
--- a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
+++ b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
@@ -62,41 +62,41 @@ JobDefs {
 
 JobDefs {
   Name = DefaultSlapdJob
   Type = Backup
   Level = Full
   Storage = {{ hostvars[ groups['bacula_sd'][0] ].inventory_hostname_short }}-sd
   Messages = Standard
   FileSet = LDAP
   Schedule = WeeklyCycleAfterBackup
   Reschedule On Error = yes
   Reschedule Interval = 17 min
   Reschedule Times = 3
   # This creates an ASCII copy of the databases
   Client Run Before Job = "/usr/local/sbin/slapcat-all.sh /var/lib/bacula/tmp"
   # This deletes the copy of the catalog
   RunScript {
     Runs On Client = yes
     Runs On Success = yes
     Runs On Failure = yes
     Runs When = after
-    Command = "/usr/bin/find /var/lib/bacula/tmp -type f -name '*.ldif' -delete"
+    Command = "/usr/bin/find /var/lib/bacula/tmp -type f \( -name '*.ldif' -o -name 'slapd-*' \) -delete"
   }
   Pool = database
   Priority = 20
   Write Bootstrap = "/var/lib/bacula/%n.bsr"
 }
 
 
 # Backup the director
 Job {
   Name = {{ inventory_hostname_short }}-dir
   Client = {{ inventory_hostname_short }}-fd
   JobDefs = DefaultJob
   FileSet = BaculaHome
   Schedule = WeeklyCycle
 }
 
 # Backup the mailboxes
 {% for h in groups.IMAP | sort %}
 Job {
   Name = {{ hostvars[h].inventory_hostname_short }}-mailboxes