projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
heardbeats
[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
987170e
..
66ff569
100644
(file)
--- a/
modules/bacula/templates/bacula-dir.conf.erb
+++ b/
modules/bacula/templates/bacula-dir.conf.erb
@@
-97,9
+97,9
@@
Schedule {
########################################################################
Catalog {
Name = MyCatalog
########################################################################
Catalog {
Name = MyCatalog
- dbname =
bacula
;
- DB Address = "<%= bacula_db_address %>";
- DB Port = <%= bacula_db_port %>;
+ dbname =
"service = bacula"
;
+
#
DB Address = "<%= bacula_db_address %>";
+
#
DB Port = <%= bacula_db_port %>;
dbuser = "bacula";
dbpassword = "<%= bacula_db_secret %>"
}
dbuser = "bacula";
dbpassword = "<%= bacula_db_secret %>"
}
@@
-159,7
+159,6
@@
JobDefs {
Level = Incremental
FileSet = "Standard Set"
Schedule = "WeeklyCycle"
Level = Incremental
FileSet = "Standard Set"
Schedule = "WeeklyCycle"
- Storage = <%=bacula_filestor_name%>
Messages = Standard
Pool = <%=bacula_pool_name%>
Differential Backup Pool = <%=bacula_pool_name%>diff
Messages = Standard
Pool = <%=bacula_pool_name%>
Differential Backup Pool = <%=bacula_pool_name%>diff
@@
-180,7
+179,7
@@
Job {
Type = Restore
Client = draghi.debian.org-fd
FileSet = "Standard Set"
Type = Restore
Client = draghi.debian.org-fd
FileSet = "Standard Set"
- Pool =
Restore
+ Pool =
<%=bacula_pool_name%>
Messages = Standard
Where = /var/tmp/bacula-restores
}
Messages = Standard
Where = /var/tmp/bacula-restores
}
@@
-191,6
+190,7
@@
Job {
Pool {
Name = <%= bacula_pool_name %>
Pool Type = Backup
Pool {
Name = <%= bacula_pool_name %>
Pool Type = Backup
+ Storage = <%=bacula_filestor_name%>
Recycle = no
AutoPrune = yes
Volume Retention = 1 year
Recycle = no
AutoPrune = yes
Volume Retention = 1 year
@@
-204,6
+204,7
@@
Pool {
Pool {
Name = <%= bacula_pool_name %>diff
Pool Type = Backup
Pool {
Name = <%= bacula_pool_name %>diff
Pool Type = Backup
+ Storage = <%=bacula_filestor_name%>
Recycle = no
AutoPrune = yes
Volume Retention = 1 year
Recycle = no
AutoPrune = yes
Volume Retention = 1 year
@@
-217,6
+218,7
@@
Pool {
Pool {
Name = <%= bacula_pool_name %>inc
Pool Type = Backup
Pool {
Name = <%= bacula_pool_name %>inc
Pool Type = Backup
+ Storage = <%=bacula_filestor_name%>
Recycle = no
AutoPrune = yes
Volume Retention = 1 year
Recycle = no
AutoPrune = yes
Volume Retention = 1 year