From 2c6875911b26fefd9bd11bd71eecda69e0cf32aa Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 25 Jun 2014 06:17:45 +0200
Subject: Install Rouncube from backports.

Recent versions have a whole bunch of bugfixes and nice new features:

    http://trac.roundcube.net/wiki/Changelog
---
 .../skins/default/images/logo_webmail.png          | Bin 6567 -> 0 bytes
 .../files/var/lib/roundcube/skins/logo_webmail.png | Bin 0 -> 6567 bytes
 roles/webmail/tasks/roundcube.yml                  |  40 +++++++++++++--------
 3 files changed, 25 insertions(+), 15 deletions(-)
 delete mode 100644 roles/webmail/files/var/lib/roundcube/skins/default/images/logo_webmail.png
 create mode 100644 roles/webmail/files/var/lib/roundcube/skins/logo_webmail.png

diff --git a/roles/webmail/files/var/lib/roundcube/skins/default/images/logo_webmail.png b/roles/webmail/files/var/lib/roundcube/skins/default/images/logo_webmail.png
deleted file mode 100644
index 7af586a..0000000
Binary files a/roles/webmail/files/var/lib/roundcube/skins/default/images/logo_webmail.png and /dev/null differ
diff --git a/roles/webmail/files/var/lib/roundcube/skins/logo_webmail.png b/roles/webmail/files/var/lib/roundcube/skins/logo_webmail.png
new file mode 100644
index 0000000..7af586a
Binary files /dev/null and b/roles/webmail/files/var/lib/roundcube/skins/logo_webmail.png differ
diff --git a/roles/webmail/tasks/roundcube.yml b/roles/webmail/tasks/roundcube.yml
index 477943f..4699bdc 100644
--- a/roles/webmail/tasks/roundcube.yml
+++ b/roles/webmail/tasks/roundcube.yml
@@ -1,15 +1,21 @@
-- name: Install Roundcube
+- name: Install PHP
   apt: pkg={{ item }}
+  with_items:
+    - php5-fpm
+    - php5-ldap
+    - php5-gd
+    - php5-pspell
+
+- name: Install Roundcube
+  apt: pkg={{ item }} default_release={{ ansible_lsb.codename }}-backports
   with_items:
     - roundcube-core
     - roundcube-mysql
     - roundcube-plugins
-    - php5-fpm
-    - php5-ldap
 
 - name: Copy fripost's logo
-  copy: src=var/lib/roundcube/skins/default/images/logo_webmail.png
-        dest=/var/lib/roundcube/skins/default/images/logo_webmail.png
+  copy: src=var/lib/roundcube/skins/logo_webmail.png
+        dest=/var/lib/roundcube/skins/logo_webmail.png
         owner=root group=root
         mode=0644
 
@@ -26,33 +32,37 @@
     - { var: default_host,           value: "'localhost'" }
     - { var: imap_auth_type,         value: "'plain'"     }
     - { var: imap_cache,             value: "null"        }
-    - { var: message_cache,          value: "null"        }
+    - { var: messages_cache,         value: "FALSE"       }
     # SMTP
     - { var: smtp_server,            value: "'localhost'" }
     - { var: smtp_port,              value: "2580"        }
     # System
-    - { var: force_https,            value: "TRUE"                                    }
-    - { var: login_autocomplete,     value: "2"                                       }
-    - { var: skin_logo,              value: "'skins/default/images/logo_webmail.png'" }
-    - { var: username_domain,        value: "'fripost.org'"                           }
-    - { var: product_name,           value: "'Fripost'"                               }
+    - { var: force_https,            value: "TRUE"                     }
+    - { var: login_autocomplete,     value: "2"                        }
+    - { var: skin_logo,              value: "'skins/logo_webmail.png'" }
+    - { var: username_domain,        value: "'fripost.org'"            }
+    - { var: product_name,           value: "'Fripost'"                }
     # Plugins
     - { var: plugins,                value: "array('additional_message_headers','managesieve','password')" }
     # User Interface
-    - { var: language,               value: "'sv_SE'" }
-    - { var: create_default_folders, value: "TRUE"    }
+    - { var: skin,                   value: "'classic'" }
+    - { var: language,               value: "'sv_SE'"   }
+    - { var: create_default_folders, value: "TRUE"      }
     # User Preferences
     - { var: htmleditor,             value: "TRUE"  }
     - { var: skip_deleted,           value: "TRUE"  }
     - { var: check_all_folders,      value: "FALSE" }
 
 - name: Make the logo a hyperlink to the website
-  lineinfile: dest=/usr/share/roundcube/skins/default/templates/login.html
-              regexp='^(<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" style="margin:0 11px" />)$'
+  lineinfile: dest=/usr/share/roundcube/skins/{{ item }}/templates/login.html
+              regexp='^(<roundcube:object name="logo" src="/images/roundcube_logo.png"[^>]* />)$'
               line='<a href="https://fripost.org">\1</a>'
               backrefs=yes
               owner=root group=root
               mode=0644
+  with_items:
+    - classic
+    - larry
 
 - name: Configure Roundcube plugins
   template: src=usr/share/roundcube/plugins/{{ item }}/config.inc.php.j2
-- 
cgit v1.2.3