projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ferm::conf - include ferm
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
templates
/
bacula-fd.conf.erb
diff --git
a/modules/bacula/templates/bacula-fd.conf.erb
b/modules/bacula/templates/bacula-fd.conf.erb
index
1b433ea
..
9ef873b
100644
(file)
--- a/
modules/bacula/templates/bacula-fd.conf.erb
+++ b/
modules/bacula/templates/bacula-fd.conf.erb
@@
-6,39
+6,44
@@
# List Directors who are permitted to contact this File daemon
Director {
# List Directors who are permitted to contact this File daemon
Director {
- Name = <%= bacula_director_name %>
- Password = "<%= bacula_client_secret %>"
+ Name = <%=
@
bacula_director_name %>
+ Password = "<%=
@
bacula_client_secret %>"
TLS Enable = yes
TLS Require = yes
TLS Verify Peer = yes
TLS Enable = yes
TLS Require = yes
TLS Verify Peer = yes
- TLS Allowed CN = "clientcerts/<%= bacula_director_address %>"
- TLS CA Certificate File = "<%= bacula_ca_path %>"
+ TLS Allowed CN = "clientcerts/<%=
@
bacula_director_address %>"
+ TLS CA Certificate File = "<%=
@
bacula_ca_path %>"
# This is a server certificate, used for incoming director connections.
# This is a server certificate, used for incoming director connections.
- TLS Certificate = "<%= bacula_ssl_server_cert %>"
- TLS Key = "<%= bacula_ssl_server_key %>"
+ TLS Certificate = "<%=
@
bacula_ssl_server_cert %>"
+ TLS Key = "<%=
@
bacula_ssl_server_key %>"
}
# "Global" File daemon configuration specifications
FileDaemon {
}
# "Global" File daemon configuration specifications
FileDaemon {
- Name = <%= bacula_client_name %>
- FDport = <%= bacula_client_port %>
+ Name = <%=
@
bacula_client_name %>
+ FDport = <%=
@
bacula_client_port %>
WorkingDirectory = /var/lib/bacula
Pid Directory = /var/run/bacula
Maximum Concurrent Jobs = 20
WorkingDirectory = /var/lib/bacula
Pid Directory = /var/run/bacula
Maximum Concurrent Jobs = 20
- FDAddress = <%= fqdn %>
- Maximum Network Buffer Size = 524288
+ FDAddress = <%=
@
fqdn %>
+
#
Maximum Network Buffer Size = 524288
TLS Enable = yes
TLS Require = yes
TLS Enable = yes
TLS Require = yes
- TLS CA Certificate File = "<%= bacula_ca_path %>"
+ TLS CA Certificate File = "<%=
@
bacula_ca_path %>"
# This is a client certificate, used by the client to connect to the storage daemon
# This is a client certificate, used by the client to connect to the storage daemon
- TLS Certificate = "<%= bacula_ssl_client_cert %>"
- TLS Key = "<%= bacula_ssl_client_key %>"
+ TLS Certificate = "<%= @bacula_ssl_client_cert %>"
+ TLS Key = "<%= @bacula_ssl_client_key %>"
+
+<%- if scope.lookupvar('site::nodeinfo')['hoster']['name'] == "brown" -%>
+ # broken firewall
+ Heartbeat Interval = 60
+<%- end -%>
}
# Send all messages except skipped files back to Director
Messages {
Name = Standard
}
# Send all messages except skipped files back to Director
Messages {
Name = Standard
- director = <%=
bacula_director_name
%> = all, !skipped, !restored
+ director = <%=
@bacula_director_name
%> = all, !skipped, !restored
}
}