From 48a99ad5702382429686f5f9f147734fb11fed1d Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Sun, 2 Aug 2020 14:47:28 +0200
Subject: [PATCH] Remove postgrey role

It isn't used and Postfix was never configured to use it.
---
 playbooks/orion.yml                           |  1 -
 roles/postgrey/defaults/main.yml              |  9 ------
 roles/postgrey/handlers/main.yml              |  7 ----
 roles/postgrey/tasks/main.yml                 | 32 -------------------
 roles/postgrey/templates/service-override.j2  | 14 --------
 .../templates/whitelist_clients.local.j2      |  3 --
 6 files changed, 66 deletions(-)
 delete mode 100644 roles/postgrey/defaults/main.yml
 delete mode 100644 roles/postgrey/handlers/main.yml
 delete mode 100644 roles/postgrey/tasks/main.yml
 delete mode 100644 roles/postgrey/templates/service-override.j2
 delete mode 100644 roles/postgrey/templates/whitelist_clients.local.j2

diff --git a/playbooks/orion.yml b/playbooks/orion.yml
index 1efbbc7e..6c4d7d1c 100644
--- a/playbooks/orion.yml
+++ b/playbooks/orion.yml
@@ -12,7 +12,6 @@
     - { role: opendkim, dkim_selector: orion, tags: ['mail'] }
     - { role: dovecot }
     - { role: spampd, tags: ["mail"] }
-    - { role: postgrey, tags: ["mail"] }
     - { role: unbound, tags: ["mail"] }
     - { role: postfwd, tags: ['mail'] }
     - { role: postfix, postfix_server: true, postfix_smtpd_public: true, tags: ['mail'] }
diff --git a/roles/postgrey/defaults/main.yml b/roles/postgrey/defaults/main.yml
deleted file mode 100644
index f036f049..00000000
--- a/roles/postgrey/defaults/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# greylist for N seconds
-postgrey_delay: 120
-
-#delete entries older than N days since the last time that they have been seen
-postgrey_max_age: 35
-
-# allow only N days for the first retrial
-# append 'h' if you want to specify it in hours
-postgrey_retry_window: 24h
diff --git a/roles/postgrey/handlers/main.yml b/roles/postgrey/handlers/main.yml
deleted file mode 100644
index 18fa5a19..00000000
--- a/roles/postgrey/handlers/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: restart postgrey
-  systemd:
-    unit: postgrey.service
-    enabled: yes
-    state: restarted
-    daemon_reload: yes
-
diff --git a/roles/postgrey/tasks/main.yml b/roles/postgrey/tasks/main.yml
deleted file mode 100644
index 2d15ad7c..00000000
--- a/roles/postgrey/tasks/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- name: install packages
-  package:
-    name: "postgrey"
-    state: "present"
-
-- name: install local whitelist template
-  template:
-    src: "whitelist_clients.local.j2"
-    dest: "/etc/postfix/postgrey_whitelist_clients.local"
-    owner: "root"
-    group: "root"
-    mode: 0644
-  notify:
-    - restart postgrey
-
-- name: create service unit override path
-  file:
-    path: "/etc/systemd/system/postgrey.service.d/"
-    state: "directory"
-    owner: "root"
-    group: "root"
-    mode: 0755
-
-- name: install service unit override file
-  template:
-    src: "service-override.j2"
-    dest: "/etc/systemd/system/postgrey.service.d/override.conf"
-    owner: "root"
-    group: "root"
-    mode: 0644
-  notify:
-    - restart postgrey
diff --git a/roles/postgrey/templates/service-override.j2 b/roles/postgrey/templates/service-override.j2
deleted file mode 100644
index 7d023b3b..00000000
--- a/roles/postgrey/templates/service-override.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# {{ansible_managed}}
-#
-
-[Service]
-ExecStart=
-ExecStart=/usr/bin/postgrey --inet=127.0.0.1:10030 \
-          --pidfile=/run/postgrey/postgrey.pid \
-          --group=postgrey --user=postgrey \
-          --daemonize \
-          --delay={{postgrey_delay}} \
-          --max-age={{postgrey_max_age}} \
-          --retry-window={{postgrey_retry_window}} \
-          --greylist-text="Greylisted for %%s seconds"
diff --git a/roles/postgrey/templates/whitelist_clients.local.j2 b/roles/postgrey/templates/whitelist_clients.local.j2
deleted file mode 100644
index 84e9f91c..00000000
--- a/roles/postgrey/templates/whitelist_clients.local.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# {{ansible_managed}}
-#
-- 
GitLab