aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/playbook.yml2
-rw-r--r--ansible/roles/opensmtpd/handlers/main.yml7
-rw-r--r--ansible/roles/opensmtpd/tasks/main.yml19
-rw-r--r--ansible/roles/opensmtpd/templates/smtpd.conf.j221
-rw-r--r--ansible/roles/postfix/tasks/main.yml7
5 files changed, 8 insertions, 48 deletions
diff --git a/ansible/playbook.yml b/ansible/playbook.yml
index 65254dc..1343f59 100644
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@@ -15,7 +15,7 @@
- wireguard
- fail2ban
- podman
- - opensmtpd
+ - postfix
- unattended-upgrades
- name: Deploy our monitoring stack
diff --git a/ansible/roles/opensmtpd/handlers/main.yml b/ansible/roles/opensmtpd/handlers/main.yml
deleted file mode 100644
index 759b87b..0000000
--- a/ansible/roles/opensmtpd/handlers/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Restart OpenSMTPD
- service:
- name: opensmtpd
- state: restarted
- tags:
- - role::opensmtpd
diff --git a/ansible/roles/opensmtpd/tasks/main.yml b/ansible/roles/opensmtpd/tasks/main.yml
deleted file mode 100644
index ffd9415..0000000
--- a/ansible/roles/opensmtpd/tasks/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Install OpenSMTPD
- package:
- name: opensmtpd
- state: present
- tags:
- - role::opensmtpd
-
-- name: Configure OpenSMTPD
- template:
- src: smtpd.conf.j2
- dest: /etc/smtpd.conf
- owner: root
- group: root
- mode: "0o444"
- tags:
- - role::opensmtpd
- notify:
- - Restart opensmtpd
diff --git a/ansible/roles/opensmtpd/templates/smtpd.conf.j2 b/ansible/roles/opensmtpd/templates/smtpd.conf.j2
deleted file mode 100644
index e1ad428..0000000
--- a/ansible/roles/opensmtpd/templates/smtpd.conf.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-# Ansible managed
-#
-# $OpenBSD: smtpd.conf,v 1.10 2018/05/24 11:40:17 gilles Exp $
-
-# This is the smtpd server system-wide configuration file.
-# See smtpd.conf(5) for more information.
-
-table aliases file:/etc/aliases
-
-# To accept external mail, replace with: listen on all
-#
-listen on localhost
-
-action "local" mbox alias <aliases>
-action "relay" relay
-
-# Uncomment the following to accept external mail for domain "example.org"
-#
-# match from any for domain "example.org" action "local"
-match for local action "local"
-match from local for any action "relay"
diff --git a/ansible/roles/postfix/tasks/main.yml b/ansible/roles/postfix/tasks/main.yml
new file mode 100644
index 0000000..d3d92e1
--- /dev/null
+++ b/ansible/roles/postfix/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+- name: Install postfix
+ package:
+ name: postfix
+ state: present
+ tags:
+ - role::postfix