projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move all roles from local.yaml to hiera
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
templates
/
me.conf.erb
diff --git
a/modules/ferm/templates/me.conf.erb
b/modules/ferm/templates/me.conf.erb
index
f3866c2
..
7e84414
100644
(file)
--- a/
modules/ferm/templates/me.conf.erb
+++ b/
modules/ferm/templates/me.conf.erb
@@
-5,7
+5,7
@@
<%=
nodeinfo = scope.lookupvar('site::nodeinfo')
<%=
nodeinfo = scope.lookupvar('site::nodeinfo')
-
+has_role = scope.function_has_role
out = []
restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
out = []
restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
@@
-45,10
+45,10
@@
if restrict_ssh.include?(hostname) then
ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
end
ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
end
- if
nodeinfo['static_master']
then
+ if
has_role('static_master')
then
ssh4allowed << '$HOST_STATIC_V4'
ssh6allowed << '$HOST_STATIC_V6'
ssh4allowed << '$HOST_STATIC_V4'
ssh6allowed << '$HOST_STATIC_V6'
- elsif
nodeinfo['static_source'] or nodeinfo['static_mirror']
then
+ elsif
has_role('static_source') or has_role('static_mirror')
then
ssh4allowed << '$HOST_STATICMASTER_V4'
ssh6allowed << '$HOST_STATICMASTER_V6'
end
ssh4allowed << '$HOST_STATICMASTER_V4'
ssh6allowed << '$HOST_STATICMASTER_V6'
end