X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=dd5395df664d533aaae971551c31c222e323a5da;hb=f1c1f8989e7404dbb5139855407b647544179c14;hp=d0e0fa599ac89833a9d85b6cdd2417ef8ed8fd70;hpb=0ba93256399fbad7ed8fabfa39c24dd47169dde3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index d0e0fa599..dd5395df6 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,109 +1,167 @@
-class bacula::director inherits bacula {
+# our bacula director
+#
+# @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)
+# @param messages_name   name of the Messages Resource
+class bacula::director(
+  String  $db_address = 'localhost',
+  Integer $db_port = 5432,
+  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",
+  Stdlib::Host $director_address = $::fqdn,
+  String $messages_name = "Msg-${::fqdn}",
+) inherits bacula {
 
-	package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']:
-		ensure => installed
-	}
+  # 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"
 
-	service { 'bacula-director':
-		ensure    => running,
-		enable    => true,
-		hasstatus => true,
-		require   => Package['bacula-director-pgsql']
-	}
-	dsa_systemd::override { 'bacula-director':
-		content => @(EOT)
-			[Unit]
-			After=unbound.service
-			| EOT
-	}
+  # let the SD know we exist
+  @@bacula::storage::director{ $::fqdn:
+    tag              => 'bacula::to-storage',
+    director_name    => $director_name,
+    director_address => $director_address,
+    messages_name    => $messages_name,
+  }
+  # let FDs know we exist
+  @@bacula::client::director{ $::fqdn:
+    tag              => "bacula::to-fd::${director_address}",
+    director_name    => $director_name,
+    director_address => $director_address,
+    messages_name    => $messages_name,
+  }
 
-	exec { 'bacula-director reload':
-		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		command     => 'service bacula-director reload',
-		refreshonly => true,
-	}
+  ensure_packages ( [
+    'bacula-director-pgsql',
+    'bacula-common',
+    'bacula-common-pgsql'
+  ], {
+    ensure => 'installed',
+  })
 
-	file { '/etc/bacula/conf.d':
-		ensure  => directory,
-		mode    => '0755',
-		group   => bacula,
-		purge   => true,
-		force   => true,
-		recurse => true,
-		source  => 'puppet:///files/empty/',
-		notify  => Exec['bacula-director reload']
-	}
+  service { 'bacula-director':
+    ensure    => running,
+    enable    => true,
+    hasstatus => true,
+    require   => Package['bacula-director-pgsql']
+  }
+  dsa_systemd::override { 'bacula-director':
+    content => @(EOT)
+      [Unit]
+      After=network-online.target unbound.service
+      | EOT
+  }
 
-	file { '/etc/bacula/bacula-dir.conf':
-		content => template('bacula/bacula-dir.conf.erb'),
-		mode    => '0440',
-		group   => bacula,
-		require => Package['bacula-director-pgsql'],
-		notify  => Exec['bacula-director reload']
-	}
+  exec { 'bacula-director reload':
+    path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+    command     => 'service bacula-director reload',
+    refreshonly => true,
+  }
 
-	file { '/etc/bacula/conf.d/empty.conf':
-		content => '',
-		mode    => '0440',
-		group   => bacula,
-		require => Package['bacula-director-pgsql'],
-		notify  => Exec['bacula-director reload']
-	}
+  file { '/etc/bacula/conf.d':
+    ensure  => directory,
+    mode    => '0755',
+    group   => bacula,
+    purge   => true,
+    force   => true,
+    recurse => true,
+    notify  => Exec['bacula-director reload']
+  }
 
-	Bacula::Node<<| |>>
+  file { '/etc/bacula/bacula-dir.conf':
+    content => template('bacula/bacula-dir.conf.erb'),
+    mode    => '0440',
+    group   => bacula,
+    require => Package['bacula-director-pgsql'],
+    notify  => Exec['bacula-director reload']
+  }
 
-	package { 'bacula-console':
-		ensure => installed;
-	}
+  file { '/etc/bacula/conf.d/empty.conf':
+    content => '',
+    mode    => '0440',
+    group   => bacula,
+    require => Package['bacula-director-pgsql'],
+    notify  => Exec['bacula-director reload']
+  }
 
-	file { '/etc/bacula/bconsole.conf':
-		content => template('bacula/bconsole.conf.erb'),
-		mode    => '0640',
-		group   => bacula,
-		require => Package['bacula-console']
-	}
+  Bacula::Director::Client_from_storage<<| tag == "bacula::to-director::${::fqdn}" |>>
+  Bacula::Director::Client             <<| tag == "bacula::to-director::${::fqdn}" |>>
 
-	package { 'python3-psycopg2': ensure => installed }
-	file { '/etc/bacula/scripts/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',
-		;
-	}
-	file { '/etc/bacula/storages-list.d':
-		ensure  => directory,
-		mode    => '0755',
-		group   => bacula,
-		purge   => true,
-		force   => true,
-		recurse => true,
-		source  => 'puppet:///files/empty/',
-	}
-	file { '/usr/local/sbin/dsa-bacula-scheduler':
-		source  => 'puppet:///modules/bacula/dsa-bacula-scheduler',
-		mode    => '0555',
-	}
+  package { 'bacula-console':
+    ensure => installed;
+  }
 
-	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)
-			@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
-			| EOF
-	}
+  file { '/etc/bacula/bconsole.conf':
+    content => template('bacula/bconsole.conf.erb'),
+    mode    => '0640',
+    group   => bacula,
+    require => Package['bacula-console']
+  }
 
-	concat { $bacula::bacula_dsa_client_list:
-	}
-	concat::fragment { 'bacula-dsa-client-list::header' :
-		target => $bacula::bacula_dsa_client_list,
-		content  => "",
-		order  => '00',
-	}
-	Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>
+  package { 'python3-psycopg2': ensure => installed }
+  file { '/etc/bacula/scripts/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',
+    ;
+  }
+  file { '/etc/bacula/storages-list.d':
+    ensure  => directory,
+    mode    => '0755',
+    group   => bacula,
+    purge   => true,
+    force   => true,
+    recurse => true,
+  }
+  file { '/usr/local/sbin/dsa-bacula-scheduler':
+    source => 'puppet:///modules/bacula/dsa-bacula-scheduler',
+    mode   => '0555',
+  }
+
+  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 --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
+  }
+
+  concat { $bacula::bacula_dsa_client_list:
+    ensure_newline => true,
+  }
+  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',
+    description => 'Allow bacula-storage access from the bacula-director',
+    chain       => 'bacula-sd',
+    saddr       => $bacula::public_addresses,
+  }
 }