From fd6eb557d5d152d0df8fb9138c7e0209355d8992 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 26 Oct 2019 15:39:20 +0300
Subject: Drop: postgrey from mail-server

---
 ansible/roles/mail-server/handlers/main.yml        |  5 -----
 ansible/roles/mail-server/tasks/postfix.yml        | 22 ----------------------
 ansible/roles/mail-server/tasks/usertools.yml      |  1 +
 .../roles/mail-server/templates/postfix.main.cf.j2 |  6 ------
 4 files changed, 1 insertion(+), 33 deletions(-)

(limited to 'ansible/roles/mail-server')

diff --git a/ansible/roles/mail-server/handlers/main.yml b/ansible/roles/mail-server/handlers/main.yml
index 6cfdfaa..c23f773 100644
--- a/ansible/roles/mail-server/handlers/main.yml
+++ b/ansible/roles/mail-server/handlers/main.yml
@@ -3,11 +3,6 @@
     name: postfix
     state: restarted
 
-- name: restart postgrey
-  systemd:
-    name: postgrey
-    state: restarted
-
 - name: restart dovecot
   systemd:
     name: dovecot
diff --git a/ansible/roles/mail-server/tasks/postfix.yml b/ansible/roles/mail-server/tasks/postfix.yml
index 78ea7ee..293f118 100644
--- a/ansible/roles/mail-server/tasks/postfix.yml
+++ b/ansible/roles/mail-server/tasks/postfix.yml
@@ -2,10 +2,6 @@
   apt:
     name: postfix
 
-- name: install postgrey
-  apt:
-    name: postgrey
-
 - name: install moreutils (for sponge)
   apt:
     name: moreutils
@@ -47,24 +43,6 @@
     fi
   notify: restart postfix
 
-- name: install whitelisted recipients for postgrey
-  copy:
-    src: whitelist_recipients.local
-    dest: /etc/postgrey/whitelist_recipients.local
-    owner: root
-    group: root
-    mode: 0644
-  notify: restart postgrey
-
-- name: install whitelisted sender domains for postgrey
-  copy:
-    src: whitelist_clients.local
-    dest: /etc/postgrey/whitelist_clients.local
-    owner: root
-    group: root
-    mode: 0644
-  notify: restart postgrey
-
 - name: install smarthost creds
   copy:
     content: "{{ smarthost }} {{ smarthost_user }}:{{ lookup('pipe', 'pass show ' + smarthost_pass_name) }}\n"
diff --git a/ansible/roles/mail-server/tasks/usertools.yml b/ansible/roles/mail-server/tasks/usertools.yml
index a9af64c..8f49f04 100644
--- a/ansible/roles/mail-server/tasks/usertools.yml
+++ b/ansible/roles/mail-server/tasks/usertools.yml
@@ -1,6 +1,7 @@
 - name: install mail handling tools for users
   apt:
     name:
+    - mailutils
     - procmail
     - bogofilter
     - spamassassin
diff --git a/ansible/roles/mail-server/templates/postfix.main.cf.j2 b/ansible/roles/mail-server/templates/postfix.main.cf.j2
index 8e08ed9..2717dd4 100644
--- a/ansible/roles/mail-server/templates/postfix.main.cf.j2
+++ b/ansible/roles/mail-server/templates/postfix.main.cf.j2
@@ -42,9 +42,3 @@ smtpd_relay_restrictions =
     permit_mynetworks
     permit_sasl_authenticated
     reject_unauth_destination
-
-# Enable postgrey.
-#smtpd_recipient_restrictions = permit_sasl_authenticated,
-#           permit_mynetworks,
-#           reject_unauth_destination,
-#           check_policy_service inet:127.0.0.1:10023
\ No newline at end of file
-- 
cgit v1.2.1