From 7fd4b383cffdb0ff54a8fb6f11783a6e011bad2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Norman=20Hauk=C3=A5s?= Date: Tue, 30 Jan 2024 12:08:09 +0100 Subject: [PATCH] clarify variable purpose by renaming to sendmail_hostname --- playbook-vagrant.yml | 2 +- playbook.yml | 2 +- roles/sendmail/templates/ssmtp.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbook-vagrant.yml b/playbook-vagrant.yml index a25d675..d424c03 100644 --- a/playbook-vagrant.yml +++ b/playbook-vagrant.yml @@ -1,11 +1,11 @@ --- - hosts: vagrant vars: - hostname: vagrant sendmail_mta_user: "{{ vault_mta_user }}" sendmail_mta_user_pw: "{{ vault_mta_user_pw }}" sendmail_mailhub: "box.nilsnh.no:465" sendmail_rewrite_domain: "nilsnh.no" + sendmail_hostname: vagrant sendmail_revaliases: root: "{{ machine_from_email }}" jake: "{{ machine_from_email }}" diff --git a/playbook.yml b/playbook.yml index 1e2fa78..76709fc 100644 --- a/playbook.yml +++ b/playbook.yml @@ -2,12 +2,12 @@ - hosts: jake handlers: vars: - hostname: jake.box.nilsnh.no restic_repo_pw: "{{ vault_restic_pw_jake }}" restic_repo_url: "{{ vault_restic_url_jake }}" sendmail_mta_user: "{{ vault_mta_user }}" sendmail_mta_user_pw: "{{ vault_mta_user_pw }}" sendmail_mailhub: "box.nilsnh.no:465" + sendmail_hostname: jake.box.nilsnh.no sendmail_rewrite_domain: "nilsnh.no" sendmail_revaliases: root: "{{ machine_from_email }}" diff --git a/roles/sendmail/templates/ssmtp.conf.j2 b/roles/sendmail/templates/ssmtp.conf.j2 index 30a99f6..16ff55b 100644 --- a/roles/sendmail/templates/ssmtp.conf.j2 +++ b/roles/sendmail/templates/ssmtp.conf.j2 @@ -17,7 +17,7 @@ AuthPass={{ sendmail_mta_user_pw }} rewriteDomain={{ sendmail_rewrite_domain }} # The full hostname -hostname={{ hostname }} +hostname={{ sendmail_hostname }} UseTLS=YES