Selaa lähdekoodia

use wheezy-backports for dspam and solr packages on wheezy

relates to pull request #372
Sven Neuhaus 10 vuotta sitten
vanhempi
commit
8b5ed21e38
2 muutettua tiedostoa jossa 20 lisäystä ja 2 poistoa
  1. 11
    1
      roles/mailserver/tasks/dspam.yml
  2. 9
    1
      roles/mailserver/tasks/solr.yml

+ 11
- 1
roles/mailserver/tasks/dspam.yml Näytä tiedosto

1
-- name: Install dspam and related packages
1
+- name: Install dspam and related packages on wheezy
2
+  apt: pkg={{ item }} state=installed default_release=wheezy-backports
3
+  with_items:
4
+    - dovecot-antispam
5
+    - dovecot-sieve
6
+    - dspam
7
+    - postfix-pcre
8
+  when: ansible_distribution_release == 'wheezy'
9
+
10
+- name: Install dspam and related packages on distributions other than wheezy
2
   apt: pkg={{ item }} state=installed
11
   apt: pkg={{ item }} state=installed
3
   with_items:
12
   with_items:
4
     - dovecot-antispam
13
     - dovecot-antispam
5
     - dovecot-sieve
14
     - dovecot-sieve
6
     - dspam
15
     - dspam
7
     - postfix-pcre
16
     - postfix-pcre
17
+  when: ansible_distribution_release != 'wheezy'
8
 
18
 
9
 - name: Create dspam directory
19
 - name: Create dspam directory
10
   file: state=directory path=/decrypted/dspam group=dspam owner=dspam
20
   file: state=directory path=/decrypted/dspam group=dspam owner=dspam

+ 9
- 1
roles/mailserver/tasks/solr.yml Näytä tiedosto

1
-- name: Install Solr and related packages
1
+- name: Install Solr and related packages on wheezy from backports
2
+  apt: pkg={{ item }} state=installed default_release=wheezy-backports
3
+  with_items:
4
+    - dovecot-solr
5
+    - solr-tomcat
6
+  when: ansible_distribution_release == 'wheezy'
7
+
8
+- name: Install Solr and related packages on distributions other than wheezy
2
   apt: pkg={{ item }} state=installed
9
   apt: pkg={{ item }} state=installed
3
   with_items:
10
   with_items:
4
     - dovecot-solr
11
     - dovecot-solr
5
     - solr-tomcat
12
     - solr-tomcat
13
+  when: ansible_distribution_release != 'wheezy'
6
 
14
 
7
 - name: Work around Debian bug and copy Solr schema file into place
15
 - name: Work around Debian bug and copy Solr schema file into place
8
   copy: src=solr-schema.xml dest=/etc/solr/conf/schema.xml group=root owner=root
16
   copy: src=solr-schema.xml dest=/etc/solr/conf/schema.xml group=root owner=root

Loading…
Peruuta
Tallenna