summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--manifests/base.pp2
-rw-r--r--manifests/firma.pp2
-rw-r--r--manifests/mlmmj.pp2
-rw-r--r--manifests/mlmmj/list.pp2
-rw-r--r--manifests/mlmmj/web.pp2
-rw-r--r--manifests/schleuder.pp2
-rw-r--r--manifests/sympa.pp14
-rw-r--r--manifests/system.pp30
-rw-r--r--manifests/tls.pp2
-rw-r--r--manifests/virtual.pp8
-rw-r--r--manifests/virtual/web/admin.pp2
-rw-r--r--manifests/virtual/web/client.pp8
12 files changed, 38 insertions, 38 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 093d289..eb84c76 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -34,6 +34,6 @@ class mail::base {
# See http://www.gtkdb.de/index_7_2274.html
postfix::config { 'inet_protocols':
- value => hiera('mail::base::inet_protocols', 'ipv4'),
+ value => lookup('mail::base::inet_protocols', undef, undef, 'ipv4'),
}
}
diff --git a/manifests/firma.pp b/manifests/firma.pp
index cc7477e..2f9bbe9 100644
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -1,5 +1,5 @@
class mail::firma(
- $subdomain = hiera('firma_subdomain', $::mail::firma::params::subdomain)
+ $subdomain = lookup('firma_subdomain', undef, undef, $::mail::firma::params::subdomain)
) {
# Firma subsystems
diff --git a/manifests/mlmmj.pp b/manifests/mlmmj.pp
index 198595b..9e04e4d 100644
--- a/manifests/mlmmj.pp
+++ b/manifests/mlmmj.pp
@@ -4,7 +4,7 @@
# - lists with hyphens are not working when mails are sent directly, but work when sent to an alias.
# - mail::mlmmj::domain just support a single domain; additional domains should be added into relay_domains.
class mail::mlmmj(
- $subdomain = hiera('mail::mlmmj::subdomain', $mail::mlmmj::params::subdomain)
+ $subdomain = lookup('mail::mlmmj::subdomain', undef, undef, $mail::mlmmj::params::subdomain)
) {
include mail::mlmmj::packages
diff --git a/manifests/mlmmj/list.pp b/manifests/mlmmj/list.pp
index 24e5e22..2f54162 100644
--- a/manifests/mlmmj/list.pp
+++ b/manifests/mlmmj/list.pp
@@ -8,7 +8,7 @@
# That's why we need one definition per mailing list.
define mail::mlmmj::list(
$ensure = 'present',
- $subdomain = hiera('mail::mlmmj::subdomain', $mail::mlmmj::params::subdomain),
+ $subdomain = lookup('mail::mlmmj::subdomain', undef, undef, $mail::mlmmj::params::subdomain),
$tld = $::domain
) {
$fulldomain = regsubst("${subdomain}.${tld}", '\.', '\.', 'G')
diff --git a/manifests/mlmmj/web.pp b/manifests/mlmmj/web.pp
index 1a3a328..5373b8f 100644
--- a/manifests/mlmmj/web.pp
+++ b/manifests/mlmmj/web.pp
@@ -25,6 +25,6 @@ class mail::mlmmj::web inherits websites::setup {
owner => mlmmj,
group => mlmmj,
mode => '0640',
- content => hiera('mail::mlmmj::web::htpasswd', ''),
+ content => lookup('mail::mlmmj::web::htpasswd', undef, undef, ''),
}
}
diff --git a/manifests/schleuder.pp b/manifests/schleuder.pp
index a858a5f..b77fe70 100644
--- a/manifests/schleuder.pp
+++ b/manifests/schleuder.pp
@@ -3,7 +3,7 @@
# You might also want to edit or manage /etc/schleuder/schleuder.conf
# and customize things such as superadminaddr.
class mail::schleuder(
- $subdomain = hiera('schleuder_subdomain', $mail::schleuder::params::subdomain)
+ $subdomain = lookup('schleuder_subdomain', undef, undef, $mail::schleuder::params::subdomain)
) {
# Schleuder subsystems
diff --git a/manifests/sympa.pp b/manifests/sympa.pp
index f8cf491..9afa2a3 100644
--- a/manifests/sympa.pp
+++ b/manifests/sympa.pp
@@ -1,11 +1,11 @@
class mail::sympa(
- $database_password = hiera('mail::sympa::database_password', ''),
- $database_name = hiera('mail::sympa::database_name', $mail::sympa::params::database_name),
- $database_host = hiera('mail::sympa::database_host', $mail::sympa::params::database_host),
- $listmasters = hiera('mail::sympa::listmasters', $mail::sympa::params::listmasters),
- $lang = hiera('mail::sympa::lang', $mail::sympa::params::lang),
- $subdomain = hiera('mail::sympa::subdomain', $mail::sympa::params::subdomain),
- $logo_html_definition = hiera('mail::sympa::logo_html_definition', $mail::sympa::params::logo_html_definition)
+ $database_password = lookup('mail::sympa::database_password', undef, undef, ''),
+ $database_name = lookup('mail::sympa::database_name', undef, undef, $mail::sympa::params::database_name),
+ $database_host = lookup('mail::sympa::database_host', undef, undef, $mail::sympa::params::database_host),
+ $listmasters = lookup('mail::sympa::listmasters', undef, undef, $mail::sympa::params::listmasters),
+ $lang = lookup('mail::sympa::lang', undef, undef, $mail::sympa::params::lang),
+ $subdomain = lookup('mail::sympa::subdomain', undef, undef, $mail::sympa::params::subdomain),
+ $logo_html_definition = lookup('mail::sympa::logo_html_definition', undef, undef, $mail::sympa::params::logo_html_definition)
) {
# Class configuration
diff --git a/manifests/system.pp b/manifests/system.pp
index 95179ee..909f4b5 100644
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -1,8 +1,8 @@
class mail::system(
- $mydestination = hiera('mail::mydestination', '$myhostname, localhost.$mydomain, localhost'),
- $relay_domains = hiera('mail::relay_domains', ''),
- $mynetworks = hiera('mail::postfix_mynetworks', "127.0.0.0/8"),
- $root_mail_recipient = hiera('mail::root_mail_recipient', 'nobody')
+ $mydestination = lookup('mail::mydestination', undef, undef, '$myhostname, localhost.$mydomain, localhost'),
+ $relay_domains = lookup('mail::relay_domains', undef, undef, ''),
+ $mynetworks = lookup('mail::postfix_mynetworks', undef, undef, "127.0.0.0/8"),
+ $root_mail_recipient = lookup('mail::root_mail_recipient', undef, undef, 'nobody')
) {
# Base postfix class
@@ -11,19 +11,19 @@ class mail::system(
smtp_listen => "all",
use_amavisd => "yes",
use_dovecot_lda => "yes",
- use_schleuder => hiera('mail::schleuder', false) ? {
+ use_schleuder => lookup('mail::schleuder', undef, undef, false) ? {
true => "yes",
default => "no",
},
- use_sympa => hiera('mail::sympa', false) ? {
+ use_sympa => lookup('mail::sympa', undef, undef, false) ? {
true => "yes",
default => "no",
},
- use_mlmmj => hiera('mail::mlmmj', false) ? {
+ use_mlmmj => lookup('mail::mlmmj', undef, undef, false) ? {
true => "yes",
default => "no",
},
- use_firma => hiera('mail::firma', false) ? {
+ use_firma => lookup('mail::firma', undef, undef, false) ? {
true => "yes",
default => "no",
},
@@ -33,7 +33,7 @@ class mail::system(
manage_transport_regexp => "yes",
manage_virtual_regexp => "yes",
manage_header_checks => "yes",
- manage_tls_policy => hiera('mail::postfix_manage_tls_policy', 'no')
+ manage_tls_policy => lookup('mail::postfix_manage_tls_policy', undef, undef, 'no')
}
# Log rotation
@@ -69,7 +69,7 @@ class mail::system(
include mail::virtual::web::params
# Virtual mail system
- case hiera('mail::virtual', false) {
+ case lookup('mail::virtual', undef, undef, false) {
true: {
class { 'mail::virtual': }
}
@@ -79,7 +79,7 @@ class mail::system(
}
# Sympa mailing list manager
- case hiera('mail::sympa', false) {
+ case lookup('mail::sympa', undef, undef, false) {
true: {
class { 'mail::sympa': }
$sympa_relay_domains = ", ${mail::sympa::subdomain}.${domain}"
@@ -94,7 +94,7 @@ class mail::system(
}
# Schleuder mailing list manager
- case hiera('mail::schleuder', false) {
+ case lookup('mail::schleuder', undef, undef, false) {
true: {
class { 'mail::schleuder': }
$schleuder_relay_domains = ", ${mail::schleuder::subdomain}.${domain}"
@@ -105,7 +105,7 @@ class mail::system(
}
# Mlmmj
- case hiera('mail::mlmmj', false) {
+ case lookup('mail::mlmmj', undef, undef, false) {
true: {
class { 'mail::mlmmj': }
@@ -117,7 +117,7 @@ class mail::system(
}
# Firma
- case hiera('mail::firma', false) {
+ case lookup('mail::firma', undef, undef, false) {
true: {
class { 'mail::firma': }
$firma_relay_domains = ", ${mail::firma::subdomain}.${domain}"
@@ -128,7 +128,7 @@ class mail::system(
}
# GPG Mail Gateway
- case hiera('mail::gpg_mailgate', false) {
+ case lookup('mail::gpg_mailgate', undef, undef, false) {
true: {
class { 'mail::gpg_mailgate': }
}
diff --git a/manifests/tls.pp b/manifests/tls.pp
index 5a1d60d..0f8a7f5 100644
--- a/manifests/tls.pp
+++ b/manifests/tls.pp
@@ -7,7 +7,7 @@ class mail::tls {
postfix::config { "smtpd_tls_security_level": value => 'may' }
postfix::config { "smtp_tls_security_level": value => 'may' }
- $mail_virtual = hiera('mail::virtual', false)
+ $mail_virtual = lookup('mail::virtual', undef, undef, false)
# SSL certificate
#ssl::cert { "${::domain}":
diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index 0a1d12c..df2f364 100644
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -1,8 +1,8 @@
class mail::virtual(
- $database_user = hiera('mail::virtual::database_user', $mail::virtual::params::database_user),
- $database_host = hiera('mail::virtual::database_host', $mail::virtual::params::database_host),
- $database_name = hiera('mail::virtual::database_name', $mail::virtual::params::database_name),
- $database_password = hiera('mail::virtual::database_password', ''),
+ $database_user = lookup('mail::virtual::database_user', undef, undef, $mail::virtual::params::database_user),
+ $database_host = lookup('mail::virtual::database_host', undef, undef, $mail::virtual::params::database_host),
+ $database_name = lookup('mail::virtual::database_name', undef, undef, $mail::virtual::params::database_name),
+ $database_password = lookup('mail::virtual::database_password', undef, undef, ''),
) {
# Check parameters
diff --git a/manifests/virtual/web/admin.pp b/manifests/virtual/web/admin.pp
index b3dfd86..76cd715 100644
--- a/manifests/virtual/web/admin.pp
+++ b/manifests/virtual/web/admin.pp
@@ -1,5 +1,5 @@
class mail::virtual::web::admin(
- $postfixadmin_setup_hash = hiera('mail::virtual::web::postfixadmin_setup_hash', $mail::virtual::web::params::postfixadmin_setup_hash),
+ $postfixadmin_setup_hash = lookup('mail::virtual::web::postfixadmin_setup_hash', undef, undef, $mail::virtual::web::params::postfixadmin_setup_hash),
) {
case $postfixadmin_setup_hash {
'': {
diff --git a/manifests/virtual/web/client.pp b/manifests/virtual/web/client.pp
index 0a97606..016ceec 100644
--- a/manifests/virtual/web/client.pp
+++ b/manifests/virtual/web/client.pp
@@ -1,7 +1,7 @@
class mail::virtual::web::client(
- $roundcube_des_key = hiera('mail::virtual::web::roundcube_des_key', $mail::virtual::web::params::roundcube_des_key),
- $roundcube_logo = hiera('mail::virtual::web::roundcube_logo', $mail::virtual::web::params::roundcube_logo),
- $roundcube_login_info = hiera('mail::virtual::web::roundcube_login_info', $mail::virtual::web::params::roundcube_login_info)
+ $roundcube_des_key = lookup('mail::virtual::web::roundcube_des_key', undef, undef, $mail::virtual::web::params::roundcube_des_key),
+ $roundcube_logo = lookup('mail::virtual::web::roundcube_logo', undef, undef, $mail::virtual::web::params::roundcube_logo),
+ $roundcube_login_info = lookup('mail::virtual::web::roundcube_login_info', undef, undef, $mail::virtual::web::params::roundcube_login_info)
) {
include php
include php::imap
@@ -19,7 +19,7 @@ class mail::virtual::web::client(
mpm => false,
}
- $web_db_pass = hiera('mail::virtual::web::database::password', '')
+ $web_db_pass = lookup('mail::virtual::web::database::password', undef, undef, '')
database::instance { "mail":
password => "${web_db_pass}",
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 14:59:47 +0000