some cleanup of bacula classes

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

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index f0a09df7a84b509b8a693e0df1e123ed476cf773..e6738672d67f902a6d4798539fb3bbb0498bf00b 100644 (file)
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,42 +1,32 @@
 class bacula::storage inherits bacula {
 
-  package {
-    "bacula-sd": ensure => installed;
-  }
+       package { 'bacula-sd':
+               ensure => installed
+       }
 
-  service {
-    "bacula-sd":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      ;
-  }
-  file {
-    "/etc/bacula/bacula-sd.conf":
-      content => template("bacula/bacula-sd.conf.erb"),
-      mode => 640,
-      group => bacula,
-      notify  => Exec["bacula-sd restart"]
-      ;
-  }
+       service { 'bacula-sd':
+               ensure    => running,
+               enable    => true,
+               hasstatus => true,
+       }
+       file { '/etc/bacula/bacula-sd.conf':
+               content => template('bacula/bacula-sd.conf.erb'),
+               mode    => '0640',
+               group   => bacula,
+               notify  => Service['bacula-sd']
+       }
 
-  exec {
-    "bacula-sd restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
-  }
+       @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) ACCEPT; }',
+               notarule    => true,
+       }
 
-  @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) 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,
-  }
+       @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,
+       }
 }