projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix quoting
[mirror/dsa-puppet.git]
/
modules
/
bacula
/
templates
/
bacula-dir.conf.erb
diff --git
a/modules/bacula/templates/bacula-dir.conf.erb
b/modules/bacula/templates/bacula-dir.conf.erb
index
d3835be
..
e707f5e
100644
(file)
--- a/
modules/bacula/templates/bacula-dir.conf.erb
+++ b/
modules/bacula/templates/bacula-dir.conf.erb
@@
-123,12
+123,14
@@
Schedule {
########################################################################
Catalog {
Name = MyCatalog
########################################################################
Catalog {
Name = MyCatalog
- dbname =
bacula
;
- dbport =
5432
;
- dbaddress =
postgresql-manda-01.debian.org
;
+ dbname =
<%= @db_name %>
;
+ dbport =
<%= @db_port %>
;
+ dbaddress =
"<%= @db_address %>"
;
dbsslmode = verify-ca;
dbsslmode = verify-ca;
- dbsslca = /etc/ssl/debian/certs/ca.crt;
- dbuser = "bacula";
+<% if @db_sslca %>
+ dbsslca = "<%= @db_sslca %>";
+<% end %>
+ dbuser = "<%= @db_user %>";
dbpassword = "<%= @bacula_db_secret %>"
}
dbpassword = "<%= @bacula_db_secret %>"
}