summaryrefslogtreecommitdiff
path: root/manifests/virtual.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-21 18:01:00 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-21 18:01:00 -0200
commit86515e9a0f27d36e38faee05beb03cbb99677e73 (patch)
tree355b620ee9ea98be6d54f87c506b64b2024c8076 /manifests/virtual.pp
parent14d954ff02564493192fe1fc9ad3a148ba20ef60 (diff)
downloadpuppet-mail-86515e9a0f27d36e38faee05beb03cbb99677e73.tar.gz
puppet-mail-86515e9a0f27d36e38faee05beb03cbb99677e73.tar.bz2
Refactoring for 2.7 compatibility
Diffstat (limited to 'manifests/virtual.pp')
-rw-r--r--manifests/virtual.pp28
1 files changed, 2 insertions, 26 deletions
diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index c895777..d351209 100644
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -1,35 +1,11 @@
class mail::virtual {
- # Class configuration
- case $postfixadmin_database_password {
- '': { fail("You need to define \$postfixadmin_database_password host config") }
- }
-
- case $postfixadmin_setup_hash {
- '': {
- warning("You need to define \$postfixadmin_setup_hash host config")
- $postfixadmin_setup_hash = 'changeme'
- }
- }
-
- case $postfixadmin_database_user {
- '': { $postfixadmin_database_user = "postfix" }
- }
-
- case $postfixadmin_database_host {
- '': { $postfixadmin_database_host = "localhost" }
- }
-
- case $postfixadmin_database_name {
- '': { $postfixadmin_database_name= "postfix" }
- }
-
# Virtual subsystems
include database
include mail::packages::virtual
include mail::sasl
include mail::dovecot
- include mail::postfixadmin
- include mail::web::virtual
+
+ class { [ 'mail::postfixadmin', 'mail::web::virtual' }
# Virtual mailboxes
file { '/var/mail/virtual':