stop using virtual resources for ferm::rule

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 4ab2b59..3027930 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,32 +1,87 @@
 class bacula::client inherits bacula {
+       @@bacula::storage_per_node { $::fqdn: }
 
-  package {
-    "bacula-client": ensure => installed;
-    "bacula-fd": ensure => installed;
-  }
+       if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
+               @@bacula::node { $::fqdn:
+                       bacula_client_port => $bacula::bacula_client_port,
+               }
 
-  service {
-    "bacula-fd":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      require => Package["bacula-fd"];
-  }
+               @@concat::fragment { "bacula-dsa-client-list::$fqdn":
+                       target => $bacula::bacula_dsa_client_list ,
+                       content  => @("EOF"),
+                                       ${fqdn}
+                                       | EOF
+                       tag     => $bacula::tag_bacula_dsa_client_list,
+               }
+       }
 
-  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"]
-      ;
-  }
+       package { ['bacula-fd']:
+               ensure => installed
+       }
 
-  exec {
-    "bacula-fd restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
-  }
+       service { 'bacula-fd':
+               ensure    => running,
+               enable    => true,
+               hasstatus => true,
+               require   => Package['bacula-fd']
+       }
+
+       exec { 'bacula-fd restart-when-idle':
+               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart fd &"',
+               refreshonly => true,
+               subscribe   => [ File[$bacula_ssl_server_cert], File[$bacula_ssl_client_cert] ],
+               require     => File['/usr/local/sbin/bacula-idle-restart'],
+       }
+
+       file { '/etc/bacula/bacula-fd.conf':
+               content => template('bacula/bacula-fd.conf.erb'),
+               mode    => '0640',
+               owner   => root,
+               group   => bacula,
+               require => Package['bacula-fd'],
+               notify  => Exec['bacula-fd restart-when-idle'],
+       }
+       file { '/usr/local/sbin/bacula-backup-dirs':
+               mode    => '0775',
+               source  => 'puppet:///modules/bacula/bacula-backup-dirs',
+       }
+       file { '/usr/local/sbin/postbaculajob':
+               mode    => '0775',
+               source  => 'puppet:///modules/bacula/postbaculajob',
+       }
+       file { '/etc/default/bacula-fd':
+               content => template('bacula/default.bacula-fd.erb'),
+               mode    => '0400',
+               owner   => root,
+               group   => root,
+               require => Package['bacula-fd'],
+               notify  => Service['bacula-fd'],
+       }
+       if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
+               # old name for the override content
+               file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+                       ensure  => absent,
+               }
+               dsa_systemd::override { 'bacula-fd':
+                       content => @(EOT)
+                               [Service]
+                               ExecStart=
+                               ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
+                               | EOT
+               }
+       } else {
+               file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+                       ensure  => absent,
+               }
+               dsa_systemd::override { 'bacula-fd':
+                       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",
+       }
 }