diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-07-18 10:00:43 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-07-18 10:00:43 -0300 |
| commit | 4489fa3d452d6c1b9633454c76a739935f618535 (patch) | |
| tree | da4fb7bc9fa0213b1307c6bf06aa95a239c14147 | |
| parent | 97b5a50c11900df6f582546e722ad8b6e0eff03a (diff) | |
| download | puppet-mail-4489fa3d452d6c1b9633454c76a739935f618535.tar.gz puppet-mail-4489fa3d452d6c1b9633454c76a739935f618535.tar.bz2 | |
Introducing $roundcube_des_key
| -rw-r--r-- | manifests/web.pp | 7 | ||||
| -rw-r--r-- | templates/roundcube/main.inc.php.erb (renamed from files/roundcube/main.inc.php) | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/manifests/web.pp b/manifests/web.pp index d0ddf29..4f9e2a1 100644 --- 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 index a34b85d..9308569 100644 --- 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 |