Selaa lähdekoodia

Fixes for Ubuntu 14.04 LTS 'trusty'

* Postfix: Trusty comes with postgresql 9.3, not 9.1
* owncloud 6.0.1 is part of the distribution, doesn't require opensuse repository
* owncloud requires libapache2-mod-php5
* uses prosody repository that matches the ansible_distribution_release (trusty, wheezy, etc)
Sven Neuhaus 10 vuotta sitten
vanhempi
commit
0ebda3b32e

+ 15
- 1
roles/mailserver/tasks/postfix.yml Näytä tiedosto

@@ -1,4 +1,4 @@
1
-- name: Install Postfix and related packages
1
+- name: Install Postfix 9.1 and related packages
2 2
   apt: pkg={{ item }} state=installed
3 3
   with_items:
4 4
     - postfix
@@ -9,6 +9,20 @@
9 9
     - postfix-pgsql
10 10
     - python-psycopg2
11 11
     - postfix-pcre
12
+  when: ansible_distribution_release != 'trusty'
13
+
14
+- name: Install Postfix 9.3 and related packages for Ubuntu Trusty
15
+  apt: pkg={{ item }} state=installed
16
+  with_items:
17
+    - postfix
18
+    - libsasl2-modules
19
+    - sasl2-bin
20
+    - postgrey
21
+    - postgresql-9.3
22
+    - postfix-pgsql
23
+    - python-psycopg2
24
+    - postfix-pcre
25
+  when: ansible_distribution_release == 'trusty'
12 26
 
13 27
 - name: Set postgres password
14 28
   command: sudo -u {{ db_admin_username }} psql -d {{ db_admin_username }} -c "ALTER USER postgres with  password '{{ db_admin_password }}';"

+ 11
- 3
roles/owncloud/tasks/owncloud.yml Näytä tiedosto

@@ -10,15 +10,23 @@
10 10
 
11 11
 - name: Ensure repository key for ownCloud is in place
12 12
   apt_key: url=http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_7.0/Release.key state=present
13
+  when: ansible_distribution == 'Debian'
13 14
 
14 15
 - name: Add ownCloud OpenSuSE repository
15 16
   apt_repository: repo='deb http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_7.0/ /'
17
+  when: ansible_distribution == 'Debian'
16 18
 
17
-- name: Install ownCloud from OpenSuSE repository
19
+- name: Install ownCloud (possibly from OpenSuSE repository)
18 20
   apt: pkg=owncloud update_cache=yes
19 21
 
20
-- name: Install PHP-APC
21
-  apt: pkg=php-apc
22
+- name: Install PHP dependencies
23
+  apt: pkg={{ item }} state=present
24
+  with_items:
25
+    - php-apc
26
+    - libapache2-mod-php5
27
+
28
+- name: Owncloud www directory
29
+  file: state=directory path=/var/www/owncloud
22 30
 
23 31
 - name: Store ownCloud data securely
24 32
   command: mv /var/www/owncloud/data /decrypted/owncloud-data creates=/decrypted/owncloud-data

+ 3
- 2
roles/xmpp/tasks/prosody.yml Näytä tiedosto

@@ -1,8 +1,9 @@
1 1
 - name: Ensure repository key for Prosody is in place
2 2
   apt_key: url=https://prosody.im/files/prosody-debian-packages.key state=present
3 3
 
4
-- name: Add Prosody repository
5
-  apt_repository: repo='deb http://packages.prosody.im/debian wheezy main'
4
+# Prosody supplies repo for sid, squeeze, wheezy, jessie, trusty, saucy, raring, quantal, precise and lucid
5
+- name: Add Prosody Debian/Ubuntu repository
6
+  apt_repository: repo="deb http://packages.prosody.im/debian {{ ansible_distribution_release }} main"
6 7
 
7 8
 - name: Install Prosody from official repository
8 9
   apt: pkg=prosody update_cache=yes

Loading…
Peruuta
Tallenna