X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=db41540a84bc330dd3dd08726dc1005c8fbf41ed;hb=e272b442942830a6eed50748eb63aa3b6318ca2b;hp=d3835be4a0b7e1f3e4803d67f045848d9bc488e0;hpb=11958888b106376c4566dcecb16234f060267a3c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index d3835be4a..db41540a8 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -82,53 +82,20 @@ FileSet {
   }
 }
 
-########################################################################
-# A fileset for the catalog, one sql dump of the db                    #
-########################################################################
-FileSet {
-  Name = "Catalog"
-  Include {
-    Options {
-      signature = SHA1
-      #compression = GZIP9
-    }
-    File = "/var/lib/bacula/bacula.sql.gz"
-  }
-}
-
-########################################################################
-# The job schedules                                                    #
-########################################################################
-
-# When to do the backups, full backup on first sunday of the month,
-#  differential (i.e. incremental since full) every other sunday,
-#  and incremental backups other days
-Schedule {
-  Name = "WeeklyCycle"
-  # fulls are automatically run if the last full backup was 40 days ago
-  # for the current value of 40 look for "Max Full Interval" in this file.
-  # Run = Full 1st sat at 00:35
-  Run = Differential sat at 00:35
-  Run = Incremental sun-fri at 00:35
-}
-
-# This schedule does the catalog. It starts after the WeeklyCycle
-Schedule {
-  Name = "WeeklyCycleAfterBackup"
-  Run = Full sun-sat at 02:10
-}
 
 ########################################################################
 # Generic catalog service                                              #
 ########################################################################
 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;
-  dbsslca = /etc/ssl/debian/certs/ca.crt;
-  dbuser = "bacula";
+<% if @db_sslca %>
+  dbsslca = "<%= @db_sslca %>";
+<% end %>
+  dbuser = "<%= @db_user %>";
   dbpassword = "<%= @bacula_db_secret %>"
 }
 
@@ -176,7 +143,6 @@ JobDefs {
   Level = Incremental
   FileSet = "Standard Set"
   Accurate = yes
-  # Schedule = "WeeklyCycle"
   Messages = Standard
   Max Full Interval = 50 days
   Priority = 10
@@ -206,66 +172,6 @@ Pool {
   Pool Type = Backup
 }
 
-########################################################################
-# Generic jobs                                                         #
-########################################################################
-# Backup the catalog database (after the nightly save)
-Storage {
-  Name = "<%= @bacula_filestor_name %>-catalog"
-  Address = <%= @bacula_storage_address %>
-  SDPort = <%= @bacula_storage_port %>
-  Password = "<%= @bacula_storage_secret %>"
-  Device = "<%= @bacula_filestor_device %>-catalog"
-  Media Type = "<%= @bacula_filestor_name %>-catalog"
-  Maximum Concurrent Jobs = 10
-
-  TLS Enable = yes
-  TLS Require = yes
-  TLS CA Certificate File = "<%= @bacula_ca_path %>"
-  # This is a client certificate, used by the director to connect to the storage daemon
-  TLS Certificate = "<%= @bacula_ssl_client_cert %>"
-  TLS Key = "<%= @bacula_ssl_client_key %>"
-}
-Pool {
-  Name = "poolcatalog-<%=@bacula_pool_name%>"
-  Pool Type = Backup
-  Storage = "<%=@bacula_filestor_name%>-catalog"
-  AutoPrune = yes
-  Volume Retention = 2 months
-  Label Format = "<%= @bacula_pool_name %>-catalog.${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}_${Hour:p/2/0/r}:${Minute:p/2/0/r}"
-  Volume Use Duration = 23h
-  Maximum Volume Jobs = 1
-  Maximum Volume Bytes = 500G
-  Action On Purge = Truncate
-  Recycle = yes
-  RecyclePool = "poolcataloggraveyard-<%=@bacula_pool_name%>"
-}
-Pool {
-  Name = "poolcataloggraveyard-<%=@bacula_pool_name%>"
-  Pool Type = Backup
-  Storage = "<%=@bacula_filestor_name%>-catalog"
-  Recycle = yes
-  RecyclePool = "poolcataloggraveyard-<%=@bacula_pool_name%>"
-}
-
-Job {
-  Name = "BackupCatalog"
-  JobDefs = "Standardbackup"
-  Client = <%=@bacula_director_address%>-fd
-  Level = Full
-  FileSet = "Catalog"
-  Schedule = "WeeklyCycleAfterBackup"
-#  # This creates an ASCII copy of the catalog
-#  # Arguments to make_catalog_backup.pl are:
-#  #  make_catalog_backup.pl <catalog-name>
-  RunBeforeJob = "/etc/bacula/scripts/make_catalog_backup.pl MyCatalog"
-#  # This deletes the copy of the catalog
-  RunAfterJob  = "/etc/bacula/scripts/delete_catalog_backup"
-  Write Bootstrap = "/var/lib/bacula/%n.bsr"
-  Priority = 15    # run after main backup
-  Pool = "poolcatalog-<%=@bacula_pool_name%>"
-}
-
 ########################################################################
 # And now include all the generated configs                            #
 ########################################################################