figure out if we need a smarthost

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index db7e6a7bbef38b5c4b5fbe760664fb64750d36df..70e702ee34134d9da79a68620c2fe5ef8dfe2748 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -231,141 +231,6 @@ host_settings:
     - hummel.debian.org
     - lucatelli.debian.org
     - rem.debian.org
-  smarthost:
-    abel.debian.org: mailout.debian.org
-    agricola.debian.org: mailout.debian.org
-    alain.debian.org: mailout.debian.org
-    alkman.debian.org: mailout.debian.org
-    alwyn.debian.org: mailout.debian.org
-    ancina.debian.org: mailout.debian.org
-    antheil.debian.org: mailout.debian.org
-    arcadelt.debian.org: mailout.debian.org
-    argento.debian.org: mailout.debian.org
-    arne.debian.org: mailout.debian.org
-    arnold.debian.org: mailout.debian.org
-    ball.debian.org: mailout.debian.org
-    barber.debian.org: mailout.debian.org
-    barriere.debian.org: mailout.debian.org
-    beethoven.debian.org: mailout.debian.org
-    berlioz.debian.org: mailout.debian.org
-    biber.debian.org: mailout.debian.org
-    blavet.debian.org: mailout.debian.org
-    brahms.debian.org: mailout.debian.org
-    caballero.debian.org: mailout.debian.org
-    cilea.debian.org: mailout.debian.org
-    corelli.debian.org: mailout.debian.org
-    crest.debian.org: mailout.debian.org
-    czerny.debian.org: mailout.debian.org
-    danzi.debian.org: mailout.debian.org
-    diabelli.debian.org: mailout.debian.org
-    diamond.debian.org: mailout.debian.org
-    dijkstra.debian.org: mailout.debian.org
-    duarte.debian.org: mailout.debian.org
-    eder.debian.org: mailout.debian.org
-    elgar.debian.org: mailout.debian.org
-    englund.debian.org: mailout.debian.org
-    escher.debian.org: mailout.debian.org
-    eysler.debian.org: mailout.debian.org
-    fano.debian.org: mailout.debian.org
-    fasch.debian.org: mailout.debian.org
-    field.debian.org: mailout.debian.org
-    finzi.debian.org: mailout.debian.org
-    gabrielli.debian.org: mailout.debian.org
-    geo1.debian.org: mailout.debian.org
-    geo2.debian.org: mailout.debian.org
-    geo3.debian.org: mailout.debian.org
-    glinka.debian.org: mailout.debian.org
-    gluck.debian.org: mailout.debian.org
-    handel.debian.org: mailout.debian.org
-    harris.debian.org: mailout.debian.org
-    hartmann.debian.org: mailout.debian.org
-    hasse.debian.org: mailout.debian.org
-    hebden.debian.org: mailout.debian.org
-    heininen.debian.org: mailout.debian.org
-    henze.debian.org: mailout.debian.org
-    hildegard.debian.org: mailout.debian.org
-    hoiby.debian.org: mailout.debian.org
-    holter.debian.org: mailout.debian.org
-    howells.debian.org: mailout.debian.org
-    hummel.debian.org: mailout.debian.org
-    jenkins.debian.org: mailout.debian.org
-    kassia.debian.org: mailout.debian.org
-    kaufmann.debian.org: mailout.debian.org
-    klecker.debian.org: mailout.debian.org
-    krenek.debian.org: mailout.debian.org
-    lafayette.debian.org: mailout.debian.org
-    lamb.debian.org: mailout.debian.org
-    lebrun.debian.org: mailout.debian.org
-    leisner.debian.org: mailout.debian.org
-    lilburn.debian.org: mailout.debian.org
-    lindberg.debian.org: mailout.debian.org
-    lobos.debian.org: mailout.debian.org
-    locke.debian.org: mailout.debian.org
-    lotti.debian.org: mailout.debian.org
-    lucatelli.debian.org: mailout.debian.org
-    luchesi.debian.org: mailout.debian.org
-    malo.debian.org: mailout.debian.org
-    mayer.debian.org: mailout.debian.org
-    mayr.debian.org: mailout.debian.org
-    merulo.debian.org: mailout.debian.org
-    mundy.debian.org: mailout.debian.org
-    murphy.debian.org: mailout.debian.org
-    new-master.debian.org: mailout.debian.org
-    nielsen.debian.org: mailout.debian.org
-    orff.debian.org: mailout.debian.org
-    paer.debian.org: mailout.debian.org
-    parry.debian.org: mailout.debian.org
-    partch.debian.org: mailout.debian.org
-    paganini.debian.org: mailout.debian.org
-    pasquini.debian.org: mailout.debian.org
-    penalosa.debian.org: mailout.debian.org
-    pergolesi.debian.org: mailout.debian.org
-    peri.debian.org: mailout.debian.org
-    pettersson.debian.org: mailout.debian.org
-    piatti.debian.org: mailout.debian.org
-    piston.debian.org: mailout.debian.org
-    porpora.debian.org: mailout.debian.org
-    poulenc.debian.org: mailout.debian.org
-    praetorius.debian.org: mailout.debian.org
-    rautavaara.debian.org: mailout.debian.org
-    rem.debian.org: mailout.debian.org
-    respighi.debian.org: mailout.debian.org
-    ries.debian.org: mailout.debian.org
-    rietz.debian.org: mailout.debian.org
-    rore.debian.org: mailout.debian.org
-    rossini.debian.org: mailout.debian.org
-    saens.debian.org: mailout.debian.org
-    salieri.debian.org: mailout.debian.org
-    samosa.debian.org: mailout.debian.org
-    santoro.debian.org: mailout.debian.org
-    scelsi.debian.org: mailout.debian.org
-    schein.debian.org: mailout.debian.org
-    schroeder.debian.org: mailout.debian.org
-    schumann.debian.org: mailout.debian.org
-    senfl.debian.org: mailout.debian.org
-    sibelius.debian.org: mailout.debian.org
-    smetana.debian.org: mailout.debian.org
-    soler.debian.org: mailout.debian.org
-    sompek.debian.org: mailout.debian.org
-    sperger.debian.org: mailout.debian.org
-    spontini.debian.org: mailout.debian.org
-    stabile.debian.org: mailout.debian.org
-    stadler.debian.org: mailout.debian.org
-    steffani.debian.org: mailout.debian.org
-    tchaikovsky.debian.org: mailout.debian.org
-    traetta.debian.org: mailout.debian.org
-    tristano.debian.org: mailout.debian.org
-    unger.debian.org: mailout.debian.org
-    villa.debian.org: mailout.debian.org
-    vitry.debian.org: mailout.debian.org
-    vivaldi.debian.org: mailout.debian.org
-    widor.debian.org: mailout.debian.org
-    wieck.debian.org: mailout.debian.org
-    wolkenstein.debian.org: mailout.debian.org
-    zandonai.debian.org: mailout.debian.org
-    zappa.debian.org: mailout.debian.org
-    zelenka.debian.org: mailout.debian.org
-    zemlinsky.debian.org: mailout.debian.org
   mail_port:
     ancina.debian.org: 2025
     kassia.debian.org: 587

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 74dcd892bee630cf4a156a2fc2c569746266a548..ec26415738b2755f76bead11a047d8878559a360 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -15,6 +15,12 @@ module Puppet::Parser::Functions
       nodeinfo['hoster'] = function_whohosts(nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml")
       nodeinfo['buildd'] = nodeinfo['ldap']['purpose'].include?('buildd')
 
+      if lookupvar('::mta') == 'exim4'
+        unless nodeinfo['heavy_exim']
+          nodeinfo['smarthost'] = true
+        end
+      end
+
       nodeinfo['misc'] = {}
       fqdn = lookupvar('::fqdn')
       if fqdn and fqdn == host