Add script for selecting which mount points to backup

baclua-backup-dirs uses /proc/self/mountinfo to find out which mount
points should be backed up, since that's the place to find out about
bind mounts and such in Wheezy and up.

This probably doesn't work so well on kFreeBSD, so we should find a
better solution for them.

diff --git a/modules/bacula/files/bacula-backup-dirs b/modules/bacula/files/bacula-backup-dirs
new file mode 100644 (file)
index 0000000..bff45a5
--- /dev/null
+++ b/modules/bacula/files/bacula-backup-dirs
@@ -0,0 +1,18 @@
+#! /usr/bin/python                                                                                                                           
+
+import re
+
+MI_RE = re.compile(r'(?P<mountid>\d+) (?P<parentid>\d+) (?P<majorminor>\d+:\d+) (?P<root>\S+) (?P<mountpoint>\S+) (?P<options>\S+) (?P<optional>(?:\S+\s)+ )?- (?P<fstype>\S+) (?P<mountsrc>\S+) (?P<superopts>\S+)')
+
+for line in file("/proc/self/mountinfo"):
+    mi = MI_RE.match(line)
+    if mi is None:
+       # XXX: handle error?
+        continue
+    gd = mi.groupdict()
+    # Skip bind mounts
+    if gd.get("root") != "/":
+        continue
+    if gd.get("fstype") not in [ "ext2", "ext3", "ext4", "xfs", "jfs"]:
+        continue
+    print gd["mountpoint"]

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index b1384901e653ac8951ed56a7ee41455fa86671e4..b1aa64a029d502967b532330ff07e66752e31106 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -32,6 +32,10 @@ class bacula::client inherits bacula {
                require => Package['bacula-fd'],
                notify  => Service['bacula-fd'],
        }
+       file { '/usr/local/sbin/bacula-backup-dirs':
+               mode    => '0775',
+               source  => 'puppet:///modules/bacula/bacula-backup-dirs',
+       }
        file { '/usr/local/sbin/postbaculajob':
                mode    => '0775',
                source  => 'puppet:///modules/bacula/postbaculajob',

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 98d0cf12157b9155b76c777e5f50c15481f7b371..8389d920197505ec4ea925aa88ac406a529b2ff8 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -44,7 +44,7 @@ FileSet {
       signature = SHA1
       compression = GZIP9
     }
-    File = "\\|bash -c \"df -Pkl -x tmpfs -x iso9660 | tail -n +2 | awk '{print \$NF}' \""
+    File = "|/usr/local/sbin/bacula-backup-dirs"
     # Dont backup directories that contain .nobackup files
     Exclude Dir Containing = .nobackup
   }