move bacula::node export to bacula::client

[dsa-puppet.git] / modules / bacula / manifests / client.pp

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 879978cfeb3461ac224d32a212e30619bffec430..3879e076f78488bc5a0f1bc7f7a9a038f0fe7d20 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,38 +1,45 @@
 class bacula::client inherits bacula {
+       @@bacula::storage-per-node { $::fqdn: }
 
-  package {
-    "bacula-client": ensure => installed;
-    "bacula-fd": ensure => installed;
-  }
+       if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
+               @@bacula::node { $::fqdn: }
+       }
 
-  service {
-    "bacula-fd":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      require => Package["bacula-fd"];
-  }
+       package { ['bacula-fd']:
+               ensure => installed
+       }
 
-  file {
-    "/etc/bacula/bacula-fd.conf":
-      content => template("bacula/bacula-fd.conf.erb"),
-      mode => 640,
-      owner => root,
-      group => bacula,
-      require => Package["bacula-fd"],
-      notify  => Exec["bacula-fd restart"]
-      ;
-  }
+       service { 'bacula-fd':
+               ensure    => running,
+               enable    => true,
+               hasstatus => true,
+               require   => Package['bacula-fd']
+       }
 
-  exec {
-    "bacula-fd restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
-  }
+       file {
+               '/etc/bacula/bacula-fd.conf':
+                       content => template('bacula/bacula-fd.conf.erb'),
+                       mode    => '0640',
+                       owner   => root,
+                       group   => bacula,
+                       require => Package['bacula-fd'],
+                       notify  => Service['bacula-fd'],
+                       ;
+               '/usr/local/sbin/postbaculajob':
+                       mode    => '0775',
+                       source  => 'puppet:///modules/bacula/postbaculajob',
+                       ;
+       }
 
-  @ferm::rule { 'dsa-bacula-fd':
-    domain      => '(ip)',
-    description => 'Allow bacula access from storage and director',
-    rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr ($bacula_director_address) ACCEPT",
-  }
+       @ferm::rule { 'dsa-bacula-fd-v4':
+               domain      => '(ip)',
+               description => 'Allow bacula access from storage and director',
+               rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip}) ACCEPT",
+       }
+
+       #@ferm::rule { 'dsa-bacula-fd-v6':
+       #       domain      => '(ip6)',
+       #       description => 'Allow bacula access from storage and director',
+       #       rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip6}) ACCEPT",
+       #}
 }