diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-06-18 09:52:29 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-06-18 09:52:29 -0300 |
| commit | 83bdfe2e56cc8c1823a3846f7a3c276770fa65d9 (patch) | |
| tree | e430248a398e93edafd7b4dea73ee1dbbbeb9f40 /templates/virtual | |
| parent | 0fae80a1a028a20bfe2b133995d60b2cb29bde4a (diff) | |
| download | puppet-mail-83bdfe2e56cc8c1823a3846f7a3c276770fa65d9.tar.gz puppet-mail-83bdfe2e56cc8c1823a3846f7a3c276770fa65d9.tar.bz2 | |
Updates templates
Diffstat (limited to 'templates/virtual')
| -rw-r--r-- | templates/virtual/postfixadmin/config.inc.php.erb | 8 | ||||
| -rw-r--r-- | templates/virtual/roundcube/main.inc.php.erb | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/templates/virtual/postfixadmin/config.inc.php.erb b/templates/virtual/postfixadmin/config.inc.php.erb index 58b91b7..79dfa58 100644 --- a/templates/virtual/postfixadmin/config.inc.php.erb +++ b/templates/virtual/postfixadmin/config.inc.php.erb @@ -131,10 +131,10 @@ $CONF['page_size'] = '10'; // Default Aliases // The default aliases that need to be created for all domains. $CONF['default_aliases'] = array ( - 'abuse' => 'abuse@<%= domain %>', - 'hostmaster' => 'hostmaster@<%= domain %>', - 'postmaster' => 'postmaster@<%= domain %>', - 'webmaster' => 'webmaster@<%= domain %>' + 'abuse' => 'abuse@<%= @domain %>', + 'hostmaster' => 'hostmaster@<%= @domain %>', + 'postmaster' => 'postmaster@<%= @domain %>', + 'webmaster' => 'webmaster@<%= @domain %>' ); // Mailboxes diff --git a/templates/virtual/roundcube/main.inc.php.erb b/templates/virtual/roundcube/main.inc.php.erb index 5582ce0..6aaf5cb 100644 --- a/templates/virtual/roundcube/main.inc.php.erb +++ b/templates/virtual/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'] = <%= roundcube_logo %>; +$rcmail_config['skin_logo'] = <%= @roundcube_logo %>; // Includes should be interpreted as PHP files $rcmail_config['skin_include_php'] = false; @@ -247,7 +247,7 @@ $rcmail_config['x_frame_options'] = 'sameorigin'; // 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'] = '<%= roundcube_des_key %>'; +$rcmail_config['des_key'] = '<%= @roundcube_des_key %>'; // Automatically add this domain to user names for login // Only for IMAP servers that require full e-mail addresses for login @@ -487,7 +487,7 @@ $rcmail_config['undo_timeout'] = 0; // Login_info plugin $rcmail_config['login_info'] = <<<EOT <div id="login_info" style="margin-top:3%;margin-left:auto;margin-right:auto;;width:380px;border-radius:10px;padding:10px;-moz-border-radius:10px;background-color:lightgrey;text-align:center;color:red;"> - <%= roundcube_login_info %> + <%= @roundcube_login_info %> </div> EOT; <% end -%> |