1 files changed, 8 insertions, 15 deletions
diff --git a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
index 42b5f74..046ba01 100644
--- a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
+++ b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
@@ -1,39 +1,37 @@
 #
 # Default Bacula Director Configuration file
 # For Bacula release 5.2.6 (21 February 2012) -- debian jessie/sid
 #
 
 Director {  # define myself
   Name = {{ inventory_hostname_short }}-dir
   @|"sed -n '/^bconsole\\s/ {s//Password = /p; q}' /etc/bacula/passwords-dir"
   Messages = Daemon
   Working Directory = /var/lib/bacula
   Pid Directory = /var/run/bacula
   QueryFile = "/etc/bacula/scripts/query.sql"
   Maximum Concurrent Jobs = 1
   DirAddress = 127.0.0.1
-  DirSourceAddress = 127.0.0.1
   DirPort = 9101
   FDConnectTimeout = 5 min
   SDConnectTimeout = 5 min
-  Heartbeat Interval = 1 min
 }
 
 
 JobDefs {
   Name = DefaultJob
   Type = Backup
   Level = Incremental
   Storage = {{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd
   Messages = Standard
   Accurate = yes
   #Rerun Failed Levels = yes
   Reschedule On Error = yes
   Reschedule Interval = 17 min
   Reschedule Times = 3
   Pool = Default
   Priority = 10
   Write Bootstrap = "/var/lib/bacula/%n.bsr"
 }
 
 JobDefs {
@@ -348,72 +346,67 @@ FileSet {
         Exclude = yes
     }
     File = /var/lib/bacula/tmp
   }
 }
 
 FileSet {
   Name = Mailboxes
   Include {
     Options {
       signature = SHA1
       verify = pins1
     }
     File = /home/mail/virtual
     File = /home/mail/spamspool
   }
 }
 
 
 # Client (File Services) to backup
-{% set n = 0 %}
 {% for fd in groups.all | sort %}
-{% set n = n + 1 %}
 Client {
   Name = {{ hostvars[fd].inventory_hostname_short }}-fd
-{% if fd == inventory_hostname %}
-  Address = 127.0.0.1
-{% else %}
-  Address = 127.0.{{ n }}.1
-{% endif %}
-  FDPort  = 9112
+  Address = {{ ipsec[ hostvars[fd].inventory_hostname_short ] }}
+  FDPort  = 9102
   Catalog = MyCatalog
   @|"sed -n '/^{{ hostvars[fd].inventory_hostname_short }}-fd\\s/ {s//Password = /p; q}' /etc/bacula/passwords-dir"
   File Retention = 4 months
   Job Retention = 5 months
   AutoPrune = yes
   #Maximum Bandwidth = 1mb/s
 }
 {% endfor %}
 
 
 # Definition of file storage device
+{% for sd in groups['bacula-sd'] | sort %}
 Storage {
-  Name = {{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd
-  Address = 127.0.0.1
-  SDPort  = 9113
-  @|"sed -n '/^{{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd\\s/ {s//Password = /p; q}' /etc/bacula/passwords-dir"
+  Name = {{ hostvars[sd].inventory_hostname_short }}-sd
+  Address = {{ ipsec[ hostvars[sd].inventory_hostname_short ] }}
+  SDPort  = 9103
+  @|"sed -n '/^{{ hostvars[sd].inventory_hostname_short }}-sd\\s/ {s//Password = /p; q}' /etc/bacula/passwords-dir"
   Device = FileStorage
   Media Type = File
-  Heartbeat Interval = 1 min
 }
 
+{% endfor %}
 
 # Default pool definition
 Pool {
   Name = Default
   Pool Type = Backup
   Recycle = yes
   AutoPrune = yes
   Volume Retention = 3 months
   Maximum Volume Bytes = 5GB
   Label Format = "Default-${NumVols:p/4/0/r}"
 }
 
 # Scratch pool definition
 Pool {
   Name = Scratch
   Pool Type = Backup
   Maximum Volume Bytes = 5GB
   Label Format = "Scratch-${NumVols:p/4/0/r}"
 }