Переглянути джерело

Merge branch 'newphp' of github.com:neuhaus/sovereign

Thomas Buck 6 роки тому
джерело
коміт
b36ea4b88b

+ 13
- 1
roles/mailserver/tasks/z-push.yml Переглянути файл

@@ -1,10 +1,22 @@
1
-- name: Install required packages for z-push
1
+- name: Install required packages for z-push (PHP5 variant)
2 2
   apt: pkg={{ item }} state=installed
3 3
   with_items:
4 4
     - php-soap
5 5
     - php5
6 6
     - php5-cli
7 7
     - php5-imap
8
+  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
9
+  tags:
10
+    - dependencies
11
+
12
+- name: Install required packages for z-push
13
+  apt: pkg={{ item }} state=installed
14
+  with_items:
15
+    - php-soap
16
+    - php
17
+    - php-cli
18
+    - php-imap
19
+  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
8 20
   tags:
9 21
     - dependencies
10 22
 

+ 12
- 1
roles/news/tasks/selfoss.yml Переглянути файл

@@ -18,12 +18,23 @@
18 18
     - data/sqlite
19 19
     - public
20 20
 
21
-- name: Install selfoss dependencies
21
+- name: Install selfoss dependencies (PHP5 variant)
22 22
   apt: pkg={{ item }} state=present
23 23
   with_items:
24 24
     - php5
25 25
     - php5-pgsql
26 26
     - php5-gd
27
+  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
28
+  tags:
29
+    - dependencies
30
+
31
+- name: Install selfoss dependencies
32
+  apt: pkg={{ item }} state=present
33
+  with_items:
34
+    - php
35
+    - php-pgsql
36
+    - php-gd
37
+  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
27 38
   tags:
28 39
     - dependencies
29 40
 

+ 14
- 1
roles/readlater/tasks/wallabag.yml Переглянути файл

@@ -12,7 +12,7 @@
12 12
   file: name=/var/www/wallabag/install state=absent
13 13
   when: wallabag_config.stat.exists == True
14 14
 
15
-- name: Install wallabag dependencies
15
+- name: Install wallabag dependencies (PHP5 variant)
16 16
   apt: pkg={{ item }} state=present
17 17
   with_items:
18 18
     - php5
@@ -20,6 +20,19 @@
20 20
     - php5-mcrypt
21 21
     - php5-pgsql
22 22
     - php5-tidy
23
+  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
24
+  tags:
25
+    - dependencies
26
+
27
+- name: Install wallabag dependencies
28
+  apt: pkg={{ item }} state=present
29
+  with_items:
30
+    - php
31
+    - php-curl
32
+    - php-mcrypt
33
+    - php-pgsql
34
+    - php-tidy
35
+  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
23 36
   tags:
24 37
     - dependencies
25 38
 

+ 20
- 1
roles/webmail/tasks/roundcube.yml Переглянути файл

@@ -2,7 +2,7 @@
2 2
   stat: path=/var/www/roundcube/config.inc.php
3 3
   register: roundcube_config
4 4
 
5
-- name: Install roundcube dependencies
5
+- name: Install roundcube dependencies (PHP5 variant)
6 6
   apt: pkg={{ item }} state=present
7 7
   with_items:
8 8
     - php5
@@ -14,6 +14,25 @@
14 14
     - php5-curl
15 15
     - aspell
16 16
     - aspell-en
17
+  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
18
+  tags:
19
+    - dependencies
20
+
21
+- name: Install roundcube dependencies
22
+  apt: pkg={{ item }} state=present
23
+  with_items:
24
+    - php
25
+    - php-sqlite3
26
+    - php-mbstring
27
+    - php-mcrypt
28
+    - php-gd
29
+    - php-pspell
30
+    - php-intl
31
+    - php-curl
32
+    - php-xml
33
+    - aspell
34
+    - aspell-en
35
+  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
17 36
   tags:
18 37
     - dependencies
19 38
 

Завантаження…
Відмінити
Зберегти