2 files changed, 11 insertions, 4 deletions
diff --git a/roles/common/templates/etc/bacula/bacula-fd.conf.j2 b/roles/common/templates/etc/bacula/bacula-fd.conf.j2
index a47bb90..432768b 100644
--- a/roles/common/templates/etc/bacula/bacula-fd.conf.j2
+++ b/roles/common/templates/etc/bacula/bacula-fd.conf.j2
@@ -13,29 +13,28 @@ Director {
 }
 
 # Send all messages except skipped files back to Director
 Messages {
   Name = Standard
   director = {{ hostvars[dir].inventory_hostname_short }}-dir = all, !skipped, !restored
 }
 {% endfor %}
 
 #
 # "Global" File daemon configuration specifications
 #
 FileDaemon {  # define myself
   Name = {{ inventory_hostname_short }}-fd
   Working Directory = /var/lib/bacula
   Pid Directory = /var/run/bacula
   Maximum Concurrent Jobs = 20
   FDAddress = 127.0.0.1
   FDPort = 9112
   FDSourceAddress = 127.0.0.1
-{% if 'bacula-dir' not in group_names or 'bacula-sd' not in group_names %}
-  Heartbeat Interval = 60s
-{% endif %}
+  SDConnectTimeout = 5 min
+  Heartbeat Interval = 1 min
 
   PKI Signatures = Yes  # Enable Data Signing
   PKI Encryption = Yes  # Enable Data Encryption
   PKI Keypair = /etc/bacula/ssl/{{ inventory_hostname_short }}.pem # Public and Private Keys
   PKI Master Key = /etc/bacula/ssl/master.pem                      # ONLY the Public Key
 }
diff --git a/roles/common/templates/etc/stunnel/bacula-fd.conf.j2 b/roles/common/templates/etc/stunnel/bacula-fd.conf.j2
index 851f0ac..057dc48 100644
--- a/roles/common/templates/etc/stunnel/bacula-fd.conf.j2
+++ b/roles/common/templates/etc/stunnel/bacula-fd.conf.j2
@@ -4,43 +4,51 @@
 
 ; setuid()/setgid() to the specified user/group in daemon mode
 setuid = stunnel4
 setgid = stunnel4
 
 ; PID is created inside the chroot jail
 pid =
 foreground = yes
 
 ; Only log messages at severity warning (4) and higher
 debug = 4
 
 ; **************************************************************************
 ; * Service defaults may also be specified in individual service sections  *
 ; **************************************************************************
 
 ; Certificate/key is needed in server mode and optional in client mode
 cert = /etc/stunnel/certs/{{ inventory_hostname_short }}-fd.pem
 key  = /etc/stunnel/certs/{{ inventory_hostname_short }}-fd.key
 
-; Some performance tunings
 socket = l:TCP_NODELAY=1
+socket = l:SO_KEEPALIVE=1
+socket = l:TCP_KEEPIDLE=60
+socket = l:TCP_KEEPINTVL=15
+socket = l:TCP_KEEPCNT=116
+
 socket = r:TCP_NODELAY=1
+socket = r:SO_KEEPALIVE=1
+socket = r:TCP_KEEPIDLE=60
+socket = r:TCP_KEEPINTVL=15
+socket = r:TCP_KEEPCNT=116
 
 ; Prevent MITM attacks
 verify = 4
 
 ; Disable support for insecure protocols
 options = NO_SSLv2
 options = NO_SSLv3
 options = NO_TLSv1
 options = NO_TLSv1.1
 
 options = NO_COMPRESSION
 
 ; These options provide additional security at some performance degradation
 options = SINGLE_ECDH_USE
 options = SINGLE_DH_USE
 
 ; Select permitted SSL ciphers
 ciphers = EECDH+AESGCM:!MEDIUM:!LOW:!EXP:!aNULL:!eNULL
 
 ; **************************************************************************