diff --git a/host_vars/mail.auro.re.yml b/host_vars/mail.auro.re.yml index 289801a..7ff5f11 100644 --- a/host_vars/mail.auro.re.yml +++ b/host_vars/mail.auro.re.yml @@ -5,11 +5,13 @@ 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/{{ cerbot.certname }}" + #path_cert: "{{ path_prefix }}/cert.pem" + #path_chain: "{{ path_prefix }}/chain.pem" + path_fullchain: "{{ path_prefix }}/fullchain.pem" + path_privkey: "{{ path_prefix }}/privkey.pem" nfs: src: "10.128.0.6:/data_mail" # caradoc diff --git a/roles/postfix/templates/main.cf.j2 b/roles/postfix/templates/main.cf.j2 index e312caa..2173961 100644 --- a/roles/postfix/templates/main.cf.j2 +++ b/roles/postfix/templates/main.cf.j2 @@ -47,8 +47,8 @@ virtual_transport = lmtp:unix:private/dovecot-lmtp # TLS for reception smtpd_use_tls = yes smtpd_tls_security_level = may -smtpd_tls_cert_file = {{ certbot.cert_path_fullchain }} -smtpd_tls_key_file = {{ certbot.cert_path_privkey }} +smtpd_tls_cert_file = {{ cert.path_fullchain }} +smtpd_tls_key_file = {{ cert.path_privkey }} smtpd_tls_loglevel = 0 smtpd_tls_received_header = yes diff --git a/roles/re2o-service/tasks/main.yml b/roles/re2o-service/tasks/main.yml index 68e963c..1f7902d 100644 --- a/roles/re2o-service/tasks/main.yml +++ b/roles/re2o-service/tasks/main.yml @@ -12,6 +12,11 @@ retries: 3 until: apt_result is succeeded +- name: "Create the local user {{ service_user }}" + user: + create_home: false + name: "{{ service_user }}" + - name: "Clone re2o {{ service_name }} project" git: repo: "{{ service_repo }}"