summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-06-26 01:09:28 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-06-26 01:09:28 -0300
commita65a619e903cd5d1c9d23e74532c6b9d975f2c96 (patch)
tree2014a90b78400712d29a14423b894983813916f3
parent1bfa2d157f1bc896347c0ff30eebcb17a189f9d5 (diff)
downloadpuppet-mail-a65a619e903cd5d1c9d23e74532c6b9d975f2c96.tar.gz
puppet-mail-a65a619e903cd5d1c9d23e74532c6b9d975f2c96.tar.bz2
Adding roundcube logo config
-rw-r--r--manifests/web.pp4
-rw-r--r--templates/roundcube/main.inc.php.erb2
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/web.pp b/manifests/web.pp
index 64dd964..5f67b49 100644
--- 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 bc163e5..aa449d9 100644
--- 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;