projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
encode backuphost in label for basebackups
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
manifests
/
storage.pp
diff --git
a/modules/bacula/manifests/storage.pp
b/modules/bacula/manifests/storage.pp
index
7b1c1a8
..
2ac7e7d
100644
(file)
--- a/
modules/bacula/manifests/storage.pp
+++ b/
modules/bacula/manifests/storage.pp
@@
-10,20
+10,20
@@
class bacula::storage inherits bacula {
hasstatus => true,
}
hasstatus => true,
}
- # should wait on -sd to finish current backups, then restart
- # since it does not support reload and restarting kills running
- # jobs
- exec { 'bacula-sd reload':
+ exec { 'bacula-sd restart-when-idle':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
path => '/usr/bin:/usr/sbin:/bin:/sbin',
- command => '
true
',
+ command => '
sh -c "setsid /usr/local/sbin/bacula-idle-restart sd &"
',
refreshonly => true,
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,
file { '/etc/bacula/bacula-sd.conf':
content => template('bacula/bacula-sd.conf.erb'),
mode => '0640',
group => bacula,
- notify =>
Service['bacula-sd
']
+ notify =>
Exec['bacula-sd restart-when-idle
']
}
file { '/etc/bacula/storage-conf.d':
}
file { '/etc/bacula/storage-conf.d':
@@
-34,13
+34,13
@@
class bacula::storage inherits bacula {
force => true,
recurse => true,
source => 'puppet:///files/empty/',
force => true,
recurse => true,
source => 'puppet:///files/empty/',
- notify => Exec['bacula-sd re
load
']
+ notify => Exec['bacula-sd re
start-when-idle
']
}
@ferm::rule { 'dsa-bacula-sd-v4':
domain => '(ip)',
description => 'Allow bacula-sd access from director and clients',
}
@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; }',
+ 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,
}
notarule => true,
}
@@
-55,7
+55,15
@@
class bacula::storage inherits bacula {
content => '',
mode => '0440',
group => bacula,
content => '',
mode => '0440',
group => bacula,
- notify => Exec['bacula-sd reload']
+ notify => Exec['bacula-sd restart-when-idle']
+ }
+
+ file { "${bacula_backup_path}/Catalog":
+ ensure => directory,
+ mode => '0755',
+ owner => bacula,
+ group => bacula,
+ ;
}
Bacula::Storage-per-Node<<| |>>
}
Bacula::Storage-per-Node<<| |>>