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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index daa0d6ba0..ff41e1bb2 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,12 +1,42 @@
 # 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
+# @param pool_name      A token to be used in pool names
+# @param db_address     hostname of the postgres server for the catalog DB
+# @param db_port        port of the postgres server for the catalog DB
+# @param db_name        DB name for the catalog DB
+# @param db_user        username for the postgres server for the catalog DB
+# @param db_password    password for the postgres server for the catalog DB
+# @param port_dir       Port that the director should listen on
+# @param db_sslca       SSL CA store for DB access
+# @param director_name  bacula name of this dir instance
+# @param director_address  address of this dir instance that other instances should connect to (dns name)
 class bacula::director(
-  String  $bacula_db_address = 'postgresql-manda-01.debian.org',
-  Integer $bacula_db_port    = 5432,
+  String  $db_address,
+  Integer $db_port,
+  String  $db_name = 'bacula',
+  String  $db_user = 'bacula',
+  String  $db_password = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}"),
+  String  $pool_name = 'bacula',
+  Integer $port_dir = 9101,
+  Optional[String] $db_sslca = undef,
+  #String $director_name    = "${::fqdn}-dir",
+  String $director_name = $bacula::bacula_director_name,
+  Stdlib::Host $director_address = $::fqdn,
 ) inherits bacula {
 
+  # used by e.g. bconsole
+  $director_secret = hkdf('/etc/puppet/secret', "bacula-dir-${::fqdn}")
+  # the RestoreFiles Job needs a Pool and a client.  Any valid pool and client.
+  $some_pool_name = "poolfull-${pool_name}-${director_address}"
+  $some_client_name = "${director_address}-fd"
+
+  # let the SD know we exist
+  @@bacula::storage::director{ $::fqdn:
+    tag              => 'bacula::to-storage',
+    director_name    => $director_name,
+    director_address => $director_address,
+  }
+
   ensure_packages ( [
     'bacula-director-pgsql',
     'bacula-common',
@@ -61,7 +91,8 @@ class bacula::director(
     notify  => Exec['bacula-director reload']
   }
 
-  Bacula::Node<<| |>>
+  Bacula::Director::Client             <<| tag == "bacula::to-director::${::fqdn}" |>>
+  Bacula::Director::Client_from_storage<<| tag == "bacula::to-director::${::fqdn}" |>>
 
   package { 'bacula-console':
     ensure => installed;
@@ -125,7 +156,7 @@ class bacula::director(
     saddr       => $bacula::public_addresses,
   }
   @@ferm::rule::simple { "bacula::director-to-storage::${::fqdn}":
-    tag         => "bacula::director-to-storage::${::fqdn}",
+    tag         => 'bacula::director-to-storage',
     description => 'Allow bacula-storage access from the bacula-director',
     chain       => 'bacula-sd',
     saddr       => $bacula::public_addresses,