projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a variable that still exists to define the listen hostname
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
manifests
/
storage.pp
diff --git
a/modules/bacula/manifests/storage.pp
b/modules/bacula/manifests/storage.pp
index
34bd649
..
0a445e0
100644
(file)
--- a/
modules/bacula/manifests/storage.pp
+++ b/
modules/bacula/manifests/storage.pp
@@
-1,9
+1,20
@@
# the bacula storage node
#
# the bacula storage node
#
-# @param backup_path the directory where backups should be stored
+# @param backup_path directory where backups should be stored
+# @param filestor_device storage device name prefix
+# @param filestor_name storage device media type name prefix
+# @param port_sd port for the sd to listen on
+# @param storage_name bacula name of this sd instance
+# @param storage_address address of this sd instance that other instances should connect to (dns name)
class bacula::storage (
class bacula::storage (
- String $backup_path = '/srv/bacula',
+ String $backup_path = '/srv/bacula',
+ String $filestor_device = 'FileStorage',
+ String $filestor_name = 'File',
+ Integer $port_sd = 9103,
+ String $storage_name = "${::fqdn}-sd",
+ Stdlib::Host $storage_address = $::fqdn,
) inherits bacula {
) inherits bacula {
+
package { 'bacula-sd':
ensure => installed
}
package { 'bacula-sd':
ensure => installed
}
@@
-23,7
+34,7
@@
class bacula::storage (
exec { 'bacula-sd restart-when-idle':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
exec { 'bacula-sd restart-when-idle':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
- command => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${
bacula::bacula_storage_port
} bacula-sd &'",
+ command => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${
port_sd
} bacula-sd &'",
refreshonly => true,
subscribe => File[$bacula::bacula_ssl_server_cert],
require => File['/usr/local/sbin/bacula-idle-restart'],
refreshonly => true,
subscribe => File[$bacula::bacula_ssl_server_cert],
require => File['/usr/local/sbin/bacula-idle-restart'],
@@
-44,17
+55,16
@@
class bacula::storage (
purge => true,
force => true,
recurse => true,
purge => true,
force => true,
recurse => true,
- source => 'puppet:///files/empty/',
notify => Exec['bacula-sd restart-when-idle']
}
# allow access from director and fds
ferm::rule::simple { 'dsa-bacula-sd':
description => 'Access to the bacula-storage',
notify => Exec['bacula-sd restart-when-idle']
}
# allow access from director and fds
ferm::rule::simple { 'dsa-bacula-sd':
description => 'Access to the bacula-storage',
- port => $
bacula::bacula_storage_port
,
+ port => $
port_sd
,
target => 'bacula-sd',
}
target => 'bacula-sd',
}
- Ferm::Rule::Simple <<| tag ==
"bacula::director-to-storage::${bacula::bacula_director_address}"
|>>;
+ Ferm::Rule::Simple <<| tag ==
'bacula::director-to-storage'
|>>;
Ferm::Rule::Simple <<| tag == "bacula::fd-to-storage::${::fqdn}" |>>;
file { '/etc/bacula/storage-conf.d/empty.conf':
Ferm::Rule::Simple <<| tag == "bacula::fd-to-storage::${::fqdn}" |>>;
file { '/etc/bacula/storage-conf.d/empty.conf':
@@
-77,5
+87,6
@@
class bacula::storage (
| EOF
}
| EOF
}
- Bacula::Storage_per_node<<| |>>
+ Bacula::Storage::Director<<| tag == 'bacula::to-storage' |>>
+ Bacula::Storage::Client<<| tag == "bacula::to-storage::${::fqdn}" |>>
}
}