From efa34dab42a1532d74e0f21c5727f4b8b2159cb5 Mon Sep 17 00:00:00 2001
From: Solal Nathan <otthorn@crans.org>
Date: Thu, 4 Feb 2021 23:35:12 +0100
Subject: [PATCH] fix yaml syntax

---
 host_vars/mail.auro.re.yml | 10 +++++-----
 mailserver.yml             | 25 +++++++++++++------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/host_vars/mail.auro.re.yml b/host_vars/mail.auro.re.yml
index 64da62b..289801a 100644
--- a/host_vars/mail.auro.re.yml
+++ b/host_vars/mail.auro.re.yml
@@ -5,11 +5,11 @@ certbot:
     - smtp.auro.re
   mail: tech.aurore@lists.crans.org
   certname: auro.re
-  cert_path_prefix = "/etc/letsencrypt/live/{{ certbot.certname }}"
-  cert_path_cert = "{{ cerbot.cert_path_prefix }}/cert.pem"
-  cert_path_chain = "{{ cerbot.cert_path_prefix }}/chain.pem"
-  cert_path_fullchain = "{{ cerbot.cert_path_prefix }}/fullchain.pem"
-  cert_path_privkey = "{{ cerbot.cert_path_prefix }}/privkey.pem"
+  cert_path_prefix: "/etc/letsencrypt/live/{{ certbot.certname }}"
+  cert_path_cert: "{{ cerbot.cert_path_prefix }}/cert.pem"
+  cert_path_chain: "{{ cerbot.cert_path_prefix }}/chain.pem"
+  cert_path_fullchain: "{{ cerbot.cert_path_prefix }}/fullchain.pem"
+  cert_path_privkey: "{{ cerbot.cert_path_prefix }}/privkey.pem"
 
 nfs:
   src: "10.128.0.6:/data_mail"  # caradoc
diff --git a/mailserver.yml b/mailserver.yml
index f9725e7..fcabd49 100755
--- a/mailserver.yml
+++ b/mailserver.yml
@@ -6,8 +6,9 @@
     - mail_utils
     - mail_certificates
     - nfs_client
-    - postfix
+    # - postfix
     - dovecot
+    - re2o_service_mailserver
 #    - rspamd
 #    - mail-fail2ban
 #
@@ -17,14 +18,14 @@
 
 
 # Deploy Re2o mail service
- - hosts: mail.auro.re
-   vars:
-     service_repo: https://gitea.auro.re/aurore/re2o-mail-server.git
-     service_name: mail-server
-     service_version: aurore
-     service_config:
-       hostname: re2o-test.adm.auro.re  # use test instance for now, should be changed for prod!
-       username: service-user
-       password: "{{ vault_serviceuser_passwd }}"
-   roles:
-     - re2o-service
+- hosts: mail.auro.re
+  vars:
+    service_repo: https://gitea.auro.re/aurore/re2o-mail-server.git
+    service_name: mail-server
+    service_version: aurore
+    service_config:
+      hostname: re2o-test.adm.auro.re  # use test instance for now, should be changed for prod!
+      username: service-user
+      password: "{{ vault_serviceuser_passwd }}"
+  roles:
+    - re2o-service