From: Peter Palfrader Date: Sun, 22 Sep 2019 10:32:09 +0000 (+0200) Subject: retire mail_port config from local.yaml X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3a69918effc4bd9dbc1f59d05c8b6b196d2af5c4;p=mirror%2Fdsa-puppet.git retire mail_port config from local.yaml --- diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml index 35a191665..5879a42a9 100644 --- a/modules/debian_org/files/misc/local.yaml +++ b/modules/debian_org/files/misc/local.yaml @@ -110,11 +110,6 @@ footer: #zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]" #zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]" host_settings: - mail_port: - klecker.debian.org: 2025 - new-klecker.debian.org: 2025 - smit.debian.org: 2025 - zani.debian.org: 587 entropy_key: - manda-node04.debian.org - grnet-node01.debian.org diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb index 8ae486d35..efab0c2e6 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb @@ -23,8 +23,6 @@ module Puppet::Parser::Functions end end - results['mail_port'] = '' - if yaml['host_settings'].kind_of?(Hash) yaml['host_settings'].each_pair do |property, values| if values.kind_of?(Hash)