Introducing $roundcube_des_key

diff --git a/manifests/web.pp b/manifests/web.pp
index d0ddf2937c0a3fa47772f777f47e47cb35a71d92..4f9e2a10c206fd47672bc4fbf06b8ede10dd8fee 100644 (file)
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -1,4 +1,9 @@
 class mail::web::virtual inherits websites::setup {
+  # Class configuration
+  case $roundcube_des_key {
+    '': { fail("You need to define \$roundcube_des_key host config") }
+  }
+
   include php::imap
 
   apache::site { "postfixadmin":
@@ -33,7 +38,7 @@ class mail::web::virtual inherits websites::setup {
     owner   => root,
     group   => www-data,
     mode    => 0640,
-    source => "puppet:///modules/mail/roundcube/main.inc.php",
+    content => template('mail/roundcube/main.inc.php.erb'),
     require => Package['roundcube'],
   }
 }

diff --git a/files/roundcube/main.inc.php b/templates/roundcube/main.inc.php.erb
similarity index 99%
rename from files/roundcube/main.inc.php
rename to templates/roundcube/main.inc.php.erb
index a34b85dcc5a922ab3e14fd171265ad777a1909f9..930856941f40135597f9a9162c5f6548245e90c1 100644 (file)
--- a/files/roundcube/main.inc.php
+++ b/templates/roundcube/main.inc.php.erb
@@ -161,7 +161,7 @@ $rcmail_config['double_auth'] = false;
 // this key is used to encrypt the users imap password which is stored
 // in the session record (and the client cookie if remember password is enabled).
 // please provide a string of exactly 24 chars.
-$rcmail_config['des_key'] = 'TitQ4HwK88JruEnjSse43ewU';
+$rcmail_config['des_key'] = '<%= roundcube_des_key %>';
 
 // the default locale setting (leave empty for auto-detection)
 // RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR