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=f9dda582bb934d288a3393cee9432075113d1f19;hpb=3e1ee95aec4b7c074740e5652cad20957402151e;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb index f9dda582b..db41540a8 100644 --- a/modules/bacula/templates/bacula-dir.conf.erb +++ b/modules/bacula/templates/bacula-dir.conf.erb @@ -10,28 +10,30 @@ ######################################################################## Director { - Name = <%= bacula_director_name %> - Description = <%= hostname %> - <%= domain %> Bacula Director + Name = <%= @bacula_director_name %> + Description = <%= @hostname %> - <%= @domain %> Bacula Director QueryFile = "/etc/bacula/scripts/query.sql" WorkingDirectory = "/var/lib/bacula" - PidDirectory = "/var/run/bacula" + PidDirectory = "/run/bacula" Maximum Concurrent Jobs = 20 - Password = "<%= bacula_director_secret %>" + Password = "<%= @bacula_director_secret %>" Messages = Daemon DirAddresses = { # Always have localhost in, then the configured IP ip = { addr = 127.0.0.1; port = 9101 } - ip = { addr = <%=bacula_director_address%>; port = <%=bacula_director_port%> } + ip = { addr = <%=@bacula_director_address%>; port = <%=@bacula_director_port%> } } 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 console 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 %>" + + Heartbeat Interval = 60 } ######################################################################## @@ -39,78 +41,62 @@ Director { ######################################################################## FileSet { Name = "Standard Set" + Ignore FileSet Changes = yes Include { Options { signature = SHA1 compression = GZIP9 + aclsupport = yes + xattrsupport = yes + } + Options { + wild = "/swapfile*" + exclude = yes } - File = "\\|bash -c \"df -Pkl -x tmpfs -x iso9660 | tail -n +2 | awk '{print \$NF}' \"" + File = "\\|/usr/local/sbin/bacula-backup-dirs" # Dont backup directories that contain .nobackup files Exclude Dir Containing = .nobackup } Exclude { - File = /var/lib/bacula - File = /var/cache/apt/ + File = /.fsck + File = /.journal + File = /dev + File = /home/buildd/build-trees + File = /lib/init/rw File = /nonexistant File = /proc - File = /tmp - File = /.journal - File = /.fsck + File = /srv/chroot File = /sys - File = /lib/init/rw - File = /var/run + File = /tmp + File = /srv/apache-cache/mod_cache_disk + File = /var/cache/apache2/mod_cache_disk + File = /var/cache/apt + File = /var/lib/apt + File = /var/lib/bacula + File = /var/lib/munin-async File = /var/lock - File = /dev - File = /srv/chroot - File = /home/buildd/build-trees - } -} - -######################################################################## -# 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" + File = /var/log/samhain + File = /var/run + File = "\\|bash -c 'grep -s -v ^# /etc/bacula/local-exclude || true'" } } -######################################################################## -# 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" - Run = Full 1st sat at 00:35 - Run = Differential 2nd-5th 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 = "service = bacula"; - #DB Address = "<%= bacula_db_address %>"; - #DB Port = <%= bacula_db_port %>; - dbuser = "bacula"; - dbpassword = "<%= bacula_db_secret %>" + dbname = <%= @db_name %>; + dbport = <%= @db_port %>; + dbaddress = "<%= @db_address %>"; + dbsslmode = verify-ca; +<% if @db_sslca %> + dbsslca = "<%= @db_sslca %>"; +<% end %> + dbuser = "<%= @db_user %>"; + dbpassword = "<%= @bacula_db_secret %>" } ######################################################################## @@ -120,10 +106,12 @@ Messages { Name = Standard mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r" operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r" - mail on error = <%= bacula_operator_email %> = all, !skipped - operator = <%= bacula_operator_email %> = mount + #mail on error = <%= @bacula_operator_email %> = all, !skipped + mail = <%= @bacula_operator_email %> = all + operator = <%= @bacula_operator_email %> = mount console = all, !skipped, !saved - append = "/var/lib/bacula/log" = all, !skipped + syslog = all + append = "/var/lib/bacula/log" = all catalog = all } @@ -131,17 +119,18 @@ Messages { Messages { Name = Daemon mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r" - mail = <%= bacula_operator_email %> = all, !skipped + mail = <%= @bacula_operator_email %> = all console = all, !skipped, !saved - append = "/var/lib/bacula/log" = all, !skipped + syslog = all + append = "/var/lib/bacula/log" = all } ######################################################################## # Console, limited # ######################################################################## Console { - Name = <%= bacula_monitor_name %> - Password = "<%= bacula_monitor_secret %>" + Name = <%= @bacula_monitor_name %> + Password = "<%= @bacula_monitor_secret %>" CommandACL = status, .status } @@ -153,13 +142,13 @@ JobDefs { Type = Backup Level = Incremental FileSet = "Standard Set" - Schedule = "WeeklyCycle" + Accurate = yes Messages = Standard - Max Full Interval = 1 month + Max Full Interval = 50 days Priority = 10 Write Bootstrap = "/var/lib/bacula/%c.bsr" Maximum Concurrent Jobs = 20 - Client Run After Job = "/usr/local/sbin/postbaculajob -c \"%c\" -d \"%d\" -i \"%i\" -l \"%l\" -n \"%n\" -o /var/log/bacula-main.log" + Client Run After Job = "/usr/local/sbin/postbaculajob -c \"%c\" -d \"%d\" -i \"%i\" -l \"%l\" -n \"%n\" -o /var/log/bacula/client-after.state" } ######################################################################## @@ -169,9 +158,9 @@ JobDefs { Job { Name = "RestoreFiles" Type = Restore - Client = <%=bacula_director_address%>-fd + Client = <%=@bacula_director_address%>-fd FileSet = "Standard Set" - Pool = poolfull-<%=bacula_pool_name%>-<%=bacula_director_address%> + Pool = poolfull-<%=@bacula_pool_name%>-<%=@bacula_director_address%> Messages = Standard Where = /var/tmp/bacula-restores } @@ -183,31 +172,6 @@ Pool { Pool Type = Backup } -######################################################################## -# Generic jobs # -######################################################################## -# Backup the catalog database (after the nightly save) -#Job { -# Name = "BackupCatalog" -# JobDefs = "Standardbackup" -# 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 -# 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 -# RunScript { -# RunsWhen=After -# RunsOnClient=No -# Console = "purge volume action=all allpools storage=File" -# } -#} - ######################################################################## # And now include all the generated configs # ########################################################################