Allow two more addresses while backuphost is at bytemark

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

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 7027b30a6dbacecc7e9e366b982c98107c871cd2..2ac7e7d06f9be28ee14210bd5896bb4a9e0b40c7 100644 (file)
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,29 +1,71 @@
 class bacula::storage inherits bacula {
 
-  package {
-    "bacula-sd": ensure => installed;
-  }
-
-  service {
-    "bacula-sd":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      require => Package["bacula-sd-pgsql"];
-  }
-  file {
-    "/etc/bacula/bacula-sd.conf":
-      content => template("bacula/bacula-sd.conf.erb"),
-      mode => 640,
-      group => bacula,
-      require => Package["bacula-sd-pgsql"],
-      notify  => Exec["bacula-sd restart"]
-      ;
-  }
-
-  exec {
-    "bacula-sd restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
-  }
+       package { 'bacula-sd':
+               ensure => installed
+       }
+
+       service { 'bacula-sd':
+               ensure    => running,
+               enable    => true,
+               hasstatus => true,
+       }
+
+       exec { 'bacula-sd restart-when-idle':
+               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart sd &"',
+               refreshonly => true,
+               subscribe   => File[$bacula_ssl_server_cert],
+               require     => File['/usr/local/sbin/bacula-idle-restart'],
+       }
+
+
+       file { '/etc/bacula/bacula-sd.conf':
+               content => template('bacula/bacula-sd.conf.erb'),
+               mode    => '0640',
+               group   => bacula,
+               notify  => Exec['bacula-sd restart-when-idle']
+       }
+
+       file { '/etc/bacula/storage-conf.d':
+               ensure  => directory,
+               mode    => '0755',
+               group   => bacula,
+               purge   => true,
+               force   => true,
+               recurse => true,
+               source  => 'puppet:///files/empty/',
+               notify  => Exec['bacula-sd restart-when-idle']
+       }
+
+       @ferm::rule { 'dsa-bacula-sd-v4':
+               domain      => '(ip)',
+               description => 'Allow bacula-sd access from director and clients',
+               rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V4 5.153.231.125 5.153.231.126) ACCEPT; }',
+               notarule    => true,
+       }
+
+       @ferm::rule { 'dsa-bacula-sd-v6':
+               domain      => '(ip6)',
+               description => 'Allow bacula-sd access from director and clients',
+               rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V6) ACCEPT; }',
+               notarule    => true,
+       }
+
+       file { '/etc/bacula/storage-conf.d/empty.conf':
+               content => '',
+               mode    => '0440',
+               group   => bacula,
+               notify  => Exec['bacula-sd restart-when-idle']
+       }
+
+       file { "${bacula_backup_path}/Catalog":
+               ensure  => directory,
+               mode    => '0755',
+               owner   => bacula,
+               group   => bacula,
+               ;
+       }
+
+       Bacula::Storage-per-Node<<| |>>
+
 }