From cdfc71dc8691e3d58db3049dfefd110c4c1d044b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 22 Jan 2013 16:33:20 -0200
Subject: Variable updates

---
 manifests/virtual/database.pp |  5 -----
 manifests/virtual/web.pp      | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'manifests/virtual')

diff --git a/manifests/virtual/database.pp b/manifests/virtual/database.pp
index 32259a4..1e9b0e7 100644
--- 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 7c007a9..bf826ef 100644
--- 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'
     }
   }
-- 
cgit v1.2.3