Updates roundcube config

1 files changed, 13 insertions, 2 deletions

diff --git a/manifests/virtual/web.pp b/manifests/virtual/web.pp
index 08e3999..17282f7 100644
--- a/manifests/virtual/web.pp
+++ b/manifests/virtual/web.pp
@@ -37,8 +37,10 @@ class mail::virtual::web(
     mpm     => false,
   }
 
+  $web_db_pass = hiera('mail::virtual::web::database::password', '')
+
   database::instance { "mail":
-    password => hiera('mail::virtual::web::database::password', ''),
+    password => "${web_db_pass}",
   }
 
   file { "${apache::sites_folder}/postfixadmin/site/config.inc.php":
@@ -50,7 +52,16 @@ class mail::virtual::web(
     require => File["${apache::sites_folder}/postfixadmin/site"],
   }
 
+  # Old config
   file { "/etc/roundcube/main.inc.php":
+    ensure => absent,
+    owner   => root,
+    group   => www-data,
+    mode    => 0640,
+    require => Package['roundcube'],
+  }
+
+  file { "/etc/roundcube/config.inc.php":
     ensure => $::lsbdistcodename ? {
       'lenny' => absent,
       default => present,
@@ -58,7 +69,7 @@ class mail::virtual::web(
     owner   => root,
     group   => www-data,
     mode    => 0640,
-    content => template('mail/virtual/roundcube/main.inc.php.erb'),
+    content => template('mail/virtual/roundcube/config.inc.php.erb'),
     require => Package['roundcube'],
   }