Merge pull request #486 from carljm/rspamd-fixes

Update rspamd repository to the official one.

roles/mailserver/tasks/rspamd.yml

@@ -1,29 +1,15 @@
 ---
 # Installs and configures the Rspamd spam filtering system.
 
-- name: Ensure repository key for Rspamd is in place for Debian Jessie
-  apt_key: url=http://download.opensuse.org/repositories/home:cebka/Debian_8.0/Release.key state=present
+- name: Ensure repository key for Rspamd is in place
+  apt_key: url=http://rspamd.com/apt-stable/gpg.key state=present
   tags:
     - dependencies
-  when: ansible_distribution_release == 'jessie'
 
-- name: Ensure repository key for Rspamd is in place for Ubuntu Trusty
-  apt_key: url=http://download.opensuse.org/repositories/home:cebka/xUbuntu_14.10/Release.key state=present
+- name: Add Rspamd repository
+  apt_repository: repo="deb http://rspamd.com/apt-stable/ {{ ansible_distribution_release }} main"
   tags:
     - dependencies
-  when: ansible_distribution_release == 'trusty'
-
-- name: Add Rspamd repository for Debian Jesse
-  apt_repository: repo="deb http://download.opensuse.org/repositories/home:/cebka/Debian_8.0/ /"
-  tags:
-    - dependencies
-  when: ansible_distribution_release == 'jessie'
-
-- name: Add Rspamd repository for Ubuntu Trusty
-  apt_repository: repo="deb http://download.opensuse.org/repositories/home:/cebka/xUbuntu_14.10/ /"
-  tags:
-    - dependencies
-  when: ansible_distribution_release == 'jessie'
 
 - name: Install Rspamd and Rmilter
   apt: pkg={{ item }} state=installed update_cache=yes
@@ -32,4 +18,3 @@
     - rmilter
   tags:
     - dependencies
-