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
4ed5992
..
0a445e0
100644
(file)
--- a/
modules/bacula/manifests/storage.pp
+++ b/
modules/bacula/manifests/storage.pp
@@
-14,7
+14,6
@@
class bacula::storage (
String $storage_name = "${::fqdn}-sd",
Stdlib::Host $storage_address = $::fqdn,
) inherits bacula {
String $storage_name = "${::fqdn}-sd",
Stdlib::Host $storage_address = $::fqdn,
) inherits bacula {
- $storage_secret = hkdf('/etc/puppet/secret', "bacula-sd-${::fqdn}")
package { 'bacula-sd':
ensure => installed
package { 'bacula-sd':
ensure => installed
@@
-56,7
+55,6
@@
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']
}
notify => Exec['bacula-sd restart-when-idle']
}
@@
-66,7
+64,7
@@
class bacula::storage (
port => $port_sd,
target => 'bacula-sd',
}
port => $port_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':
@@
-89,5
+87,6
@@
class bacula::storage (
| EOF
}
| EOF
}
+ Bacula::Storage::Director<<| tag == 'bacula::to-storage' |>>
Bacula::Storage::Client<<| tag == "bacula::to-storage::${::fqdn}" |>>
}
Bacula::Storage::Client<<| tag == "bacula::to-storage::${::fqdn}" |>>
}