Tunnel bacula (dir → {fd,sd} and fd → sd) traffic through IPSec.

6 files changed, 3 insertions, 163 deletions

diff --git a/roles/common/files/lib/systemd/system/bacula-fd.service b/roles/common/files/lib/systemd/system/bacula-fd.service
index 07bd2e5..ee5afe3 100644
--- a/roles/common/files/lib/systemd/system/bacula-fd.service
+++ b/roles/common/files/lib/systemd/system/bacula-fd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/bacula/bacula-fd.9112.pid
+PIDFile=/var/run/bacula/bacula-fd.9102.pid
 StandardOutput=syslog
 ExecStart=/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf
 
diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index efab81b..250c77b 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -44,9 +44,6 @@
 - name: Reload Postfix
   service: name=postfix state=reloaded
 
-- name: Restart stunnel@bacula-fd
-  service: name=stunnel4@bacula-fd state=restarted
-
 - name: Restart bacula-fd
   service: name=bacula-fd state=restarted
 
diff --git a/roles/common/tasks/bacula.yml b/roles/common/tasks/bacula.yml
index 1bd2b77..35666bd 100644
--- a/roles/common/tasks/bacula.yml
+++ b/roles/common/tasks/bacula.yml
@@ -1,75 +1,3 @@
-- name: Create /etc/stunnel/certs
-  file: path=/etc/stunnel/certs
-        state=directory
-        owner=root group=root
-        mode=0755
-
-- name: Generate a private key and a X.509 certificate for Bacula FD
-  command: genkeypair.sh x509
-                         --pubkey=/etc/stunnel/certs/{{ inventory_hostname_short }}-fd.pem
-                         --privkey=/etc/stunnel/certs/{{ inventory_hostname_short }}-fd.key
-                         --ou=BaculaFD --cn={{ inventory_hostname }} --dns={{ inventory_hostname }}
-                         -t rsa -b 4096 -h sha512
-  register: r1
-  changed_when: r1.rc == 0
-  failed_when: r1.rc > 1
-  notify:
-    - Restart stunnel@bacula-fd
-  tags:
-    - genkey
-
-- name: Fetch Bacula FD X.509 certificate
-  # Ensure we don't fetch private data
-  become: False
-  fetch_cmd: cmd="openssl x509"
-             stdin=/etc/stunnel/certs/{{ inventory_hostname_short }}-fd.pem
-             dest=certs/bacula/{{ inventory_hostname_short }}-fd.pem
-  tags:
-    - genkey
-
-- name: Copy Bacula Dir X.509 certificates
-  assemble: src=certs/bacula regexp="-dir\.pem$" remote_src=no
-            dest=/etc/stunnel/certs/bacula-dirs.pem
-            owner=root group=root
-            mode=0644
-  register: r2
-  when: "'bacula-dir' not in group_names"
-  notify:
-    - Restart stunnel@bacula-fd
-
-- name: Copy Bacula SD X.509 certificates
-  copy: src=certs/bacula/{{ hostvars[item].inventory_hostname_short }}-sd.pem
-        dest=/etc/stunnel/certs/
-        owner=root group=root
-        mode=0644
-  register: r3
-  with_items: "{{ groups['bacula-sd'] | difference([inventory_hostname]) }}"
-  notify:
-    - Restart stunnel@bacula-fd
-
-- name: Configure stunnel
-  template: src=etc/stunnel/bacula-fd.conf.j2
-            dest=/etc/stunnel/bacula-fd.conf
-            owner=root group=root
-            mode=0644
-  register: r4
-  when: "'bacula-dir' not in group_names or 'bacula-sd' not in group_names"
-  notify:
-    - Restart stunnel@bacula-fd
-
-- name: Enable stunnel@bacula-fd
-  when: "'bacula-dir' not in group_names or 'bacula-sd' not in group_names"
-  service: name=stunnel4@bacula-fd enabled=yes
-
-- name: Start stunnel@bacula-fd
-  service: name=stunnel4@bacula-fd state=started
-  when: ('bacula-dir' not in group_names or 'bacula-sd' not in group_names) and
-        not (r1.changed or r2.changed or r3.changed or r4.changed)
-
-- meta: flush_handlers
-
-
-
 - name: Install bacula-fd
   apt: pkg=bacula-fd
 
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