Browse Source

Ubuntu Trusty gets postgresql-9.3.

Resolves #363.
Alex Payne 10 years ago
parent
commit
1a96a87374

+ 2
- 2
roles/mailserver/tasks/dovecot.yml View File

1
-- name: Install Dovecot and related packages
1
+- name: Install Dovecot and related packages for distributions other than Ubuntu Trusty
2
   apt: pkg={{ item }} state=installed
2
   apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - dovecot-core
4
     - dovecot-core
19
     - dovecot-managesieved
19
     - dovecot-managesieved
20
     - dovecot-pgsql
20
     - dovecot-pgsql
21
     - dovecot-pop3d
21
     - dovecot-pop3d
22
-    - postgresql-9.1
22
+    - postgresql-9.3
23
   when: ansible_distribution_release == 'trusty'
23
   when: ansible_distribution_release == 'trusty'
24
 
24
 
25
 - name: Create vmail group
25
 - name: Create vmail group

+ 3
- 3
roles/mailserver/tasks/postfix.yml View File

1
-- name: Install Postfix 9.1 and related packages
1
+- name: Install Postfix 9.1 and related packages for distributions other than Ubuntu Trusty
2
   apt: pkg={{ item }} state=installed
2
   apt: pkg={{ item }} state=installed
3
   with_items:
3
   with_items:
4
     - libsasl2-modules
4
     - libsasl2-modules
11
     - sasl2-bin
11
     - sasl2-bin
12
   when: ansible_distribution_release != 'trusty'
12
   when: ansible_distribution_release != 'trusty'
13
 
13
 
14
-- name: Install Postfix 9.1 and related packages for Ubuntu Trusty
14
+- name: Install Postfix 9.3 and related packages for Ubuntu Trusty
15
   apt: pkg={{ item }} state=installed
15
   apt: pkg={{ item }} state=installed
16
   with_items:
16
   with_items:
17
     - libsasl2-modules
17
     - libsasl2-modules
18
     - postfix
18
     - postfix
19
     - postfix-pcre
19
     - postfix-pcre
20
     - postfix-pgsql
20
     - postfix-pgsql
21
-    - postgresql-9.1
21
+    - postgresql-9.3
22
     - postgrey
22
     - postgrey
23
     - python-psycopg2
23
     - python-psycopg2
24
     - sasl2-bin
24
     - sasl2-bin

+ 10
- 2
roles/owncloud/tasks/owncloud.yml View File

1
 ---
1
 ---
2
 # Installs the ownCloud personal cloud software
2
 # Installs the ownCloud personal cloud software
3
 # as per http://www.debiantutorials.com/how-to-install-owncloud-on-wheezy/
3
 # as per http://www.debiantutorials.com/how-to-install-owncloud-on-wheezy/
4
-- name: Install dependencies
4
+
5
+- name: Install Postgres 9.1 on distributions other than Ubuntu Trusty
6
+  apt: pkg=postgresql-9.1 state=present
7
+  when: ansible_distribution_release != 'trusty'
8
+
9
+- name: Install Postgres 9.3 on Ubuntu Trusty
10
+  apt: pkg=postgresql-9.3 state=present
11
+  when: ansible_distribution_release == 'trusty'
12
+
13
+- name: Install ownCloud dependencies
5
   apt: pkg={{ item }} state=present
14
   apt: pkg={{ item }} state=present
6
   with_items:
15
   with_items:
7
     - libapache2-mod-php5
16
     - libapache2-mod-php5
8
     - php-apc
17
     - php-apc
9
     - python-psycopg2
18
     - python-psycopg2
10
-    - postgresql-9.1
11
 
19
 
12
 - name: Set postgres password
20
 - name: Set postgres password
13
   command: sudo -u {{ db_admin_username }} psql -d {{ db_admin_username }} -c "ALTER USER postgres with  password '{{ db_admin_password }}';"
21
   command: sudo -u {{ db_admin_username }} psql -d {{ db_admin_username }} -c "ALTER USER postgres with  password '{{ db_admin_password }}';"

Loading…
Cancel
Save