Browse Source

Merge pull request #486 from carljm/rspamd-fixes

Update rspamd repository to the official one.
Allen Riddell 8 years ago
parent
commit
9e116d5428
1 changed files with 4 additions and 19 deletions
  1. 4
    19
      roles/mailserver/tasks/rspamd.yml

+ 4
- 19
roles/mailserver/tasks/rspamd.yml View File

@@ -1,29 +1,15 @@
1 1
 ---
2 2
 # Installs and configures the Rspamd spam filtering system.
3 3
 
4
-- name: Ensure repository key for Rspamd is in place for Debian Jessie
5
-  apt_key: url=http://download.opensuse.org/repositories/home:cebka/Debian_8.0/Release.key state=present
4
+- name: Ensure repository key for Rspamd is in place
5
+  apt_key: url=http://rspamd.com/apt-stable/gpg.key state=present
6 6
   tags:
7 7
     - dependencies
8
-  when: ansible_distribution_release == 'jessie'
9 8
 
10
-- name: Ensure repository key for Rspamd is in place for Ubuntu Trusty
11
-  apt_key: url=http://download.opensuse.org/repositories/home:cebka/xUbuntu_14.10/Release.key state=present
9
+- name: Add Rspamd repository
10
+  apt_repository: repo="deb http://rspamd.com/apt-stable/ {{ ansible_distribution_release }} main"
12 11
   tags:
13 12
     - dependencies
14
-  when: ansible_distribution_release == 'trusty'
15
-
16
-- name: Add Rspamd repository for Debian Jesse
17
-  apt_repository: repo="deb http://download.opensuse.org/repositories/home:/cebka/Debian_8.0/ /"
18
-  tags:
19
-    - dependencies
20
-  when: ansible_distribution_release == 'jessie'
21
-
22
-- name: Add Rspamd repository for Ubuntu Trusty
23
-  apt_repository: repo="deb http://download.opensuse.org/repositories/home:/cebka/xUbuntu_14.10/ /"
24
-  tags:
25
-    - dependencies
26
-  when: ansible_distribution_release == 'jessie'
27 13
 
28 14
 - name: Install Rspamd and Rmilter
29 15
   apt: pkg={{ item }} state=installed update_cache=yes
@@ -32,4 +18,3 @@
32 18
     - rmilter
33 19
   tags:
34 20
     - dependencies
35
-

Loading…
Cancel
Save