X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=daa0d6ba07dadd54f4f4338d9d8c1834e9087bbf;hb=fef6fe13456346f5ab0c74ef870ee50f23c1607e;hp=2c5d0533f037940c93c78212877b51d4f41a2153;hpb=57ad37658ba4a8f9f8423dd617089c083e517aa3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 2c5d0533f..daa0d6ba0 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,8 +1,19 @@
-class bacula::director inherits bacula {
+# our bacula director
+#
+# @param bacula_db_address hostname of the postgres server for the catalog DB
+# @param bacula_db_port    port of the postgres server for the catalog DB
+class bacula::director(
+  String  $bacula_db_address = 'postgresql-manda-01.debian.org',
+  Integer $bacula_db_port    = 5432,
+) inherits bacula {
 
-  package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']:
-    ensure => installed
-  }
+  ensure_packages ( [
+    'bacula-director-pgsql',
+    'bacula-common',
+    'bacula-common-pgsql'
+  ], {
+    ensure => 'installed',
+  })
 
   service { 'bacula-director':
     ensure    => running,
@@ -65,13 +76,13 @@ class bacula::director inherits bacula {
 
   package { 'python3-psycopg2': ensure => installed }
   file { '/etc/bacula/scripts/volume-purge-action':
-    mode    => '0555',
-    source  => 'puppet:///modules/bacula/volume-purge-action',
+    mode   => '0555',
+    source => 'puppet:///modules/bacula/volume-purge-action',
     ;
   }
   file { '/etc/bacula/scripts/volumes-delete-old':
-    mode    => '0555',
-    source  => 'puppet:///modules/bacula/volumes-delete-old',
+    mode   => '0555',
+    source => 'puppet:///modules/bacula/volumes-delete-old',
     ;
   }
   file { '/etc/bacula/storages-list.d':
@@ -84,14 +95,14 @@ class bacula::director inherits bacula {
     source  => 'puppet:///files/empty/',
   }
   file { '/usr/local/sbin/dsa-bacula-scheduler':
-    source  => 'puppet:///modules/bacula/dsa-bacula-scheduler',
-    mode    => '0555',
+    source => 'puppet:///modules/bacula/dsa-bacula-scheduler',
+    mode   => '0555',
   }
 
-  file { "/etc/cron.d/puppet-bacula-stuff": ensure => absent, }
-  concat::fragment { 'dsa-puppet-stuff--bacula-director':
-    target => '/etc/cron.d/dsa-puppet-stuff',
-    content  => @(EOF)
+  file { '/etc/cron.d/puppet-bacula-stuff': ensure => absent, }
+  concat::fragment { 'puppet-crontab--bacula-director':
+    target  => '/etc/cron.d/puppet-crontab',
+    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
@@ -101,9 +112,22 @@ class bacula::director inherits bacula {
   concat { $bacula::bacula_dsa_client_list:
   }
   concat::fragment { 'bacula-dsa-client-list::header' :
-    target => $bacula::bacula_dsa_client_list,
-    content  => "",
-    order  => '00',
+    target  => $bacula::bacula_dsa_client_list,
+    content => '',
+    order   => '00',
   }
   Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>
+
+  @@ferm::rule::simple { "bacula::director-to-fd::${::fqdn}":
+    tag         => "bacula::director-to-fd::${::fqdn}",
+    description => 'Allow bacula-fd from the bacula-director',
+    port        => '7', # overridden on collecting
+    saddr       => $bacula::public_addresses,
+  }
+  @@ferm::rule::simple { "bacula::director-to-storage::${::fqdn}":
+    tag         => "bacula::director-to-storage::${::fqdn}",
+    description => 'Allow bacula-storage access from the bacula-director',
+    chain       => 'bacula-sd',
+    saddr       => $bacula::public_addresses,
+  }
 }