projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
af93f93
)
Move reservedaddrs directly into exim.conf
author
Peter Palfrader
<peter@palfrader.org>
Thu, 20 Jun 2013 09:03:18 +0000
(11:03 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Thu, 20 Jun 2013 09:03:18 +0000
(11:03 +0200)
modules/debian-org/misc/local.yaml
patch
|
blob
|
history
modules/exim/templates/eximconf.erb
patch
|
blob
|
history
modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
patch
|
blob
|
history
diff --git
a/modules/debian-org/misc/local.yaml
b/modules/debian-org/misc/local.yaml
index
005afca
..
ff6e47e
100644
(file)
--- a/
modules/debian-org/misc/local.yaml
+++ b/
modules/debian-org/misc/local.yaml
@@
-411,5
+411,3
@@
host_settings:
- rietz.debian.org
- stanley.debian.org
- senfter.debian.org
- rietz.debian.org
- stanley.debian.org
- senfter.debian.org
-# reservedaddrs:
-# ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
81da814
..
33a81c4
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-123,7
+123,7
@@
localpartlist postmasterish = postmaster : abuse : hostmaster
hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts ; 89.16.166.49 ; 82.195.75.76 ; 2001:41b8:202:deb:bab5:0:52c3:4b4c
hostlist debianhosts = <; ; 127.0.0.1 ; ::1 ; /var/lib/misc/thishost/debianhosts ; 89.16.166.49 ; 82.195.75.76 ; 2001:41b8:202:deb:bab5:0:52c3:4b4c
-hostlist reservedaddrs =
<%= scope.lookupvar('site::nodeinfo')['reservedaddrs'] %>
+hostlist reservedaddrs =
0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5
<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
# Domains we relay for; that is domains that aren't considered local but we
<%- if scope.lookupvar('site::nodeinfo')['mailrelay'] -%>
# Domains we relay for; that is domains that aren't considered local but we
diff --git
a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
index
8f705c8
..
b38f5d5
100644
(file)
--- a/
modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
+++ b/
modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
@@
-28,8
+28,7
@@
module Puppet::Parser::Functions
results['smarthost'] = ''
results['heavy_exim'] = ''
results['smarthost_port'] = 587
results['smarthost'] = ''
results['heavy_exim'] = ''
results['smarthost_port'] = 587
- results['reservedaddrs'] = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
-
+
if yaml['host_settings'].kind_of?(Hash)
yaml['host_settings'].each_pair do |property, values|
if values.kind_of?(Hash)
if yaml['host_settings'].kind_of?(Hash)
yaml['host_settings'].each_pair do |property, values|
if values.kind_of?(Hash)