Puppet 4 fixes

diff --git a/manifests/firma.pp b/manifests/firma.pp
index 81f6ae76896a17a01b04f477ff5efe4f8d08bd81..cc7477e3ef00bb3826bdac855223bb3032651de0 100644 (file)
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -1,5 +1,5 @@
 class mail::firma(
-  $subdomain = hiera('firma_subdomain', $firma::params::subdomain)
+  $subdomain = hiera('firma_subdomain', $::mail::firma::params::subdomain)
 ) {
 
   # Firma subsystems

diff --git a/manifests/system.pp b/manifests/system.pp
index 4adc2928620502ce40191592afa9c3ab6c0861eb..95179eef80b3bba5856a6e544f19c407c77e65a8 100644 (file)
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -85,9 +85,11 @@ class mail::system(
       $sympa_relay_domains = ", ${mail::sympa::subdomain}.${domain}"
     }
     'disabled': {
+      $sympa_relay_domains = ''
       include mail::sympa::disabled
     }
     default: {
+      $sympa_relay_domains = ''
     }
   }
 
@@ -97,6 +99,9 @@ class mail::system(
       class { 'mail::schleuder': }
       $schleuder_relay_domains = ", ${mail::schleuder::subdomain}.${domain}"
     }
+    default: {
+      $schleuder_relay_domains = ''
+    }
   }
 
   # Mlmmj
@@ -106,6 +111,9 @@ class mail::system(
 
       $mlmmj_relay_domains = ", ${mail::mlmmj::subdomain}.${domain}"
     }
+    default: {
+      $mlmmj_relay_domains = ''
+    }
   }
 
   # Firma
@@ -114,6 +122,9 @@ class mail::system(
       class { 'mail::firma': }
       $firma_relay_domains = ", ${mail::firma::subdomain}.${domain}"
     }
+    default: {
+      $firma_relay_domains = ''
+    }
   }
 
   # GPG Mail Gateway

diff --git a/manifests/virtual/packages.pp b/manifests/virtual/packages.pp
index af0d817bac803ec23e4401d7173912b34c8664fc..969cc02186b63ae192e46e161acfb9365cbec5dc 100644 (file)
--- a/manifests/virtual/packages.pp
+++ b/manifests/virtual/packages.pp
@@ -17,8 +17,8 @@ class mail::virtual::packages {
 
   package { 'php-crypt-gpg':
     ensure => $::lsbdistcodename ? {
-      'wheezy' => absent,
-       default => installed,
+      'jessie' => installed,
+       default => absent,
     },
   }