some cleanup of bacula classes

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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 58c143d2d36adcd0c7a7f7caf084bc69be23a40d..6540c4d44debad9b5954ef58b422e5d1f9ef6a74 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,64 +1,35 @@
 class bacula::director inherits bacula {
 
-  package {
-    "bacula-director-pgsql": ensure => installed;
-    "bacula-common": ensure => installed;
-    "bacula-common-pgsql": ensure => installed;
-  }
+       package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']:
+               ensure => installed
+       }
 
-  service {
-    "bacula-director":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      require => Package["bacula-director-pgsql"];
-  }
-  file {
-    "/etc/bacula/conf.d":
-      ensure  => directory,
-      mode => 755,
-      group => bacula,
-      purge => true,
-      notify  => Exec["bacula-director restart"]
-      ;
-    "/etc/bacula/bacula-dir.conf":
-      content => template("bacula/bacula-dir.conf.erb"),
-      mode => 440,
-      group => bacula,
-      require => Package["bacula-director-pgsql"],
-      notify  => Exec["bacula-director restart"]
-      ;
-  }
+       service { 'bacula-director':
+               ensure    => running,
+               enable    => true,
+               hasstatus => true,
+               require   => Package['bacula-director-pgsql']
+       }
 
-  exec {
-    "bacula-director restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
-  }
+       file { '/etc/bacula/conf.d':
+               ensure => directory,
+               mode   => '0755',
+               group  => bacula,
+               purge  => true,
+               notify => Service['bacula-director']
+       }
 
-  define bacula_client() {
-    # These must be kept in sync with the settings in bacula.pp
-    $bacula_client_name       = "${name}-fd"
-    $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-${name}")
-    $client = $name
-
-    file {
-      "/etc/bacula/conf.d/${name}.conf":
-      content => template("bacula/per-client.conf.erb"),
-      mode => 440,
-      group => bacula,
-      notify  => Exec["bacula-director restart"]
-      ;
-    }
-  }
-#  $allhosts = keys($site::allnodeinfo)
-  $allhosts = [ "berlioz.debian.org", "biber.debian.org", "draghi.debian.org" ]
-  bacula_client { $allhosts: }
-
-  @ferm::rule { 'dsa-bacula-dir':
-    domain      => '(ip ip6)',
-    description => 'Allow bacula access from localhost',
-    rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
-  }
+       file { '/etc/bacula/bacula-dir.conf':
+               content => template('bacula/bacula-dir.conf.erb'),
+               mode    => '0440',
+               group   => bacula,
+               require => Package['bacula-director-pgsql'],
+               notify  => Service['bacula-director']
+       }
 
+       @ferm::rule { 'dsa-bacula-dir':
+               domain      => '(ip ip6)',
+               description => 'Allow bacula access from localhost',
+               rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
+       }
 }