diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-03-17 15:26:27 +0000 | 
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-03-17 15:26:27 +0000 | 
| commit | bf977c9b76ebc4668a3f4fc55485e117097df21c (patch) | |
| tree | 9fb8b2289a544029db0da14ce63184e59344f5bf /manifests | |
| parent | 34d35a25b855b920c6e53245144d7d0276e29aa0 (diff) | |
| parent | 5d25ec9d1ec77d735d393ef7cab7d1232e3d8997 (diff) | |
| download | puppet-postfix-bf977c9b76ebc4668a3f4fc55485e117097df21c.tar.gz puppet-postfix-bf977c9b76ebc4668a3f4fc55485e117097df21c.tar.bz2  | |
Merge branch 'fix_satellite_class' into 'master'
Fix satellite class
See merge request !5
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/satellite.pp | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/satellite.pp b/manifests/satellite.pp index 739c625..45a40ad 100644 --- a/manifests/satellite.pp +++ b/manifests/satellite.pp @@ -21,16 +21,16 @@  #     }  #   }  # +  class postfix::satellite(    $relayhost           = '', -  $valid_fqdn          = '', +  $valid_fqdn          = $::fqdn,    $root_mail_recipient = ''  ) { -  # If $valid_fqdn exists, use it to override $fqdn -  case $valid_fqdn { -    "":      { $valid_fqdn = $::fqdn } -    default: { $fqdn = "${valid_fqdn}" } +  # If $valid_fqdn is provided, use it to override $fqdn +  if $valid_fqdn != $::fdqn { +    $fqdn = $valid_fqdn    }    class { 'postfix':  | 
