From 31ef7a78bc78a6ce2a24bcc6a4a11574bb2d5483 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 3 Dec 2018 03:31:01 +0100
Subject: Upgrade webmail baseline to Debian Stretch.

---
 roles/webmail/tasks/ldap.yml      |  2 +-
 roles/webmail/tasks/roundcube.yml | 31 ++++++++++++-------------------
 2 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'roles/webmail/tasks')

diff --git a/roles/webmail/tasks/ldap.yml b/roles/webmail/tasks/ldap.yml
index 6df3324..b24860c 100644
--- a/roles/webmail/tasks/ldap.yml
+++ b/roles/webmail/tasks/ldap.yml
@@ -4,7 +4,7 @@
         owner=root group=root
         mode=0755
 
-- name: Copy the ldap's X.509 certificate
+- name: Copy the slapd X.509 certificate
   copy: src=certs/ldap/ldap.fripost.org.pem
         dest=/etc/stunnel/certs/ldap.pem
         owner=root group=root
diff --git a/roles/webmail/tasks/roundcube.yml b/roles/webmail/tasks/roundcube.yml
index 699815a..b7678a3 100644
--- a/roles/webmail/tasks/roundcube.yml
+++ b/roles/webmail/tasks/roundcube.yml
@@ -2,23 +2,15 @@
   apt: pkg={{ packages }}
   vars:
     packages:
-    - php5-fpm
-    - php5-ldap
-    - php5-gd
-    - php5-apcu
+    - php-fpm
+    - php-ldap
+    - php-gd
+    - php
     # spell-checking
-    - php5-enchant
+    - php-enchant
 
-- name: Configure PHP5 APCu
-  copy: src=etc/php5/mods-available/apcu.ini
-        dest=/etc/php5/mods-available/apcu.ini
-        owner=root group=root
-        mode=0644
-  notify:
-    - Restart php5
-
-- name: Configure PHP5 Zend opcache
-  lineinfile: dest=/etc/php5/fpm/php.ini
+- name: Configure PHP 7.0 Zend opcache
+  lineinfile: dest=/etc/php/7.0/fpm/php.ini
               regexp='^;?{{ item.var }}\\s*='
               line="{{ item.var }} = {{ item.value }}"
               owner=root group=root
@@ -32,7 +24,7 @@
     - { var: opcache.revalidate_freq,         value: 60   }
     - { var: opcache.fast_shutdown,           value: 1    }
   notify:
-    - Restart php5
+    - Restart php7.0-fpm
 
 - name: Install GNU Aspell and some dictionaries
   apt: pkg={{ packages }}
@@ -48,7 +40,7 @@
     - aspell-sv
 
 - name: Install Roundcube
-  apt: pkg={{ packages }} default_release={{ ansible_lsb.codename }}-backports
+  apt: pkg={{ packages }}
   vars:
     packages:
     - roundcube-core
@@ -97,6 +89,7 @@
     - { var: skin_logo,              value: "'/images/fripost_logo.png'" }
     - { var: username_domain,        value: "'fripost.org'"              }
     - { var: product_name,           value: "'Fripost Webmail'"          }
+    - { var: password_charset,       value: "'UTF-8'"                    }
     # Plugins
     - { var: plugins,                value: "array('archive','additional_message_headers','managesieve','password')" }
     # Spell Checking
@@ -142,8 +135,8 @@
   with_items:
     - managesieve
 
-- name: Start php5-fpm
-  service: name=php5-fpm state=started
+- name: Start php7.0-fpm
+  service: name=php7.0-fpm state=started
 
 - name: Copy /etc/nginx/sites-available/roundcube
   copy: src=etc/nginx/sites-available/roundcube
-- 
cgit v1.2.3