aurore/ansible
aurore/ansible
11
2
Fork 0
Code Issues 1 Pull requests 13 Releases Wiki Activity

Fix broken vars

Browse source
This commit is contained in:
otthorn 2021-02-04 23:44:32 +01:00 committed by Otthorn
parent 391d5ce9a0
commit 9e6a127a8f
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
host_vars/mail.auro.re.yml
View file

@ -5,11 +5,13 @@ certbot:
- smtp.auro.re - smtp.auro.re
mail: tech.aurore@lists.crans.org mail: tech.aurore@lists.crans.org
certname: auro.re certname: auro.re
cert_path_prefix: "/etc/letsencrypt/live/{{ certbot.certname }}"
cert_path_cert: "{{ cerbot.cert_path_prefix }}/cert.pem" cert:
cert_path_chain: "{{ cerbot.cert_path_prefix }}/chain.pem" path_prefix: "/etc/letsencrypt/live/{{ cerbot.certname }}"
cert_path_fullchain: "{{ cerbot.cert_path_prefix }}/fullchain.pem" #path_cert: "{{ path_prefix }}/cert.pem"
cert_path_privkey: "{{ cerbot.cert_path_prefix }}/privkey.pem" #path_chain: "{{ path_prefix }}/chain.pem"
path_fullchain: "{{ path_prefix }}/fullchain.pem"
path_privkey: "{{ path_prefix }}/privkey.pem"
nfs: nfs:
src: "10.128.0.6:/data_mail" # caradoc src: "10.128.0.6:/data_mail" # caradoc

4
roles/postfix/templates/main.cf.j2
View file

@ -47,8 +47,8 @@ virtual_transport = lmtp:unix:private/dovecot-lmtp
# TLS for reception # TLS for reception
smtpd_use_tls = yes smtpd_use_tls = yes
smtpd_tls_security_level = may smtpd_tls_security_level = may
smtpd_tls_cert_file = {{ certbot.cert_path_fullchain }} smtpd_tls_cert_file = {{ cert.path_fullchain }}
smtpd_tls_key_file = {{ certbot.cert_path_privkey }} smtpd_tls_key_file = {{ cert.path_privkey }}
smtpd_tls_loglevel = 0 smtpd_tls_loglevel = 0
smtpd_tls_received_header = yes smtpd_tls_received_header = yes

5
roles/re2o-service/tasks/main.yml
View file

@ -12,6 +12,11 @@
retries: 3 retries: 3
until: apt_result is succeeded 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" - name: "Clone re2o {{ service_name }} project"
git: git:
repo: "{{ service_repo }}" repo: "{{ service_repo }}"