projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new ftp-master cert
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
manifests
/
client.pp
diff --git
a/modules/bacula/manifests/client.pp
b/modules/bacula/manifests/client.pp
index
abd11b3
..
1ff49df
100644
(file)
--- a/
modules/bacula/manifests/client.pp
+++ b/
modules/bacula/manifests/client.pp
@@
-1,7
+1,7
@@
class bacula::client inherits bacula {
@@bacula::storage-per-node { $::fqdn: }
class bacula::client inherits bacula {
@@bacula::storage-per-node { $::fqdn: }
- if
$::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, kaufmann, lully, master, new-master, reger, schumann, soler, vento, vieuxtemps, wilder, wolkenstein]
{
+ if
! getfromhash($site::nodeinfo, 'not-bacula-client')
{
@@bacula::node { $::fqdn: }
}
@@bacula::node { $::fqdn: }
}
@@
-16,13
+16,25
@@
class bacula::client inherits bacula {
require => Package['bacula-fd']
}
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'],
file { '/etc/bacula/bacula-fd.conf':
content => template('bacula/bacula-fd.conf.erb'),
mode => '0640',
owner => root,
group => bacula,
require => Package['bacula-fd'],
- notify => Service['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',
}
file { '/usr/local/sbin/postbaculajob':
mode => '0775',
@@
-36,11
+48,17
@@
class bacula::client inherits bacula {
require => Package['bacula-fd'],
notify => Service['bacula-fd'],
}
require => Package['bacula-fd'],
notify => Service['bacula-fd'],
}
- file { '/etc/apt/preferences.d/dsa-bacula-client':
- content => template('bacula/apt.preferences.bacula-client.erb'),
- mode => '0444',
- owner => root,
- group => root,
+ if $::lsbmajdistrelease < 7 {
+ file { '/etc/apt/preferences.d/dsa-bacula-client':
+ content => template('bacula/apt.preferences.bacula-client.erb'),
+ mode => '0444',
+ owner => root,
+ group => root,
+ }
+ } else {
+ file { '/etc/apt/preferences.d/dsa-bacula-client':
+ ensure => absent
+ }
}
@ferm::rule { 'dsa-bacula-fd-v4':
}
@ferm::rule { 'dsa-bacula-fd-v4':