Don't inject facts as vars

This commit is contained in:
2020-06-27 15:56:55 +02:00
parent bce3dc670b
commit 38b3239854
18 changed files with 73 additions and 72 deletions
+8 -8
View File
@@ -7,11 +7,11 @@
- name: Add configured domains to Uberspace config
shell: "uberspace mail domain add $(idn {{ item }})"
when: item not in uberspace_mail_domain_result.stdout_lines
loop: "{{ mail_domains.get(ansible_user_id, []) }}"
loop: "{{ mail_domains.get(ansible_facts.user_id, []) }}"
- name: Delete system Maildir
file:
path: "{{ ansible_env.HOME }}/Maildir"
path: "{{ ansible_facts.env.HOME }}/Maildir"
state: absent
- name: Set up local mail user
@@ -19,7 +19,7 @@
name: snapstromegon.uberspace_mail_user
vars:
user: lukas
password: "{{ mail_passwords[ansible_user_id] }}"
password: "{{ mail_passwords[ansible_facts.user_id] }}"
- name: Enable catchall mode
import_role:
@@ -30,11 +30,11 @@
- name: Create qdated key
command:
cmd: qdated-makekey
creates: "{{ ansible_env.HOME }}/.qdated-key"
creates: "{{ ansible_facts.env.HOME }}/.qdated-key"
- name: Read qdated key
slurp:
src: "{{ ansible_env.HOME }}/.qdated-key"
src: "{{ ansible_facts.env.HOME }}/.qdated-key"
register: qdated_key
no_log: yes
@@ -46,14 +46,14 @@
- name: Set up .qmail-dated-default file
template:
src: qmail-dated.j2
dest: "{{ ansible_env.HOME }}/.qmail-dated-default"
dest: "{{ ansible_facts.env.HOME }}/.qmail-dated-default"
- name: Create mutt config directory
file:
path: "{{ ansible_env.HOME }}/.mutt"
path: "{{ ansible_facts.env.HOME }}/.mutt"
state: directory
- name: Set up mutt config
template:
src: muttrc.j2
dest: "{{ ansible_env.HOME }}/.mutt/muttrc"
dest: "{{ ansible_facts.env.HOME }}/.mutt/muttrc"
+1 -1
View File
@@ -16,7 +16,7 @@ macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
macro pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"
# Sender
set from="Lukas Bestle <{{ mail_default_address[ansible_user_id] }}>"
set from="Lukas Bestle <{{ mail_default_address[ansible_facts.user_id] }}>"
# Sorting
set sort=threads
+1 -1
View File
@@ -1,3 +1,3 @@
# Email address is valid for 7 days
|~/.linuxbrew/bin/qdated-check 604800
{{ ansible_user_id }}-lukas
{{ ansible_facts.user_id }}-lukas