summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/common/tasks/ipsec.yml2
-rw-r--r--roles/webmail/tasks/ldap.yml2
2 files changed, 0 insertions, 4 deletions
diff --git a/roles/common/tasks/ipsec.yml b/roles/common/tasks/ipsec.yml
index 30bb481..4fc2ef7 100644
--- a/roles/common/tasks/ipsec.yml
+++ b/roles/common/tasks/ipsec.yml
@@ -3,42 +3,40 @@
vars:
packages:
- strongswan-charon
# for the GCM and openssl plugins
- libstrongswan-standard-plugins
notify:
- Update firewall
- Restart IPsec
- name: Auto-create a dedicated virtual subnet for IPsec
template: src=etc/network/if-up.d/ipsec.j2
dest=/etc/network/if-up.d/ipsec
owner=root group=root
mode=0755
- name: Auto-deactivate the dedicated virtual subnet for IPsec
file: src=../if-up.d/ipsec
dest=/etc/network/if-down.d/ipsec
owner=root group=root state=link force=yes
-- meta: flush_handlers
-
- name: Configure IPsec
template: src=etc/ipsec.conf.j2
dest=/etc/ipsec.conf
owner=root group=root
mode=0644
register: r1
notify:
- Restart IPsec
- name: Configure IPsec's secrets
template: src=etc/ipsec.secrets.j2
dest=/etc/ipsec.secrets
owner=root group=root
mode=0600
register: r2
notify:
- Restart IPsec
- name: Configure Charon
diff --git a/roles/webmail/tasks/ldap.yml b/roles/webmail/tasks/ldap.yml
index b24860c..4abbd3a 100644
--- a/roles/webmail/tasks/ldap.yml
+++ b/roles/webmail/tasks/ldap.yml
@@ -11,22 +11,20 @@
mode=0644
register: r1
notify:
- Restart stunnel@ldap
- name: Configure stunnel
copy: src=etc/stunnel/ldap.conf
dest=/etc/stunnel/ldap.conf
owner=root group=root
mode=0644
register: r2
notify:
- Restart stunnel@ldap
- name: Enable stunnel@ldap
service: name=stunnel4@ldap enabled=yes
- name: Start stunnel@ldap
service: name=stunnel4@ldap state=started
when: not (r1.changed or r2.changed)
-
-- meta: flush_handlers