summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/sympa.pp2
-rw-r--r--manifests/virtual.pp2
-rw-r--r--manifests/virtual/database.pp5
-rw-r--r--manifests/virtual/web.pp12
4 files changed, 8 insertions, 13 deletions
diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index 2984469..9145a69 100644
--- 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 fd1d020..5bb033b 100644
--- 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 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'
}
}