summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/firma.pp2
-rw-r--r--manifests/system.pp11
-rw-r--r--manifests/virtual/packages.pp4
3 files changed, 14 insertions, 3 deletions
diff --git a/manifests/firma.pp b/manifests/firma.pp
index 81f6ae7..cc7477e 100644
--- 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 4adc292..95179ee 100644
--- 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 af0d817..969cc02 100644
--- 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,
},
}