From fa8d2b668550259e6f78d16fc209c4da1a20b842 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 12 Feb 2016 15:25:31 +0100
Subject: Upgrade playbooks to Ansible 2.0.

---
 roles/webmail/tasks/main.yml      | 10 ++++++++--
 roles/webmail/tasks/roundcube.yml |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'roles/webmail')

diff --git a/roles/webmail/tasks/main.yml b/roles/webmail/tasks/main.yml
index 030a547..8ee50bd 100644
--- a/roles/webmail/tasks/main.yml
+++ b/roles/webmail/tasks/main.yml
@@ -1,3 +1,9 @@
-- include: mail.yml      tags=postfix,mail
+- include: mail.yml
   when: "'out' not in group_names"
-- include: roundcube.yml tags=roundcube,webmail
+  tags:
+    - postfix
+    - mail
+- include: roundcube.yml
+  tags:
+    - roundcube
+    - webmail
diff --git a/roles/webmail/tasks/roundcube.yml b/roles/webmail/tasks/roundcube.yml
index 3eaf766..eb04ba1 100644
--- a/roles/webmail/tasks/roundcube.yml
+++ b/roles/webmail/tasks/roundcube.yml
@@ -40,8 +40,8 @@
 
 - name: Configure Roundcube
   lineinfile: dest=/etc/roundcube/config.inc.php
-              "regexp=^\\s*\\$config\\['{{ item.var }}'\\]\\s*="
-              "line=$config['{{ item.var }}'] = {{ item.value }};"
+              regexp='^\\s*\\$config\\[\'{{ item.var }}\'\\]\\s*='
+              line='$config[\'{{ item.var }}\'] = {{ item.value }};'
               owner=root group=www-data
               mode=0640
   with_items:
@@ -129,7 +129,7 @@
 
 - name: Fetch Nginx's X.509 certificate
   # Ensure we don't fetch private data
-  sudo: False
+  become: False
   fetch: src=/etc/nginx/ssl/mail.fripost.org.pem
          dest=certs/public/
          fail_on_missing=yes
-- 
cgit v1.2.3