Skip to content

Commit

Permalink
Merge pull request voxpupuli#1314 from aleksmark/fix-syntax
Browse files Browse the repository at this point in the history
Fixed varibale name and code style
  • Loading branch information
binford2k authored Feb 13, 2019
2 parents 480a0b8 + 92b7979 commit dafeeba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion manifests/resource/upstream/member.pp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
target => "${conf_dir}/${upstream}-upstream.conf",
order => 40,
content => epp('nginx/upstream/upstream_member.epp', {
_server => $_server,
server => $_server,
backup => $backup,
comment => $comment,
fail_timeout => $fail_timeout,
Expand Down
4 changes: 2 additions & 2 deletions templates/upstream/upstream_member.epp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%- | $_server,
<%- | $server,
Boolean $backup = false,
Optional[String[1]] $comment = undef,
Optional[Nginx::Time] $fail_timeout = undef,
Expand All @@ -13,7 +13,7 @@
Optional[Enum['drain','down']] $state = undef,
Optional[Integer[1]] $weight = undef,
| -%>
server <%= $_server -%>
server <%= $server -%>
<%- if $params_prepend { %> <%= $params_prepend %><% } -%>
<%- if $state { %> <%= $state %><% } -%>
<%- if $weight { %> weight=<%= $weight %><% } -%>
Expand Down
2 changes: 1 addition & 1 deletion types/upstreammember.pp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
type Nginx::UpstreamMember = Struct[{
server => Optional[Nginx::UpstreamMemberServer],
server => Optional[Nginx::UpstreamMemberServer],
port => Optional[Stdlib::Port],
weight => Optional[Integer[1]],
max_conns => Optional[Integer[1]],
Expand Down

0 comments on commit dafeeba

Please sign in to comment.