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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Drop bacula-sd-pgsql for really-real
  Drop bacula-sd-pgsql for real
  Add bacula::storage to beethoven
  Nicer syntax
  Add template
  Fix up git URL
  Drop unneeded package
  Add storage daemon class
  Put db port and address into configuration too
  Add address too
  Set $client to make per-client config more readable
  Add per-client config
  Use $name rather than $client, syntax, syntax, syntax
  Moar typos
  Typo
  Generate per-client configs for bacula. Hopefully
  Move storage to beethoven
  Add boito
  bertali

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 2756e59f0b574a16a79a65da28bdfbc5b7dc4a5d..c42de1af2f34abdbd12b199e6dbfd164d7b44727 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -28,9 +28,13 @@ class ferm::per-host {
                                rule            => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 ))'
                        }
                        @ferm::rule { 'dsa-postgres3-danzi':
-                               description     => 'Allow postgress access2',
+                               description     => 'Allow postgress access3',
                                rule            => '&SERVICE_RANGE(tcp, 5436, ( 206.12.19.0/24 ))'
                        }
+                       @ferm::rule { 'dsa-postgres3-danzi':
+                               description     => 'Allow postgress access4',
+                               rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 ))'
+                       }
                }
                abel,alwyn,rietz: {
                        @ferm::rule { 'dsa-tftp':