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

roles/mailserver/tasks/z-push.yml

@@ -1,10 +1,22 @@
-- name: Install required packages for z-push
+- name: Install required packages for z-push (PHP5 variant)
   apt: pkg={{ item }} state=installed
   with_items:
     - php-soap
     - php5
     - php5-cli
     - php5-imap
+  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
+  tags:
+    - dependencies
+
+- name: Install required packages for z-push
+  apt: pkg={{ item }} state=installed
+  with_items:
+    - php-soap
+    - php
+    - php-cli
+    - php-imap
+  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
   tags:
     - dependencies
 

roles/news/tasks/selfoss.yml

@@ -18,12 +18,23 @@
     - data/sqlite
     - public
 
-- name: Install selfoss dependencies
+- name: Install selfoss dependencies (PHP5 variant)
   apt: pkg={{ item }} state=present
   with_items:
     - php5
     - php5-pgsql
     - php5-gd
+  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
+  tags:
+    - dependencies
+
+- name: Install selfoss dependencies
+  apt: pkg={{ item }} state=present
+  with_items:
+    - php
+    - php-pgsql
+    - php-gd
+  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
   tags:
     - dependencies
 

roles/readlater/tasks/wallabag.yml

@@ -12,7 +12,7 @@
   file: name=/var/www/wallabag/install state=absent
   when: wallabag_config.stat.exists == True
 
-- name: Install wallabag dependencies
+- name: Install wallabag dependencies (PHP5 variant)
   apt: pkg={{ item }} state=present
   with_items:
     - php5
@@ -20,6 +20,19 @@
     - php5-mcrypt
     - php5-pgsql
     - php5-tidy
+  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
+  tags:
+    - dependencies
+
+- name: Install wallabag dependencies
+  apt: pkg={{ item }} state=present
+  with_items:
+    - php
+    - php-curl
+    - php-mcrypt
+    - php-pgsql
+    - php-tidy
+  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
   tags:
     - dependencies
 

roles/webmail/tasks/roundcube.yml

@@ -2,7 +2,7 @@
   stat: path=/var/www/roundcube/config.inc.php
   register: roundcube_config
 
-- name: Install roundcube dependencies
+- name: Install roundcube dependencies (PHP5 variant)
   apt: pkg={{ item }} state=present
   with_items:
     - php5
@@ -14,6 +14,25 @@
     - php5-curl
     - aspell
     - aspell-en
+  when: (ansible_distribution_release != "xenial" and ansible_distribution_release != "bionic" and ansible_distribution_release != "stretch")
+  tags:
+    - dependencies
+
+- name: Install roundcube dependencies
+  apt: pkg={{ item }} state=present
+  with_items:
+    - php
+    - php-sqlite3
+    - php-mbstring
+    - php-mcrypt
+    - php-gd
+    - php-pspell
+    - php-intl
+    - php-curl
+    - php-xml
+    - aspell
+    - aspell-en
+  when: (ansible_distribution_release == "xenial" or ansible_distribution_release == "bionic" or ansible_distribution_release == "stretch")
   tags:
     - dependencies