From 8cf4032ecec5b9f58d829e89f231179170432539 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 22 May 2016 17:21:16 +0200
Subject: =?UTF-8?q?Tunnel=20bacula=20(dir=20=E2=86=92=20{fd,sd}=20and=20fd?=
 =?UTF-8?q?=20=E2=86=92=20sd)=20traffic=20through=20IPSec.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/templates/etc/bacula/bacula-fd.conf.j2  |  6 +-
 roles/common/templates/etc/iptables/services.j2    | 10 ---
 .../common/templates/etc/stunnel/bacula-fd.conf.j2 | 73 ----------------------
 3 files changed, 2 insertions(+), 87 deletions(-)
 delete mode 100644 roles/common/templates/etc/stunnel/bacula-fd.conf.j2

(limited to 'roles/common/templates')

diff --git a/roles/common/templates/etc/bacula/bacula-fd.conf.j2 b/roles/common/templates/etc/bacula/bacula-fd.conf.j2
index 432768b..d64ac86 100644
--- a/roles/common/templates/etc/bacula/bacula-fd.conf.j2
+++ b/roles/common/templates/etc/bacula/bacula-fd.conf.j2
@@ -27,11 +27,9 @@ FileDaemon {  # define myself
   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
+  FDAddress = {{ ipsec[inventory_hostname_short] }}
+  FDPort = 9102
   SDConnectTimeout = 5 min
-  Heartbeat Interval = 1 min
 
   PKI Signatures = Yes  # Enable Data Signing
   PKI Encryption = Yes  # Enable Data Encryption
diff --git a/roles/common/templates/etc/iptables/services.j2 b/roles/common/templates/etc/iptables/services.j2
index 953cea5..ccbc735 100644
--- a/roles/common/templates/etc/iptables/services.j2
+++ b/roles/common/templates/etc/iptables/services.j2
@@ -61,16 +61,6 @@ in      tcp     80,443                                  # HTTP/HTTPS
 out     tcp     993                                     # IMAP
 out     tcp     4190                                    # MANAGESIEVE
 {% endif %}
-{% if 'bacula-dir' in group_names and groups.all | difference(groups['bacula-dir']) %}
-out     tcp     9102                                    # BACULA-FD
-{% elif groups['bacula-dir'] | difference([inventory_hostname]) %}
-in      tcp     9102                                    # BACULA-FD
-{% endif %}
-{% if 'bacula-sd' in group_names and groups.all | difference(groups['bacula-sd']) %}
-in      tcp     9103                                    # BACULA-SD
-{% elif groups['bacula-sd'] | difference([inventory_hostname]) %}
-out     tcp     9103                                    # BACULA-SD
-{% endif %}
 {% if 'LDAP-provider' in group_names %}
 out     tcp     11371                                   # HKP
 out     tcp     43                                      # WHOIS
diff --git a/roles/common/templates/etc/stunnel/bacula-fd.conf.j2 b/roles/common/templates/etc/stunnel/bacula-fd.conf.j2
deleted file mode 100644
index 057dc48..0000000
--- a/roles/common/templates/etc/stunnel/bacula-fd.conf.j2
+++ /dev/null
@@ -1,73 +0,0 @@
-; **************************************************************************
-; * Global options                                                         *
-; **************************************************************************
-
-; 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
-
-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
-
-; **************************************************************************
-; * Service definitions (remove all services for inetd mode)               *
-; **************************************************************************
-
-[{{ inventory_hostname_short }}-fd]
-client  = no
-accept  = 9102
-connect = 9112
-CAfile  = /etc/stunnel/certs/bacula-dirs.pem
-
-{% if 'bacula-sd' not in group_names %}
-[{{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd]
-client  = yes
-accept  = 127.0.0.1:9113
-connect = {{ groups['bacula-sd'][0] }}:9103
-delay   = yes
-CAfile  = /etc/stunnel/certs/{{ hostvars[ groups['bacula-sd'][0] ].inventory_hostname_short }}-sd.pem
-{% endif %}
-
-; vim:ft=dosini
-- 
cgit v1.2.3