From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 17 Jun 2012 08:15:49 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=fbda07eb15845bda281002fe76352ba46e6c5dda

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  A comma, a comma, my kingdom for a comma.  (Typo fix)
  Only use bacula on berlioz for now
  Make sure to get rid of any old client configs
  Adjust path for bacula storage
  Whitespace, cargo-cult a ferm rule bit
  Allow all debian hosts access to the bacula storage
  More fqdns
  Use fqdn as the client name, at least for now
  Typo
  Allow some bacula director traffic too
  Add swiss domains
  Autogenerate the largest part of this file
  Make named.conf.debian-zones a template
  Drop using subchains here, since they give me a syntax error
  Ensure we get string interpolation for director address
  Allow traffic from bacula-director to fd
  Back up berlioz using bacula
  Add initial client configuration
---

fbda07eb15845bda281002fe76352ba46e6c5dda