projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fd: also use the grep in public_addresses to learn if we support v4/v6
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
manifests
/
init.pp
diff --git
a/modules/bacula/manifests/init.pp
b/modules/bacula/manifests/init.pp
index
7b78df8
..
013bcf3
100644
(file)
--- a/
modules/bacula/manifests/init.pp
+++ b/
modules/bacula/manifests/init.pp
@@
-1,11
+1,10
@@
# bacula class -- defines all the variables we care about in our bacula deployment
#
# @param public_addresses this host's public IP addresses. The ones it connects out from and is reachable from outsite.
# bacula class -- defines all the variables we care about in our bacula deployment
#
# @param public_addresses this host's public IP addresses. The ones it connects out from and is reachable from outsite.
+# @param has_ipv4 daemons should listen on ipv4
+# @param has_ipv6 daemons should listen on ipv6
class bacula (
String $bacula_operator_email = 'bacula-reports@admin.debian.org',
class bacula (
String $bacula_operator_email = 'bacula-reports@admin.debian.org',
- String $bacula_director_name = 'debian-dir',
-
- String $bacula_db_secret = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}"),
String $bacula_ca_path = '/etc/ssl/debian/certs/ca.crt',
String $bacula_ssl_client_cert = '/etc/ssl/debian/certs/thishost.crt',
String $bacula_ca_path = '/etc/ssl/debian/certs/ca.crt',
String $bacula_ssl_client_cert = '/etc/ssl/debian/certs/thishost.crt',
@@
-17,6
+16,9
@@
class bacula (
String $tag_bacula_dsa_client_list = 'bacula::dsa::clientlist',
Array[Stdlib::IP::Address] $public_addresses = $base::public_addresses,
String $tag_bacula_dsa_client_list = 'bacula::dsa::clientlist',
Array[Stdlib::IP::Address] $public_addresses = $base::public_addresses,
+
+ Boolean $has_ipv4 = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
+ Boolean $has_ipv6 = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
) {
file { '/usr/local/sbin/bacula-idle-restart':
mode => '0555',
) {
file { '/usr/local/sbin/bacula-idle-restart':
mode => '0555',