Variable updates

diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 29844693939716d19cdefc78f8fd00cba11bd370..9145a695d955d7271f43bc3fa58cfb33a5dfa9e0 100644 (file)
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -10,7 +10,7 @@ class mail::sympa(
 
   # Class configuration
   case $database_password {
-    '': { fail("You need to define database_password host config") }
+    '': { fail("You need to define mail::sympa::database_password config") }
   }
 
   # Sympa subsystems

diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index fd1d020e063bef3c94d37fd99bb6b4aaf903e05b..5bb033bd94c41d995e71b80b20b406d571e920ca 100644 (file)
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -7,7 +7,7 @@ class mail::virtual(
 
   # Check parameters
   case $database_password {
-    '': { fail("You need to define database_password host config") }
+    '': { fail("You need to define mail::virtual::database_password config") }
   }
 
   # Virtual subsystems

diff --git a/manifests/virtual/database.pp b/manifests/virtual/database.pp
index 32259a47f7fb4b03faf2e71b80688aaa9966baed..1e9b0e794ecea4884fea50135eb95942a9b7ae21 100644 (file)
--- a/manifests/virtual/database.pp
+++ b/manifests/virtual/database.pp
@@ -1,9 +1,4 @@
 class mail::virtual::database {
-  # Class configuration
-  case $database_password {
-    '': { fail("You need to define database_password host config") }
-  }
-
   #
   # Database configuration
   #

diff --git a/manifests/virtual/web.pp b/manifests/virtual/web.pp
index 7c007a9f5231231c056aadb4065eea7188278316..bf826ef64ca33cc94d9a900bd4f4fb2376331447 100644 (file)
--- a/manifests/virtual/web.pp
+++ b/manifests/virtual/web.pp
@@ -1,20 +1,20 @@
 class mail::virtual::web(
-  $postfixadmin_setup_hash = hiera('mail::web::virtual::postfixadmin_setup_hash', ''),
-  $roundcube_des_key = hiera('mail::web::virtual::roundcube_des_key', ''),
-  $roundcube_logo = hiera('mail::web::virtual::roundcube_logo', 'null'),
-  $roundcube_login_info = hiera('mail::web::virtual::roundcube_login_info', false)
+  $postfixadmin_setup_hash = hiera('mail::virtual::web::postfixadmin_setup_hash', ''),
+  $roundcube_des_key = hiera('mail::virtual::web::roundcube_des_key', ''),
+  $roundcube_logo = hiera('mail::virtual::web::roundcube_logo', 'null'),
+  $roundcube_login_info = hiera('mail::virtual::web::roundcube_login_info', false)
 ) {
 
   # Class configuration
   if $::lsbdistcodename != 'lenny' {
     case $roundcube_des_key {
-      '': { fail("You need to define roundcube_des_key host config") }
+      '': { fail("You need to define mail::virtual::web::roundcube_des_key config") }
     }
   }
 
   case $postfixadmin_setup_hash {
     '': {
-      warning("You need to define postfixadmin_setup_hash host config")
+      warning("You need to define mail::virtual::web::postfixadmin_setup_hash config")
       $setup_hash = 'changeme'
     }
   }