X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=af5c387c08b6601d81694e91ff2174b0cee61f7d;hb=9768916cd03adff997b5306ed0497c31d30f2624;hp=84f726a343a6f9c72d3752f97599cace8eb7c98d;hpb=5d5f4bef6a2979799dce636f4778cdcbcdd55b8a;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index 84f726a34..af5c387c0 100644 --- a/modules/ferm/templates/defs.conf.erb +++ b/modules/ferm/templates/defs.conf.erb @@ -77,7 +77,7 @@ def getfastlyranges() begin data = YAML.safe_load(File.open("/srv/puppet.debian.org/puppet-facts/fastly_ranges.yaml").read) - return data.addresses + return data['addresses'] rescue return [] end @@ -98,7 +98,7 @@ end @def $weasel = ($weasel 213.235.231.192/26); # sil-noreply @def $weasel = ($weasel 141.201.0.0/16); # uni salzburg @def $weasel = ($weasel 62.99.152.176/28); # campus sbg -@def $weasel = ($weasel 194.118.0.0/16); # A1 Telekom +@def $weasel = ($weasel 194.118.0.0/16 62.46.0.0/15); # A1 Telekom @def $zobel = (); @def $zobel = ($zobel 87.139.82.80/32); # exit.credativ.com @def $zobel = ($zobel 87.193.134.192/27); # credativ qsc