diff --git a/playbooks/orion.yml b/playbooks/orion.yml index 1efbbc7e5999b8eb44e906209877e9990e8cf2cd..6c4d7d1c159a78b069341f112d664ac017440e38 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 f036f049bc057326e226969f7a089d66bcb55ba2..0000000000000000000000000000000000000000 --- 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 18fa5a19b15b03dcc79431a50f74bbb7b608da7e..0000000000000000000000000000000000000000 --- 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 2d15ad7c57dd5eaba2cfcbf1efe6c0ca245214ee..0000000000000000000000000000000000000000 --- 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 7d023b3b8d0c04790aae5cf807b54b1acc223234..0000000000000000000000000000000000000000 --- 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 84e9f91ce55e0bf25a8d78612ddca3405186404a..0000000000000000000000000000000000000000 --- a/roles/postgrey/templates/whitelist_clients.local.j2 +++ /dev/null @@ -1,3 +0,0 @@ -# -# {{ansible_managed}} -#