X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=2b7c35f085ce67221aae643df17b72ff0edaf7fc;hb=e272b442942830a6eed50748eb63aa3b6318ca2b;hp=f3443e37ff22cab5904d531f09bb55ee7934a1e3;hpb=0d03fa1079842ae23ad85de4d3b806e2cf1d9f22;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index f3443e37f..2b7c35f08 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -2,8 +2,16 @@
 #
 # this mostly configures the file daemon, but also firewall rules and
 # fragments to sent to the other servers.
+#
+# @param director_server The director server that controls this client's backups
+# @param storage_server The storage server to use for this client
+# @param port_fd Port that bacula-fd listens on
+# @param ensure  present or absent
 class bacula::client(
-  Enum['present', 'absent'] $ensure = defined(Class["bacula::not_a_client"]) ? { true => 'absent', default => 'present' },
+  String $director_server,
+  String $storage_server,
+  Integer $port_fd = 9102,
+  Enum['present', 'absent'] $ensure = defined(Class['bacula::not_a_client']) ? { true => 'absent', default => 'present' },
 ) inherits bacula {
   $package_ensure = $ensure ? { 'present' => 'installed', 'absent' => 'purged' }
   $service_ensure = $ensure ? { 'present' => 'running', 'absent'  => 'stopped' }
@@ -11,19 +19,36 @@ class bacula::client(
   $reverse_ensure = $ensure ? { 'present' => 'absent', 'absent' => 'present' }
 
   if $ensure == 'present' {
-    @@bacula::storage_per_node { $::fqdn: }
+    @@bacula::director::client { $::fqdn:
+      port_fd => $port_fd,
+      tag     => "bacula::to-director::${director_server}",
+    }
 
-    @@bacula::node { $::fqdn:
-      bacula_client_port => $bacula::bacula_client_port,
+    @@bacula::storage::client { $::fqdn:
+      tag             => "bacula::to-storage::${storage_server}",
+      director_server => $director_server,
     }
 
-    @@concat::fragment { "bacula-dsa-client-list::$fqdn":
+    @@concat::fragment { "bacula-dsa-client-list::${::fqdn}":
       target  => $bacula::bacula_dsa_client_list ,
       content => @("EOF"),
-          ${fqdn}
+          ${::fqdn}
           | EOF
       tag     => $bacula::tag_bacula_dsa_client_list,
     }
+
+    # allow access from director
+    Ferm::Rule::Simple <<| tag == "bacula::director-to-fd::${director_server}" |>> {
+      port => $port_fd,
+    }
+
+    # get access to the storage
+    @@ferm::rule::simple { "bacula::fd-to-storage::${::fqdn}":
+      tag         => "bacula::fd-to-storage::${storage_server}",
+      description => 'Allow bacula-fd access to the bacula-storage',
+      chain       => 'bacula-sd',
+      saddr       => $bacula::public_addresses,
+    }
   } elsif $ensure == 'absent' {
     file { '/etc/bacula':
       ensure  => absent,
@@ -33,9 +58,12 @@ class bacula::client(
     }
   }
 
-  package { ['bacula-fd', 'bacula-common']:
+  ensure_packages ( [
+    'bacula-fd',
+    'bacula-common',
+  ], {
     ensure => $package_ensure
-  }
+  })
 
   service { 'bacula-fd':
     ensure    => $service_ensure,
@@ -46,9 +74,9 @@ class bacula::client(
 
   exec { 'bacula-fd restart-when-idle':
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-    command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"',
+    command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_fd} bacula-fd &'",
     refreshonly => true,
-    subscribe   => [ File[$bacula_ssl_server_cert], File[$bacula_ssl_client_cert] ],
+    subscribe   => [ File[$bacula::bacula_ssl_server_cert], File[$bacula::bacula_ssl_client_cert] ],
     require     => File['/usr/local/sbin/bacula-idle-restart'],
   }
 
@@ -62,14 +90,14 @@ class bacula::client(
     notify  => Exec['bacula-fd restart-when-idle'],
   }
   file { '/usr/local/sbin/bacula-backup-dirs':
-    ensure  => $ensure,
-    mode    => '0775',
-    source  => 'puppet:///modules/bacula/bacula-backup-dirs',
+    ensure => $ensure,
+    mode   => '0775',
+    source => 'puppet:///modules/bacula/bacula-backup-dirs',
   }
   file { '/usr/local/sbin/postbaculajob':
-    ensure  => $ensure,
-    mode    => '0775',
-    source  => 'puppet:///modules/bacula/postbaculajob',
+    ensure => $ensure,
+    mode   => '0775',
+    source => 'puppet:///modules/bacula/postbaculajob',
   }
   file { '/etc/default/bacula-fd':
     ensure  => $ensure,
@@ -80,7 +108,7 @@ class bacula::client(
     require => Package['bacula-fd'],
     notify  => Service['bacula-fd'],
   }
-  if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
+  if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $facts['systemd']) {
     dsa_systemd::override { 'bacula-fd':
       content => @(EOT)
         [Service]
@@ -93,10 +121,4 @@ class bacula::client(
       ensure  => absent,
     }
   }
-
-  ferm::rule { 'dsa-bacula-fd':
-    domain      => '(ip ip6)',
-    description => 'Allow bacula access from storage and director',
-    rule        => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip_addrs}) ACCEPT",
-  }
 }