Adding roundcube logo config

diff --git a/manifests/web.pp b/manifests/web.pp
index 64dd96467bf7c3cbd9646c66fe0dabb242b220a2..5f67b49dc41231579350a1fdc01d98db5e8af13e 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -4,6 +4,10 @@ class mail::web::virtual inherits websites::setup {
     case $roundcube_des_key {
       '': { fail("You need to define \$roundcube_des_key host config") }
     }
+
+    case $roundcube_logo {
+      '': { $roundcube_logo = 'null' }
+    }
   }
 
   include php::imap

diff --git a/templates/roundcube/main.inc.php.erb b/templates/roundcube/main.inc.php.erb
index bc163e519f57f3df0f3d0d3fac83ab0912369a72..aa449d95126a71dd2e31b2ab29ac0bfceb43e65c 100644 (file)
--- a/templates/roundcube/main.inc.php.erb
+++ b/templates/roundcube/main.inc.php.erb
@@ -210,7 +210,7 @@ $rcmail_config['auto_create_user'] = true;
 
 // replace Roundcube logo with this image
 // specify an URL relative to the document root of this Roundcube installation
-$rcmail_config['skin_logo'] = null;
+$rcmail_config['skin_logo'] = <%= roundcube_logo %>;
 
 // Includes should be interpreted as PHP files
 $rcmail_config['skin_include_php'] = false;