X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=f8c547939755b8d417034f4d4fed09512e4a35ec;hb=6662dcaaa84043c8ee2dfd89481fd503d4d8827e;hp=6e1ff5ba2135747546227f0574a37588a7684365;hpb=51fa3b33f24b85df4abc27150eea045735aa9262;p=dsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 6e1ff5ba..f8c54793 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,54 +1,41 @@
 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,
-      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,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
+		notify  => Service['bacula-director']
+	}
 
-  define bacula_client($client) {
-    # These must be kept in sync with the settings in bacula.pp
-    $bacula_client_name       = "$client-fd"
-    $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-$client")
+	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']
+	}
 
-    file {
-      "/etc/bacula/conf.d/$client.conf":
-      content => template("bacula/per-client.conf.erb"),
-      mode => 440,
-      group => bacula,
-      notify  => Exec["bacula-director restart"]
-      ;
-    }
-  }
+	@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",
+	}
+
+	Bacula::Node<<| |>>
 
-  bacula_client(allnodeinfo('hostname', ''))
 }