Pass pool-name token to volumes-delete-old

diff --git a/modules/bacula/files/volumes-delete-old b/modules/bacula/files/volumes-delete-old
index 80f2c93..979e469 100755 (executable)
--- a/modules/bacula/files/volumes-delete-old
+++ b/modules/bacula/files/volumes-delete-old
@@ -49,6 +49,9 @@ parser.add_argument("-v", "--verbose", dest="verbose",
 parser.add_argument("-n", "--nodo", dest="nodo",
   default=False, action="store_true",
   help="Print to cat rather than bconsole.")
+parser.add_argument("-t", "--token", metavar='TOKEN', dest="pool_name_token",
+  default='bacula',
+  help="A string token used in pool names.")
 args = parser.parse_args()
 
 if args.db is not None:
@@ -130,7 +133,7 @@ if os.path.exists(args.clientlist):
 
   for r in cursor.fetchall():
     poolname = r['name']
-    match = re.match('pool[a-z]*-debian-(.*)', poolname)
+    match = re.match('pool[a-z]*-%s-(.*)'%(args.pool_name_token, ), poolname)
     if match is not None:
       hostname = match.group(1)
       if hostname not in clients:

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index f5d54f9..5f7fba4 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -136,10 +136,10 @@ class bacula::director(
   file { '/etc/cron.d/puppet-bacula-stuff': ensure => absent, }
   concat::fragment { 'puppet-crontab--bacula-director':
     target  => '/etc/cron.d/puppet-crontab',
-    content => @(EOF)
+    content => @("EOF"/$)
       @daily root chronic /etc/bacula/scripts/volume-purge-action -v
-      @daily root chronic /etc/bacula/scripts/volumes-delete-old -v
-      */3 * * * * root sleep $(( $RANDOM \% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
+      @daily root chronic /etc/bacula/scripts/volumes-delete-old -v --token '${pool_name}'
+      */3 * * * * root sleep $(( \$RANDOM \\% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
       | EOF
   }