From 0dce0e69ff64b8c98c0854c33be6886d433dedfb Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 22 Jan 2013 14:15:41 -0200
Subject: Starting class refactoring for forward compatibility

---
 manifests/system.pp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'manifests/system.pp')

diff --git a/manifests/system.pp b/manifests/system.pp
index b810325..bf57896 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -33,9 +33,9 @@ class mail::system {
   include mail::spamassassin
 
   # Virtual mail system
-  case hiera('mail_virtual', false) {
+  case hiera('mail::virtual', false) {
     true: {
-      include mail::virtual
+      class { 'mail::virtual': }
     }
     default: {
       include mail::regular
@@ -43,9 +43,9 @@ class mail::system {
   }
 
   # Sympa mailing list manager
-  case hiera('mail_sympa', false) {
+  case hiera('mail::sympa', false) {
     true: {
-      include mail::sympa
+      class { 'mail::sympa': }
       $sympa_relay_domains = ", ${mail::sympa::subdomain}.${domain}"
     }
     'disabled': {
@@ -56,7 +56,7 @@ class mail::system {
   }
 
   # Schleuder mailing list manager
-  case hiera('mail_schleuder', false) {
+  case hiera('mail::schleuder', false) {
     true: {
       class { 'mail::schleuder': }
       $schleuder_relay_domains = ", ${mail::schleuder::subdomain}.${domain}"
@@ -64,7 +64,7 @@ class mail::system {
   }
 
   # Mlmmj
-  case hiera('mail_mlmmj', false) {
+  case hiera('mail::mlmmj', false) {
     true: {
       class { 'mail::mlmmj': }
       $mlmmj_relay_domains = ", ${mail::mlmmj::subdomain}.${domain}"
@@ -72,14 +72,14 @@ class mail::system {
   }
 
   # Firma
-  case hiera('mail_firma', false) {
+  case hiera('mail::firma', false) {
     true: {
       class { 'mail::firma': }
       $firma_relay_domains = ", ${mail::firma::subdomain}.${domain}"
     }
   }
 
-  $relay_domains = hiera('postfix_relay_domains', '')
+  $relay_domains = hiera('mail::relay_domains', '')
 
   case $relay_domains {
     '': { $postfix_relay_domains = "${postfix_default_relay_domains}${sympa_relay_domains}${schleuder_relay_domains}${mlmmj_relay_domains}${firma_relay_domains}" }
-- 
cgit v1.2.3