Bladeren bron

Use same Prosody installation procedure across distros

Alex Payne 9 jaren geleden
bovenliggende
commit
d7da63aced
1 gewijzigde bestanden met toevoegingen van 6 en 16 verwijderingen
  1. 6
    16
      roles/xmpp/tasks/prosody.yml

+ 6
- 16
roles/xmpp/tasks/prosody.yml Bestand weergeven

@@ -3,26 +3,16 @@
3 3
   tags:
4 4
     - dependencies
5 5
 
6
-# Prosody supplies repo for: sid, squeeze, wheezy, jessie, trusty, saucy, raring, quantal, precise and lucid
7
-- name: Add Prosody Debian/Ubuntu repository
6
+- name: Add Prosody repository
8 7
   apt_repository: repo="deb http://packages.prosody.im/debian {{ ansible_distribution_release }} main"
9 8
   tags:
10 9
     - dependencies
11 10
 
12
-- name: Install Prosody from official repository
13
-  apt: pkg=prosody update_cache=yes
14
-  tags:
15
-    - dependencies
16
-
17
-- name: Install lua-sec-prosody on Debian Wheezy and Ubuntu Precise
18
-  apt: pkg=lua-sec-prosody update_cache=yes
19
-  when: ansible_distribution_release == 'wheezy' or ansible_distribution_release == 'precise'
20
-  tags:
21
-    - dependencies
22
-
23
-- name: Install lua-sec 0.5+
24
-  apt: pkg=lua-sec update_cache=yes
25
-  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
11
+- name: Install Prosody and dependencies from official repository
12
+  apt: pkg={{ item }} update_cache=yes
13
+  with_items:
14
+    - prosody
15
+    - lua-sec
26 16
   tags:
27 17
     - dependencies
28 18
 

Laden…
Annuleren
Opslaan