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:
9494eea
)
Handle exceptions from reading fastly IP ranges
author
Julien Cristau
<jcristau@debian.org>
Sun, 6 Aug 2017 22:23:15 +0000
(18:23 -0400)
committer
Julien Cristau
<jcristau@debian.org>
Sun, 6 Aug 2017 22:23:15 +0000
(18:23 -0400)
modules/ferm/templates/defs.conf.erb
patch
|
blob
|
history
diff --git
a/modules/ferm/templates/defs.conf.erb
b/modules/ferm/templates/defs.conf.erb
index
25468cf
..
2292139
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-75,8
+75,12
@@
<%=
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
end
%>
@def $HOST_FASTLY = (<%= getfastlyranges().join(' ') %>);