diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:25:46 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:25:46 -0200 |
| commit | 7cc8c05c571d18b9a39eb5643dd9af26d31005ff (patch) | |
| tree | 00932722b7f819681d69777d97f20d8e27cd7b22 /manifests/satellite.pp | |
| parent | 74b5b00bbd18c1ead3a6425530666817e50ffb96 (diff) | |
| parent | 881a59ac62684028a7f4cb358e3592efc3ae99a9 (diff) | |
| download | puppet-postfix-7cc8c05c571d18b9a39eb5643dd9af26d31005ff.tar.gz puppet-postfix-7cc8c05c571d18b9a39eb5643dd9af26d31005ff.tar.bz2 | |
Merge branch 'master' of ssh://labs.riseup.net/shared-postfix
Conflicts:
manifests/definitions/header_checks_snippet.pp
manifests/header_checks.pp
manifests/header_checks_snippet.pp
manifests/init.pp
manifests/tlspolicy.pp
manifests/virtual_regexp_snippet.pp
Diffstat (limited to 'manifests/satellite.pp')
| -rw-r--r-- | manifests/satellite.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/satellite.pp b/manifests/satellite.pp index cb92a9f..99904dd 100644 --- a/manifests/satellite.pp +++ b/manifests/satellite.pp @@ -25,7 +25,7 @@ class postfix::satellite { # If $valid_fqdn exists, use it to override $fqdn case $valid_fqdn { - "": { $valid_fqdn = $fqdn } + "": { $valid_fqdn = $::fqdn } default: { $fqdn = "${valid_fqdn}" } } |