diff --git a/README.md b/README.md index 7c84add..b93e58c 100644 --- a/README.md +++ b/README.md @@ -76,9 +76,6 @@ Defaults: spamassassin_razor_config_dir: /etc/spamassassin/.razor - # Enable monit monitoring - spamassassin_monit_enabled: False - # Enable spam training by users and domain # spamassassin_spamtraining_users: # - domain: myfirstdomain.org diff --git a/defaults/main.yml b/defaults/main.yml index 9f0468f..5694013 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -125,9 +125,6 @@ spamassassin_razor_enabled: True spamassassin_razor_config_dir: /etc/spamassassin/.razor -# Enable monit monitoring -spamassassin_monit_enabled: False - # Enable spam training by users and domain # spamassassin_spamtraining_users: # - domain: myfirstdomain.org diff --git a/handlers/main.yml b/handlers/main.yml index ceed2d7..63e9ecc 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -18,8 +18,3 @@ service: name: spamd state: reloaded - -- name: Restart monit - service: - name: monit - state: restarted diff --git a/tasks/main.yml b/tasks/main.yml index 2801501..d4e9329 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -106,7 +106,3 @@ - name: Import razor tasks import_tasks: razor.yml when: spamassassin_razor_enabled - -- name: Import monit tasks - import_tasks: monit.yml - when: spamassassin_monit_enabled diff --git a/tasks/monit.yml b/tasks/monit.yml deleted file mode 100644 index d994c0e..0000000 --- a/tasks/monit.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: Ensure monit configs are present - template: - src: "monit/conf.d/{{ item }}" - dest: "/etc/monit/conf.d/{{ item }}" - owner: root - group: root - mode: 0600 - with_items: - - spamassassin - notify: Restart monit