summaryrefslogtreecommitdiff
path: root/ansible/roles/mail-server
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/roles/mail-server')
-rw-r--r--ansible/roles/mail-server/files/aliases2
-rw-r--r--ansible/roles/mail-server/files/virtual7
-rw-r--r--ansible/roles/mail-server/tasks/main.yml11
3 files changed, 16 insertions, 4 deletions
diff --git a/ansible/roles/mail-server/files/aliases b/ansible/roles/mail-server/files/aliases
index 0aa8635..e5197fa 100644
--- a/ansible/roles/mail-server/files/aliases
+++ b/ansible/roles/mail-server/files/aliases
@@ -7,3 +7,5 @@ soilar: liw, soile
hbo: liw, soile
ick-conduct: liw
atuin: liw, dkscully@geah.org, rjek@rjek.com, dsilvers@digital-scurf.org, greg@grossmeier.net
+remy: liw
+sateenvarjo: soilar
diff --git a/ansible/roles/mail-server/files/virtual b/ansible/roles/mail-server/files/virtual
index d822be3..54b5ff0 100644
--- a/ansible/roles/mail-server/files/virtual
+++ b/ansible/roles/mail-server/files/virtual
@@ -6,7 +6,12 @@ liw@liw.fi liw
liw-passthrough@liw.fi liw
ivana@liw.fi liw
tele@liw.fi liw
-rust.fossdev@liw.fi liw
+
+exolobe1.liw.fi -
+@exolobe1.liw.fi liw
+
+tursas.liw.fi -
+@exolobe1.liw.fi liw
docstory.fi -
postmaster@docstory.fi soile
diff --git a/ansible/roles/mail-server/tasks/main.yml b/ansible/roles/mail-server/tasks/main.yml
index 9b38dc5..f0c1fd1 100644
--- a/ansible/roles/mail-server/tasks/main.yml
+++ b/ansible/roles/mail-server/tasks/main.yml
@@ -1,3 +1,8 @@
-- include: postfix.yml
-- include: dovecot.yml
-- include: usertools.yml
+- ansible.builtin.import_tasks:
+ file: postfix.yml
+
+- ansible.builtin.import_tasks:
+ file: dovecot.yml
+
+- ansible.builtin.import_tasks:
+ file: usertools.yml